[cxf] branch master updated: ws-rm, ws-transfer, integration: fix PMD rule: UnusedAssignment
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 69bde23 ws-rm, ws-transfer, integration: fix PMD rule:
UnusedAssignment
69bde23 is described below
commit 69bde238c2118718272bf6fc672e565d16d7a6d4
Author: Alexey Markevich
AuthorDate: Fri Mar 26 13:30:10 2021 +0300
ws-rm, ws-transfer, integration: fix PMD rule: UnusedAssignment
---
.../jca/core/classloader/PlugInClassLoader.java| 2 +-
.../cxf/jca/core/resourceadapter/ResourceBean.java | 4 +-
.../java/org/apache/cxf/jca/cxf/JCABusFactory.java | 3 +-
.../apache/cxf/jca/cxf/ManagedConnectionImpl.java | 4 +-
.../jca/cxf/handlers/CXFInvocationHandlerBase.java | 2 +-
.../cxf/handlers/InvokingInvocationHandler.java| 6 +-
.../handlers/ObjectMethodInvocationHandler.java| 2 +-
.../apache/cxf/jca/inbound/DispatchMDBInvoker.java | 2 +-
.../apache/cxf/jca/inbound/MDBActivationWork.java | 6 +-
.../org/apache/cxf/jca/jarloader/JarLoader.java| 2 +-
.../cxf/jca/outbound/ManagedConnectionImpl.java| 2 +-
.../org/apache/cxf/jca/servant/EJBEndpoint.java| 2 +-
.../org/apache/cxf/jca/servant/EJBInvoker.java | 4 +-
.../AbstractOpenTracingClientProvider.java | 4 +-
.../opentracing/AbstractOpenTracingProvider.java | 4 +-
.../tracing/opentracing/OpenTracingContext.java| 2 +-
.../src/main/java/org/apache/cxf/ws/rm/Proxy.java | 9 ++-
.../apache/cxf/ws/rm/RMCaptureOutInterceptor.java | 8 +--
.../java/org/apache/cxf/ws/rm/RMContextUtils.java | 2 +-
.../main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 77 ++
.../main/java/org/apache/cxf/ws/rm/RMManager.java | 4 +-
.../main/java/org/apache/cxf/ws/rm/RMUtils.java| 20 +++---
.../java/org/apache/cxf/ws/rm/SourceSequence.java | 2 +-
.../apache/cxf/ws/rm/soap/RMSoapInInterceptor.java | 4 +-
.../apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java | 6 +-
.../cxf/ws/rm/soap/RetransmissionQueueImpl.java| 13 ++--
.../apache/cxf/ws/rm/soap/SoapFaultFactory.java| 2 +-
.../org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 4 +-
.../org/apache/cxf/ws/rm/SourceSequenceTest.java | 14 ++--
.../ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 40 +--
.../rm/persistence/jdbc/RMTxStoreUpgradeTest.java | 3 +-
.../ws/rm/soap/RetransmissionQueueImplTest.java| 2 +-
.../transfer/dialect/fragment/FragmentDialect.java | 25 ++-
.../ws/transfer/manager/MemoryResourceManager.java | 8 +--
.../transfer/integration/IntegrationBaseTest.java | 28 +---
.../transfer/integration/ResourceFactoryTest.java | 4 +-
.../cxf/ws/transfer/integration/ResourceTest.java | 13 ++--
37 files changed, 116 insertions(+), 223 deletions(-)
diff --git
a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
index 67c2e1f..c9ec494 100644
---
a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
+++
b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
@@ -43,7 +43,7 @@ public class PlugInClassLoader extends SecureClassLoader {
private static final String JARS_PROPS_FILE = "jars.properties";
private static final String FILTERS_PROPS_FILE = "filters.properties";
private static final String NEFILTERS_PROPS_FILE =
"negativefilters.properties";
-private String[] jarUrls = new String[0];
+private final String[] jarUrls;
private final ProtectionDomain protectionDomain;
private final ClassLoader ploader;
diff --git
a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
index 15fc36a..b180023 100644
---
a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
+++
b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
@@ -101,9 +101,8 @@ public class ResourceBean implements Serializable {
}
public void validateURLString(String spec, String msg) throws
ResourceAdapterInternalException {
-URL url = null;
try {
-url = createURL(spec, msg);
+URL url = createURL(spec, msg);
url.openStream();
LOG.fine("Validated url=" + url);
} catch (IOException ioe) {
@@ -111,5 +110,4 @@ public class ResourceBean implements Serializable {
}
}
-
}
diff --git
a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
index fa8be7a..6f0ccaf 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
+++
[cxf] branch master updated: osgi.itests: fix test
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 61550ce osgi.itests: fix test
61550ce is described below
commit 61550ceb83004e01a8683e5c2cd578c528df8ec3
Author: Alexey Markevich
AuthorDate: Sun Mar 28 01:25:57 2021 +0300
osgi.itests: fix test
---
.../src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index a1d38f4..0127f37 100644
---
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -78,9 +78,6 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
return OptionUtils.combine(
cxfBaseConfig(),
features(cxfUrl, "cxf-jaxws", "cxf-transports-jms"),
-// TODO: remove it when 5.16.1 is released,
https://issues.apache.org/jira/browse/AMQ-8009
-
features(maven().groupId("org.apache.karaf.features").artifactId("spring-legacy").versionAsInProject()
-.type("xml").classifier("features")),
features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf").versionAsInProject()
.type("xml").classifier("features-core"),
"cxf-jackson", "activemq-client"),
[cxf] branch master updated: use jakarta.inject-api
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 5330712 use jakarta.inject-api
5330712 is described below
commit 5330712b1160b904d093d8579652e8000e1ba253
Author: Alexey Markevich
AuthorDate: Sun Mar 28 00:08:42 2021 +0300
use jakarta.inject-api
---
.../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +-
integration/cdi/pom.xml | 6 +++---
osgi/itests-felix/pom.xml | 8
osgi/itests/pom.xml | 17 -
parent/pom.xml | 4 ++--
services/xkms/xkms-itests/pom.xml | 8
systests/cdi/cdi-owb/pom.xml| 13 -
7 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
index c4fa652..7781c51 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
@@ -79,7 +79,7 @@
jakarta.inject
jakarta.inject-api
-1.0.1
+1.0.3
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index fa9de31..0d6c31c 100644
--- a/integration/cdi/pom.xml
+++ b/integration/cdi/pom.xml
@@ -49,12 +49,12 @@
jakarta.enterprise
jakarta.enterprise.cdi-api
-
+
jakarta.inject
jakarta.inject-api
-1.0.1
-
+${cxf.jakarta.injectapi.version}
+
junit
junit
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index b000a3b..89467e0 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -132,11 +132,11 @@
osgi.cmpn
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${cxf.geronimo.inject.version}
+jakarta.inject
+jakarta.inject-api
+${cxf.jakarta.injectapi.version}
provided
-
+
junit
junit
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 18813d3..17d10fc 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -102,14 +102,6 @@
-
-
-org.apache.karaf.features
-spring-legacy
-${cxf.karaf.version}
-features
-xml
-
org.apache.karaf.features
@@ -133,11 +125,10 @@
org.osgi.core
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${cxf.geronimo.inject.version}
-provided
-
+jakarta.inject
+jakarta.inject-api
+${cxf.jakarta.injectapi.version}
+
junit
junit
diff --git a/parent/pom.xml b/parent/pom.xml
index 5497e71..15e2228 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,6 @@
3.9.0
3.0.3
3.0.2
-1.1
1.0.1
1.1.1
1.4
@@ -131,8 +130,9 @@
3.9
1.5.0
1.2.2
-1.4.2
+1.0.3
2.1.0
+1.4.2
2.3.3
0.7.2
3.25.0-GA
diff --git a/services/xkms/xkms-itests/pom.xml
b/services/xkms/xkms-itests/pom.xml
index 8cb1c7c..ee9984b 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -103,11 +103,11 @@
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${cxf.geronimo.inject.version}
+jakarta.inject
+jakarta.inject-api
+${cxf.jakarta.injectapi.version}
provided
-
+
jakarta.xml.bind
jakarta.xml.bind-api
diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml
index 3a69ec8..0ba9f7b 100644
--- a/systests/cdi/cdi-owb/pom.xml
+++ b/systests/cdi/cdi-owb/pom.xml
@@ -62,15 +62,10 @@
1.0
-org.apache.geronimo.specs
-geronimo-validation_1.1_spec
-1.0
-
-
-org.apache.geronimo.specs
-geronimo-atinject_1.0_spec
-${cxf.geronimo.inject.version}
-
+jakarta.inject
+jakarta.inject-api
+${cxf.jakarta.injectapi.version}
+
org.apache.geronimo.specs
