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 78f90b6d6f0985ecc2277c37bbaaa594b0adb78d Author: Andriy Redko <[email protected]> AuthorDate: Sat Jul 29 11:43:55 2023 -0400 Minor distribution/samples fixes and dependency updates (cherry picked from commit 9727de7019a92c184a31e00d2ddffacef7b15d4d) # Conflicts: # distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java # distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java # distribution/src/main/release/samples/pom.xml --- .../sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java | 3 +-- .../sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java | 3 +-- distribution/src/main/release/samples/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java index 17649e1ec9..c0046d12d5 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java +++ b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java @@ -27,7 +27,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; @@ -48,7 +47,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.name("stats"), 1)); Thread.sleep(500); sink.send(createStatsEvent(builder.name("stats"), 2)); diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java index f2d8ff3545..30cdb25c96 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java +++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/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; @@ -49,7 +48,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.name("stats"), 1)); Thread.sleep(1000); sink.send(createStatsEvent(builder.name("stats"), 2)); diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index e305e4f0c2..6e65fb6157 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.13</spring.boot.version> - <spring.cloud.eureka.version>3.1.4</spring.cloud.eureka.version> + <spring.boot.version>2.7.14</spring.boot.version> + <spring.cloud.eureka.version>3.1.7</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>
