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 2018/07/04 12:53:47 UTC
[camel] branch master updated (f19b8e5 -> 2cb4344)
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 f19b8e5 [CAMEL-12621] fix checkstyle
new afff7af Upgrade Xchange to version 4.3.8
new ad059c6 Upgrade Web3j to version 3.4.0
new bc25edc Fixed camel-web3j Karaf feature
new 207f1cb Added camel-web3j Karaf integration test
new 2cb4344 Added camel-web3j Spring-boot test
The 5 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:
parent/pom.xml | 4 ++--
platforms/karaf/features/src/main/resources/features.xml | 7 ++++---
.../camel/itest/karaf/{CamelAhcTest.java => CamelWeb3jTest.java} | 4 ++--
.../itest/springboot/{CamelCmSmsTest.java => CamelWeb3jTest.java} | 4 ++--
4 files changed, 10 insertions(+), 9 deletions(-)
copy tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{CamelAhcTest.java => CamelWeb3jTest.java} (89%)
copy tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelCmSmsTest.java => CamelWeb3jTest.java} (92%)
[camel] 01/05: Upgrade Xchange to version 4.3.8
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 afff7afa60130d22c2a85530cb90be026d30592a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 4 14:29:23 2018 +0200
Upgrade Xchange to version 4.3.8
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fa46718..00e2117 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -724,7 +724,7 @@
<!-- xbean-asm4-bundle is used by openjpa -->
<xbean-asm4-bundle-version>3.14</xbean-asm4-bundle-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
- <xchange-version>4.3.7</xchange-version>
+ <xchange-version>4.3.8</xchange-version>
<xerces-bundle-version>2.11.0_1</xerces-bundle-version>
<xerces-version>2.11.0</xerces-version>
<!-- needed to manage the xml-apis version in camel-xmljson -->
[camel] 05/05: Added camel-web3j Spring-boot test
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 2cb4344e2e77552989e2a4e8a991799fd05300b3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 4 14:52:33 2018 +0200
Added camel-web3j Spring-boot test
---
.../camel/itest/springboot/CamelWeb3jTest.java | 48 ++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWeb3jTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWeb3jTest.java
new file mode 100644
index 0000000..4a8894c
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWeb3jTest.java
@@ -0,0 +1,48 @@
+/**
+ * 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.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelWeb3jTest extends AbstractSpringBootTestSupport {
+
+ @Deployment
+ public static Archive<?> createSpringBootPackage() throws Exception {
+ return ArquillianPackager.springBootPackage(createTestConfig());
+ }
+
+ public static ITestConfig createTestConfig() {
+ return new ITestConfigBuilder()
+ .module(inferModuleName(CamelWeb3jTest.class))
+ .build();
+ }
+
+ @Test
+ public void componentTests() throws Exception {
+ this.runComponentTest(config);
+ this.runModuleUnitTestsIfEnabled(config);
+ }
+
+
+}
[camel] 03/05: Fixed camel-web3j 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 bc25edc30b2712991883539d5c07f49d00e55cd1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 4 14:48:06 2018 +0200
Fixed camel-web3j Karaf feature
---
platforms/karaf/features/src/main/resources/features.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 8d29641..18f0364 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2366,9 +2366,10 @@
</feature>
<feature name='camel-web3j' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.web3j/core/${web3j-version}</bundle>
- <bundle dependency='true'>mvn:org.web3j/geth/${web3j-version}</bundle>
- <bundle dependency='true'>mvn:org.web3j/parity/${web3j-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.web3j/core/${web3j-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.web3j/geth/${web3j-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.web3j/parity/${web3j-version}</bundle>
+ <bundle dependency='true'>mvn:io.reactivex/rxjava/${rxjava-version}</bundle>
<bundle>mvn:org.apache.camel/camel-web3j/${project.version}</bundle>
</feature>
<feature name='camel-wordpress' version='${project.version}' resolver='(obr)' start-level='50'>
[camel] 02/05: Upgrade Web3j to version 3.4.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 ad059c629ff212f51394aa05bc445dfeac51bbec
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 4 14:32:16 2018 +0200
Upgrade Web3j to version 3.4.0
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 00e2117..095fe341 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -708,7 +708,7 @@
<vertx-version>3.5.2</vertx-version>
<vertx-jackson-version>2.9.0</vertx-jackson-version>
<vysper-version>0.7</vysper-version>
- <web3j-version>3.3.1</web3j-version>
+ <web3j-version>3.4.0</web3j-version>
<weld1-version>1.1.28.Final</weld1-version>
<weld2-version>2.4.7.Final</weld2-version>
<weld3-version>3.0.4.Final</weld3-version>
[camel] 04/05: Added camel-web3j Karaf integration test
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 207f1cb1e9a7c0f4b66cb40028f4250885812f4d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 4 14:48:22 2018 +0200
Added camel-web3j Karaf integration test
---
.../apache/camel/itest/karaf/CamelWeb3jTest.java | 33 ++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeb3jTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeb3jTest.java
new file mode 100644
index 0000000..8c3603c
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeb3jTest.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 CamelWeb3jTest extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelWeb3jTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+}