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:14 UTC
[camel] branch master updated (a284795 -> ca90969)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a284795 "CAMEL-14289:camel-milo - MiloClientEndpoint should be singleton"
new fce2502 Upgrade Californium to version 2.0.0
new ca90969 Camel-CoAP: Fixed Karaf feature
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:
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 +-
platforms/karaf/features/src/main/resources/features.xml | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
[camel] 01/02: Upgrade Californium to version 2.0.0
Posted by ac...@apache.org.
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>
[camel] 02/02: Camel-CoAP: Fixed Karaf feature
Posted by ac...@apache.org.
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 ca9096902511c957bf6962576b98799214f29915
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 1 18:05:44 2020 +0100
Camel-CoAP: Fixed Karaf feature
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 8ae940f..d8c5d49 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -708,7 +708,7 @@
<bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
<bundle>wrap:mvn:org.eclipse.californium/californium-core/${californium-version}</bundle>
<bundle>wrap:mvn:org.eclipse.californium/element-connector/${californium-version}</bundle>
- <bundle>wrap:mvn:org.eclipse.californium/element-connector-tcp/${californium-version}</bundle>
+ <bundle>wrap:mvn:org.eclipse.californium/element-connector-tcp-netty/${californium-version}</bundle>
<bundle>wrap:mvn:org.eclipse.californium/scandium/${californium-version}</bundle>
<bundle>mvn:org.apache.camel/camel-coap/${project.version}</bundle>
</feature>