You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/07/29 16:05:51 UTC
[cxf] branch 3.6.x-fixes updated (af5a03b481 -> 9dfd633b25)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from af5a03b481 Recording .gitmergeinfo Changes
new 78f90b6d6f Minor distribution/samples fixes and dependency updates
new 9dfd633b25 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
.../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 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
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 9dfd633b251479e76ab4a912ae24bb90263e2328
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jul 29 11:51:43 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c7199bd649..78f2adda11 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -439,6 +439,7 @@ M 95ce55cf1d7a405c209d3a858a82b4279f24bd91
M 967ff56b0d1c4d0535b3bdbca357c03631b41288
M 96a2e7f27fde6ebdffd511ce69120adfff7b9dcb
M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158
+M 9727de7019a92c184a31e00d2ddffacef7b15d4d
M 98be30e6813d3c9f6e49c4a21c5ca7e46fada082
M 9900e83b5970c32d40b797584d5cf6739952a97f
M 990d3332d34fbfff4291256d0cd5eadedb510bc2
[cxf] 01/02: Minor distribution/samples fixes and dependency updates
Posted by re...@apache.org.
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 <dr...@gmail.com>
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>