This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 9727de7019 Minor distribution/samples fixes and dependency updates
9727de7019 is described below
commit 9727de7019a92c184a31e00d2ddffacef7b15d4d
Author: Andriy Redko <[email protected]>
AuthorDate: Sat Jul 29 11:43:55 2023 -0400
Minor distribution/samples fixes and dependency updates
---
.../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 a9060b4b47..0f42ee9540 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 jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.sse.OutboundSseEvent;
-import jakarta.ws.rs.sse.OutboundSseEvent.Builder;
import jakarta.ws.rs.sse.Sse;
import jakarta.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 8f06b597c7..0d63df06d7 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 jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.sse.OutboundSseEvent;
-import jakarta.ws.rs.sse.OutboundSseEvent.Builder;
import jakarta.ws.rs.sse.Sse;
import jakarta.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 6f88bb5200..b84f5fd117 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -31,8 +31,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>3.0.8</spring.boot.version>
- <spring.cloud.eureka.version>4.0.2</spring.cloud.eureka.version>
+ <spring.boot.version>3.0.9</spring.boot.version>
+ <spring.cloud.eureka.version>4.0.3</spring.cloud.eureka.version>
<cxf.jetty11.version>11.0.15</cxf.jetty11.version>
<cxf.netty.version>4.1.96.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>