You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/30 19:57:12 UTC

[camel-spring-boot] branch master updated (69c87c1 -> 5815e97)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.


    from 69c87c1  Regen
     new 85001a6  Remove kura test as kura is OSGi
     new 5815e97  Regen

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-starter/README.adoc                     |  2 +-
 components-starter/camel-corda-starter/pom.xml     | 12 ------
 .../camel-infinispan-starter/pom.xml               | 11 +++++
 .../camel-spring-boot-starter/pom.xml              | 16 --------
 .../camel-spring-cloud-consul-starter/pom.xml      | 20 ---------
 .../camel-spring-cloud-netflix-starter/pom.xml     | 20 ---------
 .../camel-spring-cloud-starter/pom.xml             | 20 ---------
 .../camel-spring-cloud-zookeeper-starter/pom.xml   | 20 ---------
 .../camel/itest/springboot/CamelKuraTest.java      | 48 ----------------------
 tooling/camel-spring-boot-dependencies/pom.xml     | 10 +++++
 10 files changed, 22 insertions(+), 157 deletions(-)
 delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKuraTest.java


[camel-spring-boot] 01/02: Remove kura test as kura is OSGi

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 85001a64e3a4b8e4e3766596bd77413c208aaf82
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 30 21:56:46 2020 +0200

    Remove kura test as kura is OSGi
---
 .../camel/itest/springboot/CamelKuraTest.java      | 48 ----------------------
 1 file changed, 48 deletions(-)

diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKuraTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKuraTest.java
deleted file mode 100644
index 433ca35..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKuraTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 CamelKuraTest extends AbstractSpringBootTestSupport {
-
-    @Deployment
-    public static Archive<?> createSpringBootPackage() throws Exception {
-        return ArquillianPackager.springBootPackage(createTestConfig());
-    }
-
-    public static ITestConfig createTestConfig() {
-        return new ITestConfigBuilder()
-                .module(inferModuleName(CamelKuraTest.class))
-                .build();
-    }
-
-    @Test
-    public void componentTests() throws Exception {
-        // no component test
-        this.runModuleUnitTestsIfEnabled(config);
-    }
-
-
-}


[camel-spring-boot] 02/02: Regen

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 5815e97a30bfdbfd186f735f4cf1f720813f35d7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 30 21:56:54 2020 +0200

    Regen
---
 components-starter/README.adoc                       |  2 +-
 components-starter/camel-corda-starter/pom.xml       | 12 ------------
 components-starter/camel-infinispan-starter/pom.xml  | 11 +++++++++++
 components-starter/camel-spring-boot-starter/pom.xml | 16 ----------------
 .../camel-spring-cloud-consul-starter/pom.xml        | 20 --------------------
 .../camel-spring-cloud-netflix-starter/pom.xml       | 20 --------------------
 .../camel-spring-cloud-starter/pom.xml               | 20 --------------------
 .../camel-spring-cloud-zookeeper-starter/pom.xml     | 20 --------------------
 tooling/camel-spring-boot-dependencies/pom.xml       | 10 ++++++++++
 9 files changed, 22 insertions(+), 109 deletions(-)

diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index ff64687..f111e24 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -59,7 +59,7 @@ Number of Camel components: 326 in 259 JAR artifacts (1 deprecated)
 | link:https://camel.apache.org/components/latest/atomix-value-component.html[Atomix Value] (camel-atomix-starter) +
 `atomix-value:resourceName` | 2.20 | The atomix-value component is used to access Atomix's distributed value.
 
-| link:https://camel.apache.org/components/latest/avro-component.html[Avro] (camel-avro-starter) +
+| link:https://camel.apache.org/components/latest/avro-component.html[Avro] (camel-avro-rpc-starter) +
 `avro:transport:host:port/messageName` | 2.10 | Working with Apache Avro for data serialization.
 
 | link:https://camel.apache.org/components/latest/aws2-cw-component.html[AWS 2 CloudWatch] (camel-aws2-cw-starter) +
diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index cba8670..61d6d32 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,18 +38,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-corda</artifactId>
       <version>${camel-version}</version>
-      <!--START OF GENERATED CODE-->
-      <exclusions>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-        </exclusion>
-      </exclusions>
-      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-infinispan-starter/pom.xml b/components-starter/camel-infinispan-starter/pom.xml
index 668a8ed..89a5bfb 100644
--- a/components-starter/camel-infinispan-starter/pom.xml
+++ b/components-starter/camel-infinispan-starter/pom.xml
@@ -56,4 +56,15 @@
     </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
+  <!-- TODO: Spring Boot 2.3.x is required for Infinispan 10.x support -->
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/components-starter/camel-spring-boot-starter/pom.xml b/components-starter/camel-spring-boot-starter/pom.xml
index c1ca9d2..5760e35 100644
--- a/components-starter/camel-spring-boot-starter/pom.xml
+++ b/components-starter/camel-spring-boot-starter/pom.xml
@@ -48,22 +48,6 @@
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-core</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-        </exclusion>
       </exclusions>
       <!--END OF GENERATED CODE-->
     </dependency>
diff --git a/components-starter/camel-spring-cloud-consul-starter/pom.xml b/components-starter/camel-spring-cloud-consul-starter/pom.xml
index 31e9a5e..65392d9 100644
--- a/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -38,26 +38,6 @@
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-cloud-consul</artifactId>
       <version>${project.version}</version>
-      <!--START OF GENERATED CODE-->
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-        </exclusion>
-      </exclusions>
-      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index 7b038ab..6792135 100644
--- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -38,26 +38,6 @@
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-cloud-netflix</artifactId>
       <version>${project.version}</version>
-      <!--START OF GENERATED CODE-->
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-        </exclusion>
-      </exclusions>
-      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-spring-cloud-starter/pom.xml b/components-starter/camel-spring-cloud-starter/pom.xml
index 480eeec..ce02d1e 100644
--- a/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-starter/pom.xml
@@ -38,26 +38,6 @@
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-cloud</artifactId>
       <version>${project.version}</version>
-      <!--START OF GENERATED CODE-->
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-        </exclusion>
-      </exclusions>
-      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index 5f3927a..e70dbf9 100644
--- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -38,26 +38,6 @@
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-cloud-zookeeper</artifactId>
       <version>${project.version}</version>
-      <!--START OF GENERATED CODE-->
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-        </exclusion>
-      </exclusions>
-      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index e5e4810..0848289 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -758,6 +758,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel.springboot</groupId>
+        <artifactId>camel-elytron-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel.springboot</groupId>
         <artifactId>camel-etcd-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -1143,6 +1148,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel.springboot</groupId>
+        <artifactId>camel-kura-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel.springboot</groupId>
         <artifactId>camel-language-starter</artifactId>
         <version>${project.version}</version>
       </dependency>