[camel] branch master updated (a113bbc -> bfdce78)

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (a113bbc -> bfdce78)

acosentino
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 a113bbc  Removed reference to jxpath in enums of Controlbus and Language Endpoints
     new 7df124a  Removed Camel-Kestrel remaining stuff
     new 2c3c907  Removed Camel-Krati remaining stuff
     new bfdce78  Removed property placeholder and dependencies related to Krati

The 3 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:
 bom/camel-bom/pom.xml                              | 20 ---------
 parent/pom.xml                                     | 28 -------------
 .../camel-spring-boot-dependencies/pom.xml         | 25 -----------
 .../apache/camel/itest/karaf/CamelKratiTest.java   | 34 ---------------
 .../camel/itest/springboot/CamelKestrelTest.java   | 48 ----------------------
 .../camel/itest/springboot/CamelKratiTest.java     | 48 ----------------------
 6 files changed, 203 deletions(-)
 delete mode 100644 tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
 delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKestrelTest.java
 delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKratiTest.java

Reply | Threaded
Open this post in threaded view
|

[camel] 01/03: Removed Camel-Kestrel remaining stuff

acosentino
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 7df124a606f69d8e3a18fd20b6b275416c1362e9
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 14:20:48 2019 +0100

    Removed Camel-Kestrel remaining stuff
---
 bom/camel-bom/pom.xml                              | 10 -----
 parent/pom.xml                                     | 10 -----
 .../camel-spring-boot-dependencies/pom.xml         | 10 -----
 .../camel/itest/springboot/CamelKestrelTest.java   | 48 ----------------------
 4 files changed, 78 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 2b7c7de..615dc24 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1410,16 +1410,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-kestrel</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-kestrel-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-krati</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index fcd70f1..0db59e1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1526,11 +1526,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-kestrel</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-krati</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -2975,11 +2970,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-kestrel-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-krati-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index f7e99af..a625fe3 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -1635,16 +1635,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-kestrel</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-kestrel-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-krati</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKestrelTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKestrelTest.java
deleted file mode 100644
index 3cd08a4..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKestrelTest.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 CamelKestrelTest extends AbstractSpringBootTestSupport {
-
-    @Deployment
-    public static Archive<?> createSpringBootPackage() throws Exception {
-        return ArquillianPackager.springBootPackage(createTestConfig());
-    }
-
-    public static ITestConfig createTestConfig() {
-        return new ITestConfigBuilder()
-                .module(inferModuleName(CamelKestrelTest.class))
-                .build();
-    }
-
-    @Test
-    public void componentTests() throws Exception {
-        this.runComponentTest(config);
-        this.runModuleUnitTestsIfEnabled(config);
-    }
-
-
-}

Reply | Threaded
Open this post in threaded view
|

[camel] 02/03: Removed Camel-Krati remaining stuff

acosentino
In reply to this post by acosentino
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 2c3c9076b00f9df147e45b16dad5dbe31e6e6612
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 14:23:42 2019 +0100

    Removed Camel-Krati remaining stuff
---
 bom/camel-bom/pom.xml                              | 10 -----
 parent/pom.xml                                     | 10 -----
 .../camel-spring-boot-dependencies/pom.xml         | 10 -----
 .../apache/camel/itest/karaf/CamelKratiTest.java   | 34 ---------------
 .../camel/itest/springboot/CamelKratiTest.java     | 48 ----------------------
 5 files changed, 112 deletions(-)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 615dc24..49985f5 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1410,16 +1410,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-krati</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-krati-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-kubernetes</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0db59e1..885106c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1526,11 +1526,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-krati</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-kura</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -2970,11 +2965,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-krati-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-kubernetes-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index a625fe3..ba79de9 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -1635,16 +1635,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-krati</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-krati-starter</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-kubernetes</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
deleted file mode 100644
index 442ddb1..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelKratiTest.java
+++ /dev/null
@@ -1,34 +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.karaf;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class CamelKratiTest extends BaseKarafTest {
-
-    public static final String COMPONENT = extractName(CamelKratiTest.class);
-
-    @Test
-    public void test() throws Exception {
-        testComponent(COMPONENT);
-    }
-
-
-}
\ No newline at end of file
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKratiTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKratiTest.java
deleted file mode 100644
index 1b689bb..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelKratiTest.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 CamelKratiTest extends AbstractSpringBootTestSupport {
-
-    @Deployment
-    public static Archive<?> createSpringBootPackage() throws Exception {
-        return ArquillianPackager.springBootPackage(createTestConfig());
-    }
-
-    public static ITestConfig createTestConfig() {
-        return new ITestConfigBuilder()
-                .module(inferModuleName(CamelKratiTest.class))
-                .build();
-    }
-
-    @Test
-    public void componentTests() throws Exception {
-        this.runComponentTest(config);
-        this.runModuleUnitTestsIfEnabled(config);
-    }
-
-
-}

Reply | Threaded
Open this post in threaded view
|

[camel] 03/03: Removed property placeholder and dependencies related to Krati

acosentino
In reply to this post by acosentino
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 bfdce78eeba46dc027fdb8bafbfb63b59c1950d1
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Jan 11 14:29:06 2019 +0100

    Removed property placeholder and dependencies related to Krati
---
 parent/pom.xml                                                    | 8 --------
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml         | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 885106c..b4088cf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -437,7 +437,6 @@
     <karaf2-version>2.4.4</karaf2-version>
     <karaf4-version>4.2.1</karaf4-version>
     <kie-version>7.14.0.Final</kie-version>
-    <krati-version>0.4.9</krati-version>
     <kubernetes-client-version>4.1.1</kubernetes-client-version>
     <kubernetes-model-version>4.1.1</kubernetes-model-version>
     <kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
@@ -4692,13 +4691,6 @@
         <version>${zookeeper-version}</version>
       </dependency>
 
-      <!-- optional krati dependency -->
-      <dependency>
-        <groupId>com.sna-projects.krati</groupId>
-        <artifactId>krati</artifactId>
-        <version>${krati-version}</version>
-      </dependency>
-
       <!-- optional OptaPlanner dependencies -->
       <dependency>
         <groupId>org.optaplanner</groupId>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index ba79de9..f728815 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -116,11 +116,6 @@
         <version>3.4.2</version>
       </dependency>
       <dependency>
-        <groupId>com.sna-projects.krati</groupId>
-        <artifactId>krati</artifactId>
-        <version>0.4.9</version>
-      </dependency>
-      <dependency>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-core</artifactId>
         <version>2.3.0</version>