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 2016/06/24 10:49:51 UTC
[1/2] camel git commit: Upgrade Californium to version 1.0.4
Repository: camel
Updated Branches:
refs/heads/master 07d1d2ecc -> 1ed016f5d
Upgrade Californium to version 1.0.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a68a2d31
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a68a2d31
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a68a2d31
Branch: refs/heads/master
Commit: a68a2d319f4b3accd622f8301a48e8371659151d
Parents: 07d1d2e
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Jun 24 12:44:52 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 24 12:44:52 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/coap/CoAPConsumer.java | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a68a2d31/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPConsumer.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPConsumer.java
index ac4ab6c..9465fff 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPConsumer.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPConsumer.java
@@ -75,7 +75,7 @@ public class CoAPConsumer extends DefaultConsumer {
@Override
protected void doStop() throws Exception {
for (CoapResource r : resources) {
- r.getParent().remove(r);
+ r.getParent().delete(r);
}
resources.clear();
super.doStop();
http://git-wip-us.apache.org/repos/asf/camel/blob/a68a2d31/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 234e6ff..ee399e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,7 +84,7 @@
<build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.2</c3p0-version>
<caffeine-version>2.3.1</caffeine-version>
- <californium-version>1.0.0-M3</californium-version>
+ <californium-version>1.0.4</californium-version>
<camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
<cassandra-driver-version>3.0.2</cassandra-driver-version>
<cassandra-driver-guava-version>18.0</cassandra-driver-guava-version>
[2/2] camel git commit: Added camel-coap karaf itest
Posted by ac...@apache.org.
Added camel-coap karaf itest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ed016f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ed016f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ed016f5
Branch: refs/heads/master
Commit: 1ed016f5de82b3d2c19a4e2942dd48a26774ebb4
Parents: a68a2d3
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Jun 24 12:48:28 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jun 24 12:48:28 2016 +0200
----------------------------------------------------------------------
.../apache/camel/itest/karaf/CamelCoapTest.java | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1ed016f5/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCoapTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCoapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCoapTest.java
new file mode 100644
index 0000000..42cec14
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCoapTest.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelCoapTest extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelCoapTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+}