You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/01/01 17:07:15 UTC
[camel] 01/02: Upgrade Californium to version 2.0.0
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fce2502d007e1e25ba9a54a82cea95d07ad041df
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 1 17:48:51 2020 +0100
Upgrade Californium to version 2.0.0
---
components/camel-coap/pom.xml | 2 +-
.../camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java | 4 ++--
.../camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java | 4 ++--
.../src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java | 2 +-
.../test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java | 4 ++--
.../src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTest.java | 2 +-
parent/pom.xml | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index 33ba421..2a0c29b 100644
--- a/components/camel-coap/pom.xml
+++ b/components/camel-coap/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.californium</groupId>
- <artifactId>element-connector-tcp</artifactId>
+ <artifactId>element-connector-tcp-netty</artifactId>
<version>${californium-version}</version>
</dependency>
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
index e6bd89b..53ee5bd 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
@@ -41,8 +41,8 @@ import org.apache.camel.util.URISupport;
import org.eclipse.californium.core.CoapServer;
import org.eclipse.californium.core.network.CoapEndpoint;
import org.eclipse.californium.core.network.config.NetworkConfig;
-import org.eclipse.californium.elements.tcp.TcpServerConnector;
-import org.eclipse.californium.elements.tcp.TlsServerConnector;
+import org.eclipse.californium.elements.tcp.netty.TcpServerConnector;
+import org.eclipse.californium.elements.tcp.netty.TlsServerConnector;
import org.eclipse.californium.scandium.DTLSConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
index 2401de3..bc946a7 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
@@ -30,8 +30,8 @@ import org.eclipse.californium.core.CoapResponse;
import org.eclipse.californium.core.coap.MediaTypeRegistry;
import org.eclipse.californium.core.network.CoapEndpoint;
import org.eclipse.californium.core.network.config.NetworkConfig;
-import org.eclipse.californium.elements.tcp.TcpClientConnector;
-import org.eclipse.californium.elements.tcp.TlsClientConnector;
+import org.eclipse.californium.elements.tcp.netty.TcpClientConnector;
+import org.eclipse.californium.elements.tcp.netty.TlsClientConnector;
import org.eclipse.californium.scandium.DTLSConnector;
/**
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
index bf56e5a..5d934a4 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
@@ -296,7 +296,7 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
.to("mock:result");
from("direct:pskciphersuite")
- .toF(getProtocol() + "://localhost:%d/TestResource?pskStore=#pskStore&cipherSuites=TLS_PSK_WITH_AES_128_CBC_SHA256", PORT7)
+ .toF(getProtocol() + "://localhost:%d/TestResource?pskStore=#pskStore&cipherSuites=TLS_PSK_WITH_AES_128_GCM_SHA256", PORT7)
.to("mock:result");
from("direct:pskx509")
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java
index 927476a..cc9ed65 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTLSTest.java
@@ -29,8 +29,8 @@ import org.apache.camel.support.jsse.TrustManagersParameters;
import org.eclipse.californium.core.CoapClient;
import org.eclipse.californium.core.network.CoapEndpoint;
import org.eclipse.californium.core.network.config.NetworkConfig;
-import org.eclipse.californium.elements.tcp.TcpClientConnector;
-import org.eclipse.californium.elements.tcp.TlsClientConnector;
+import org.eclipse.californium.elements.tcp.netty.TcpClientConnector;
+import org.eclipse.californium.elements.tcp.netty.TlsClientConnector;
/**
* Test the CoAP Rest Component with TCP + TLS
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTest.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTest.java
index 6c8a649..25d0f7d 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTCPTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.model.rest.RestConfigurationDefinition;
import org.eclipse.californium.core.CoapClient;
import org.eclipse.californium.core.network.CoapEndpoint;
import org.eclipse.californium.core.network.config.NetworkConfig;
-import org.eclipse.californium.elements.tcp.TcpClientConnector;
+import org.eclipse.californium.elements.tcp.netty.TcpClientConnector;
/**
* Test the CoAP Rest Component with plain TCP.
diff --git a/parent/pom.xml b/parent/pom.xml
index 87d82a9..c221a00 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,7 @@
<c3p0-version>0.9.5.4</c3p0-version>
<c3p0-bundle-version>0.9.5.4_1</c3p0-bundle-version>
<caffeine-version>2.8.0</caffeine-version>
- <californium-version>2.0.0-M16</californium-version>
+ <californium-version>2.0.0</californium-version>
<cassandra-driver-version>3.7.2</cassandra-driver-version>
<cassandra-driver-guava-version>19.0</cassandra-driver-guava-version>
<cassandra-version>3.7</cassandra-version>