This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch CXF-8671 in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 362edbf3204a2f974e382e76008c1c1043f0984d Merge: e8cd5e9044 224463041c Author: Andriy Redko <[email protected]> AuthorDate: Wed Apr 3 17:51:57 2024 -0400 Merge remote-tracking branch 'origin/main' into CXF-8671 distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml | 4 ++-- pom.xml | 2 +- .../test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java | 9 +-------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --cc distribution/src/main/release/samples/pom.xml index dd46a1f558,0dba310aca..5b782d6bbb --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@@ -31,12 -31,12 +31,12 @@@ <!-- don't deploy the samples, kind of pointless --> <maven.deploy.skip>true</maven.deploy.skip> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <cxf.spring.boot.version>3.0.13</cxf.spring.boot.version> - <cxf.spring.cloud.eureka.version>4.0.3</cxf.spring.cloud.eureka.version> - <cxf.jetty11.version>11.0.20</cxf.jetty11.version> + <cxf.spring.boot.version>3.2.4</cxf.spring.boot.version> + <cxf.spring.cloud.eureka.version>4.1.1</cxf.spring.cloud.eureka.version> + <cxf.jetty12.version>12.0.7</cxf.jetty12.version> <cxf.netty.version>4.1.108.Final</cxf.netty.version> <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version> - <cxf.swagger.ui.version>5.12.2</cxf.swagger.ui.version> + <cxf.swagger.ui.version>5.13.0</cxf.swagger.ui.version> <cxf.tika.version>2.9.1</cxf.tika.version> <cxf.tomcat.version>10.1.18</cxf.tomcat.version> <cxf.jboss.weld.version>4.0.3.Final</cxf.jboss.weld.version> diff --cc parent/pom.xml index e85647882a,f66f7b47b4..12058c8c0d --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -213,13 -211,13 +213,13 @@@ <cxf.slf4j.version>2.0.12</cxf.slf4j.version> <cxf.snakeyaml.version>2.2</cxf.snakeyaml.version> <cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version> - <cxf.spring.boot.version>3.0.13</cxf.spring.boot.version> - <cxf.spring.ldap.version>3.0.6</cxf.spring.ldap.version> + <cxf.spring.boot.version>3.2.4</cxf.spring.boot.version> + <cxf.spring.ldap.version>3.2.2</cxf.spring.ldap.version> <cxf.spring.mock>spring-test</cxf.spring.mock> - <cxf.spring.security.version>6.1.8</cxf.spring.security.version> - <cxf.spring.version>6.0.18</cxf.spring.version> + <cxf.spring.security.version>6.2.3</cxf.spring.security.version> + <cxf.spring.version>6.1.5</cxf.spring.version> <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version> - <cxf.swagger.ui.version>5.12.2</cxf.swagger.ui.version> + <cxf.swagger.ui.version>5.13.0</cxf.swagger.ui.version> <cxf.swagger.v3.version>2.2.21</cxf.swagger.v3.version> <cxf.tika.version>2.9.1</cxf.tika.version> <cxf.tomcat.version>10.1.18</cxf.tomcat.version> diff --cc pom.xml index 0e3abaae76,d0bbfa5068..73f3705d38 --- a/pom.xml +++ b/pom.xml @@@ -42,10 -42,10 +42,10 @@@ <cxf.compiler.fork>false</cxf.compiler.fork> <cxf.build-utils.version>4.0.1</cxf.build-utils.version> <cxf.xjc-utils.version>4.0.0</cxf.xjc-utils.version> - <cxf.jdk.version>11</cxf.jdk.version> + <cxf.jdk.version>17</cxf.jdk.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url> - <maven-owasp-plugin-version>9.0.10</maven-owasp-plugin-version> + <maven-owasp-plugin-version>9.1.0</maven-owasp-plugin-version> <preparationGoals>clean install</preparationGoals> </properties> <distributionManagement>
