[cxf] branch master updated: Update to Spring Boot 2.4.0 / Spring Framework 5.3.1 / Spring Security 5.4.1 / Reactor 3.4.0 / Micrometer 1.6.1 (#723)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch master updated: Update to Spring Boot 2.4.0 / Spring Framework 5.3.1 / Spring Security 5.4.1 / Reactor 3.4.0 / Micrometer 1.6.1 (#723)

reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c4f048  Update to Spring Boot 2.4.0 / Spring Framework 5.3.1 / Spring Security 5.4.1 / Reactor 3.4.0 / Micrometer 1.6.1 (#723)
8c4f048 is described below

commit 8c4f04855a5d8623daff2aa8a8856367879c624b
Author: Andriy Redko <[hidden email]>
AuthorDate: Mon Nov 16 18:27:48 2020 -0500

    Update to Spring Boot 2.4.0 / Spring Framework 5.3.1 / Spring Security 5.4.1 / Reactor 3.4.0 / Micrometer 1.6.1 (#723)
   
    Update to Spring Boot 2.4.0 / Spring Framework 5.3.1 / Spring Security 5.4.1 / Reactor 3.4.0 / Micrometer 1.6.1
---
 .../rs/service/SampleRestApplicationTest.java      | 13 ++++--------
 .../rs/service/SampleRestApplicationTest.java      | 13 ++++--------
 .../spring_boot_scan/eureka-registry/pom.xml       |  2 +-
 .../main/release/samples/jaxws_spring_boot/pom.xml | 11 ++++++++++
 distribution/src/main/release/samples/pom.xml      | 24 +++++++++++++++++-----
 parent/pom.xml                                     | 23 +++++++++++++--------
 pom.xml                                            |  2 +-
 systests/transports/pom.xml                        |  5 +++++
 8 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
index a424e9d..7ecbe9a 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -19,18 +19,13 @@
 package sample.rs.service;
 
 import org.apache.cxf.jaxrs.client.WebClient;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = SampleRestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
 public class SampleRestApplicationTest {
 
@@ -44,7 +39,7 @@ public class SampleRestApplicationTest {
         // HelloServiceImpl1
         wc.path("sayHello").path("ApacheCxfUser");
         String greeting = wc.get(String.class);
-        Assert.assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
+        assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
 
         // Reverse to the starting URI
         wc.back(true);
@@ -52,7 +47,7 @@ public class SampleRestApplicationTest {
         // HelloServiceImpl2
         wc.path("sayHello2").path("ApacheCxfUser");
         greeting = wc.get(String.class);
-        Assert.assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
+        assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
     }
 
 }
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
index a424e9d..7ecbe9a 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -19,18 +19,13 @@
 package sample.rs.service;
 
 import org.apache.cxf.jaxrs.client.WebClient;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = SampleRestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
 public class SampleRestApplicationTest {
 
@@ -44,7 +39,7 @@ public class SampleRestApplicationTest {
         // HelloServiceImpl1
         wc.path("sayHello").path("ApacheCxfUser");
         String greeting = wc.get(String.class);
-        Assert.assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
+        assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
 
         // Reverse to the starting URI
         wc.back(true);
@@ -52,7 +47,7 @@ public class SampleRestApplicationTest {
         // HelloServiceImpl2
         wc.path("sayHello2").path("ApacheCxfUser");
         greeting = wc.get(String.class);
-        Assert.assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
+        assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
     }
 
 }
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 94e84fc..44a2f38 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -24,7 +24,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-netflix</artifactId>
+                <artifactId>spring-cloud-netflix-dependencies</artifactId>
                 <version>${spring.cloud.eureka.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index 913a211..98971f4 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -51,6 +51,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 005fcff..9b69d2b 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,8 +30,8 @@
         <!-- don't deploy the samples, kind of pointless -->
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.boot.version>2.3.6.RELEASE</spring.boot.version>
-        <spring.cloud.eureka.version>2.2.3.RELEASE</spring.cloud.eureka.version>
+        <spring.boot.version>2.4.0</spring.boot.version>
+        <spring.cloud.eureka.version>3.0.0-M4</spring.cloud.eureka.version>
         <cxf.jetty9.version>9.4.34.v20201102</cxf.jetty9.version>
         <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>3.32.1</cxf.swagger.ui.version>
@@ -50,7 +50,6 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-logging</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
     <modules>
@@ -209,6 +208,11 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <version>3.3.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.22.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -259,7 +263,6 @@
                 <dependency>
                     <groupId>jakarta.xml.ws</groupId>
                     <artifactId>jakarta.xml.ws-api</artifactId>
-                    <version>2.3.3</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.activation</groupId>
@@ -269,7 +272,6 @@
                 <dependency>
                     <groupId>jakarta.jws</groupId>
                     <artifactId>jakarta.jws-api</artifactId>
-                    <version>1.1.1</version>
                 </dependency>
                 <dependency>
                     <groupId>com.sun.xml.messaging.saaj</groupId>
@@ -314,4 +316,16 @@
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
     </distributionManagement>
+    
+    <!--
+        TODO: Please remove, temporary repository settings in order to enable milestones for
+        Spring Cloud Netflix (3.0.0-M4 at the moment).
+    -->
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <snapshots><enabled>false</enabled></snapshots>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index db69ebf..ae80a77 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -103,7 +103,7 @@
         <cxf.derby.version>10.14.2.0</cxf.derby.version>
         <cxf.dom4j.version>2.1.3</cxf.dom4j.version>
         <cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
-        <cxf.dropwizard4.version>4.1.14</cxf.dropwizard4.version>
+        <cxf.dropwizard4.version>4.1.15</cxf.dropwizard4.version>
         <cxf.ehcache3.version>3.8.1</cxf.ehcache3.version>
         <cxf.el-api.version>3.0.3</cxf.el-api.version>
         <cxf.findbugs.version>3.0.2</cxf.findbugs.version>
@@ -120,7 +120,7 @@
         <cxf.hamcrest.version>2.2</cxf.hamcrest.version>
         <cxf.hazelcast.version>3.12.9</cxf.hazelcast.version>
         <cxf.hibernate.em.version>5.4.19.Final</cxf.hibernate.em.version>
-        <cxf.hibernate.validator.version>6.1.4.Final</cxf.hibernate.validator.version>
+        <cxf.hibernate.validator.version>6.1.6.Final</cxf.hibernate.validator.version>
         <cxf.hsqldb.version>2.5.1</cxf.hsqldb.version>
         <cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
         <cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
@@ -157,12 +157,13 @@
         <cxf.json.bind-api.version>1.0.2</cxf.json.bind-api.version>
         <cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
         <cxf.junit.version>4.13.1</cxf.junit.version>
+        <cxf.junit5.version>5.7.0</cxf.junit5.version>
         <cxf.kerby.version>2.0.1</cxf.kerby.version>
         <cxf.littleproxy.version>1.1.2</cxf.littleproxy.version>
         <cxf.logback.classic.version>1.2.3</cxf.logback.classic.version>
         <cxf.lucene.version>8.2.0</cxf.lucene.version>
         <cxf.maven.core.version>3.6.3</cxf.maven.core.version>
-        <cxf.micrometer.version>1.5.7</cxf.micrometer.version>
+        <cxf.micrometer.version>1.6.1</cxf.micrometer.version>
         <cxf.microprofile.config.version>1.2</cxf.microprofile.config.version>
         <cxf.microprofile.rest.client.version>2.0-RC2</cxf.microprofile.rest.client.version>
         <cxf.microprofile.openapi.version>1.1.2</cxf.microprofile.openapi.version>        
@@ -182,7 +183,7 @@
         <cxf.plexus-archiver.version>4.2.0</cxf.plexus-archiver.version>
         <cxf.plexus-utils.version>3.2.0</cxf.plexus-utils.version>
         <cxf.reactivestreams.version>1.0.3</cxf.reactivestreams.version>
-        <cxf.reactor.version>3.3.11.RELEASE</cxf.reactor.version>
+        <cxf.reactor.version>3.4.0</cxf.reactor.version>
         <cxf.rhino.version>1.7R2</cxf.rhino.version>
         <cxf.rxjava.version>1.3.8</cxf.rxjava.version>
         <cxf.rxjava2.version>2.2.20</cxf.rxjava2.version>
@@ -192,14 +193,14 @@
         <cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
         <cxf.servlet-api.version>4.0.4</cxf.servlet-api.version>
         <cxf.slf4j.version>1.7.30</cxf.slf4j.version>
-        <cxf.snakeyaml.version>1.26</cxf.snakeyaml.version>
+        <cxf.snakeyaml.version>1.27</cxf.snakeyaml.version>
         <cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
-        <cxf.spring.boot.version>2.3.6.RELEASE</cxf.spring.boot.version>
+        <cxf.spring.boot.version>2.4.0</cxf.spring.boot.version>
         <cxf.spring.ldap.version>2.3.3.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
         <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
-        <cxf.spring.security.version>5.3.5.RELEASE</cxf.spring.security.version>
-        <cxf.spring.version>5.2.11.RELEASE</cxf.spring.version>
+        <cxf.spring.security.version>5.4.1</cxf.spring.security.version>
+        <cxf.spring.version>5.3.1</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
         <cxf.swagger.ui.version>3.32.1</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.1.5</cxf.swagger.v3.version>
@@ -805,6 +806,12 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>${cxf.junit5.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>${cxf.junit.version}</version>
diff --git a/pom.xml b/pom.xml
index 7ceb5b2..da12e02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -546,7 +546,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.22.1</version>
+                    <version>2.22.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index 77fa2e1..aef4e6e 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -331,6 +331,11 @@
             <version>${cxf.bcprov.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>