This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d2ef013345e103e10d02b941682e863edaa3194e Author: Andriy Redko <[email protected]> AuthorDate: Sat Jul 29 12:49:05 2023 -0400 Minor distribution/samples fixes to aling version properties naming conventions (cherry picked from commit fc765ea775f73285262b2a0240a995b72258a27f) # Conflicts: # distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml # distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml # distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml # distribution/src/main/release/samples/jaxws_spring_boot/pom.xml # distribution/src/main/release/samples/pom.xml # distribution/src/main/release/samples/ws_transaction/pom.xml --- distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml | 8 ++++---- .../release/samples/jax_rs/spring_boot_scan/application/pom.xml | 8 ++++---- .../main/release/samples/jax_rs/spring_boot_scan/client/pom.xml | 6 +++--- .../samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 8 ++++---- .../src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java | 3 +-- .../src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java | 3 +-- .../main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml | 2 +- distribution/src/main/release/samples/jaxws_spring_boot/pom.xml | 4 ++-- distribution/src/main/release/samples/pom.xml | 4 ++-- distribution/src/main/release/samples/ws_transaction/pom.xml | 2 +- .../src/main/release/samples/ws_transaction/ws_first/pom.xml | 2 +- .../src/main/release/samples/ws_transaction/ws_second/pom.xml | 2 +- 12 files changed, 25 insertions(+), 27 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml index 7af9c4eedc..f3c3621861 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml @@ -17,7 +17,7 @@ <!-- Import dependency management from Spring Boot --> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -70,7 +70,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <configuration> <mainClass>sample.rs.service.SampleRestApplication</mainClass> </configuration> @@ -102,7 +102,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <configuration> <mainClass>sample.rs.service.SampleRestApplication</mainClass> </configuration> @@ -118,7 +118,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <configuration> <mainClass>sample.rs.client.SampleRestClientApplication</mainClass> </configuration> diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml index 0fd75e56ce..54334c6e57 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml @@ -16,7 +16,7 @@ <!-- Import dependency management from Spring Boot --> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -53,7 +53,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> - <version>${spring.cloud.eureka.version}</version> + <version>${cxf.spring.cloud.eureka.version}</version> </dependency> <!-- Actuator Endpoints --> <dependency> @@ -76,7 +76,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <configuration> <mainClass>sample.rs.service.SampleRestApplication</mainClass> </configuration> @@ -112,7 +112,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> </plugin> </plugins> </build> diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml index df64b4f6f4..e50b402d6f 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml @@ -20,7 +20,7 @@ <!-- Import dependency management from Spring Boot --> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -43,7 +43,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> - <version>${spring.cloud.eureka.version}</version> + <version>${cxf.spring.cloud.eureka.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -73,7 +73,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <configuration> <mainClass>sample.rs.client.SampleRestClientApplication</mainClass> </configuration> 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 2dbcb3e2d5..ca56bfb096 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 @@ -18,14 +18,14 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-netflix-dependencies</artifactId> - <version>${spring.cloud.eureka.version}</version> + <version>${cxf.spring.cloud.eureka.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -35,7 +35,7 @@ <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId> - <version>${spring.cloud.eureka.version}</version> + <version>${cxf.spring.cloud.eureka.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -51,7 +51,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <executions> <execution> <goals> diff --git a/distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java index feadec3b64..d1add36ea2 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java +++ b/distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java @@ -34,7 +34,6 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.OutboundSseEvent.Builder; import javax.ws.rs.sse.Sse; import javax.ws.rs.sse.SseEventSink; @@ -82,7 +81,7 @@ public class StatsRestServiceImpl { new Thread() { public void run() { try { - final Builder builder = sse.newEventBuilder(); + final OutboundSseEvent.Builder builder = sse.newEventBuilder(); sink.send(createStatsEvent(builder, 1)); Thread.sleep(1000); sink.send(createStatsEvent(builder, 2)); diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java index 0a15153959..83fda07439 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java +++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java @@ -28,7 +28,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.OutboundSseEvent.Builder; import javax.ws.rs.sse.Sse; import javax.ws.rs.sse.SseEventSink; @@ -52,7 +51,7 @@ public class StatsRestServiceImpl { new Thread() { public void run() { try { - final Builder builder = sse.newEventBuilder(); + final OutboundSseEvent.Builder builder = sse.newEventBuilder(); sink.send(createStatsEvent(builder, 1)); Thread.sleep(1000); sink.send(createStatsEvent(builder, 2)); diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml index 1df2e8474a..54ff3f704b 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml @@ -111,7 +111,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> 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 52706558d0..f22326e308 100644 --- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml @@ -16,7 +16,7 @@ <!-- Import dependency management from Spring Boot --> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -74,7 +74,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <configuration> <mainClass>sample.ws.SampleWsApplication</mainClass> </configuration> diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 6e65fb6157..834cf787fd 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.7.14</spring.boot.version> - <spring.cloud.eureka.version>3.1.7</spring.cloud.eureka.version> + <cxf.spring.boot.version>2.7.14</cxf.spring.boot.version> + <cxf.spring.cloud.eureka.version>3.1.7</cxf.spring.cloud.eureka.version> <cxf.jetty10.version>10.0.15</cxf.jetty10.version> <cxf.netty.version>4.1.96.Final</cxf.netty.version> <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version> diff --git a/distribution/src/main/release/samples/ws_transaction/pom.xml b/distribution/src/main/release/samples/ws_transaction/pom.xml index a44f0a6677..9200c10c0a 100644 --- a/distribution/src/main/release/samples/ws_transaction/pom.xml +++ b/distribution/src/main/release/samples/ws_transaction/pom.xml @@ -43,7 +43,7 @@ <!-- Import dependency management from Spring Boot --> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml b/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml index ca708bfbf8..a92af79001 100644 --- a/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml +++ b/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml @@ -33,7 +33,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> </plugin> </plugins> </build> diff --git a/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml b/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml index b429b710a7..62a0e98bb3 100644 --- a/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml +++ b/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml @@ -33,7 +33,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring.boot.version}</version> + <version>${cxf.spring.boot.version}</version> </plugin> </plugins> </build>
