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 2022/06/11 02:03:33 UTC
[cxf] branch 3.6.x-fixes updated (83b9b2a6d3 -> c4c9de9f13)
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 83b9b2a6d3 Updating Xerces ServiceMix bundle to 2.12.2_1
new 310f93d91a Fixing JDK-19 source compatibility issue introduced by https://bugs.openjdk.org/browse/JDK-8287968
new c4c9de9f13 Fixing checkstyle violations
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:
.../src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java | 5 +++--
.../src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
[cxf] 02/02: Fixing checkstyle violations
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 c4c9de9f13d3a65e3f532e2a72dc784ed3f36366
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Jun 10 22:01:20 2022 -0400
Fixing checkstyle violations
(cherry picked from commit 34ff9b27c50c54ab4efa074d483f64db93d0a842)
---
.../src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java | 2 +-
.../src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
index e603bb24e3..71c1b28b8b 100644
--- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
+++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
@@ -36,8 +36,8 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent.Builder;
import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.OutboundSseEvent.Builder;
import javax.ws.rs.sse.Sse;
import javax.ws.rs.sse.SseBroadcaster;
import javax.ws.rs.sse.SseEventSink;
diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java
index 720f3eda5f..7c87088540 100644
--- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java
+++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java
@@ -36,8 +36,8 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent.Builder;
import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.OutboundSseEvent.Builder;
import javax.ws.rs.sse.Sse;
import javax.ws.rs.sse.SseBroadcaster;
import javax.ws.rs.sse.SseEventSink;
[cxf] 01/02: Fixing JDK-19 source compatibility issue introduced by https://bugs.openjdk.org/browse/JDK-8287968
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 310f93d91a00f4ab6297af2f574a0bfeda3e94f0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jun 9 18:14:21 2022 -0400
Fixing JDK-19 source compatibility issue introduced by https://bugs.openjdk.org/browse/JDK-8287968
(cherry picked from commit aada64db93a9625a4aa7af60755840d16219d580)
---
.../src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java | 5 +++--
.../src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
index c6561bd12c..e603bb24e3 100644
--- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
+++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore.java
@@ -37,6 +37,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.sse.OutboundSseEvent.Builder;
+import javax.ws.rs.sse.OutboundSseEvent;
import javax.ws.rs.sse.Sse;
import javax.ws.rs.sse.SseBroadcaster;
import javax.ws.rs.sse.SseEventSink;
@@ -77,7 +78,7 @@ public class BookStore extends BookStoreClientCloseable {
public void run() {
try {
final Integer id = Integer.valueOf(lastEventId);
- final Builder builder = sse.newEventBuilder();
+ final OutboundSseEvent.Builder builder = sse.newEventBuilder();
sink.send(createEvent(builder.name("book"), id + 1));
Thread.sleep(200);
@@ -105,7 +106,7 @@ public class BookStore extends BookStoreClientCloseable {
public void run() {
try {
final Integer id = Integer.valueOf(lastEventId);
- final Builder builder = sse.newEventBuilder();
+ final OutboundSseEvent.Builder builder = sse.newEventBuilder();
sink.send(createEvent(builder.name("book"), id + 1));
Thread.sleep(200);
diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java
index 414d84f7ce..720f3eda5f 100644
--- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java
+++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStore2.java
@@ -37,6 +37,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.sse.OutboundSseEvent.Builder;
+import javax.ws.rs.sse.OutboundSseEvent;
import javax.ws.rs.sse.Sse;
import javax.ws.rs.sse.SseBroadcaster;
import javax.ws.rs.sse.SseEventSink;
@@ -76,7 +77,7 @@ public class BookStore2 extends BookStoreClientCloseable {
public void run() {
try {
final Integer id = Integer.valueOf(lastEventId);
- final Builder builder = sse.newEventBuilder();
+ final OutboundSseEvent.Builder builder = sse.newEventBuilder();
sink.send(createEvent(builder.name("book"), id + 1));
Thread.sleep(200);
@@ -104,7 +105,7 @@ public class BookStore2 extends BookStoreClientCloseable {
public void run() {
try {
final Integer id = Integer.valueOf(lastEventId);
- final Builder builder = sse.newEventBuilder();
+ final OutboundSseEvent.Builder builder = sse.newEventBuilder();
sink.send(createEvent(builder.name("book"), id + 1));
Thread.sleep(200);