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 2019/01/14 08:47:27 UTC
[camel] branch master updated (5d238a2 -> 80d4c76)
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 5d238a2 CAMEL-13051: The camel-package-maven-plugin updated after the recent change with generating more component metafiles instead of having them in the source.
new 57e6670 Removed Camel-SCR remaining stuff
new ee833bb Removed Camel-servletlistener remaining stuff
new 6f5e2d5 Removed camel-swagger remaining stuff
new e68418b Removed camel-testng remaining stuff
new e556495 Removed camel-urlrewrite remaining stuff
new 6392b0e Removed Camel-urlrewrite SB itest
new e774fef Removed camel-servletlistener SB Itest
new 3d80efd Removed camel-xmlrpc remaining stuff
new 27957ab Removed camel-xmlrpc SB Itest
new a48786f6 Removed property placeholders for urlrewrite
new bd65e6d Removed property placeholders for xmlrpc
new 114b220 Regen
new 80d4c76 Removed camel-swagger remaining stuff (finally)
The 13 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 | 45 --------------------
.../camel/http/common/HttpServletUrlRewrite.java | 3 --
parent/pom.xml | 49 ----------------------
.../camel-spring-boot-dependencies/pom.xml | 40 ------------------
.../itest/springboot/CamelServletlistenerTest.java | 48 ---------------------
.../itest/springboot/CamelUrlrewriteTest.java | 48 ---------------------
.../camel/itest/springboot/CamelXmlrpcTest.java | 47 ---------------------
.../maven/packaging/SpringBootStarterMojo.java | 3 +-
.../spring-boot-fix-dependencies.properties | 2 -
9 files changed, 1 insertion(+), 284 deletions(-)
delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletlistenerTest.java
delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUrlrewriteTest.java
delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelXmlrpcTest.java
[camel] 09/13: Removed camel-xmlrpc SB Itest
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 27957ab3ce42d3cb8d939e9bb7fb9525cffc61fc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:53:21 2019 +0100
Removed camel-xmlrpc SB Itest
---
.../camel/itest/springboot/CamelXmlrpcTest.java | 47 ----------------------
1 file changed, 47 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelXmlrpcTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelXmlrpcTest.java
deleted file mode 100644
index d848e0a..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelXmlrpcTest.java
+++ /dev/null
@@ -1,47 +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 CamelXmlrpcTest extends AbstractSpringBootTestSupport {
-
- @Deployment
- public static Archive<?> createSpringBootPackage() throws Exception {
- return ArquillianPackager.springBootPackage(createTestConfig());
- }
-
- public static ITestConfig createTestConfig() {
- return new ITestConfigBuilder()
- .module(inferModuleName(CamelXmlrpcTest.class))
- .build();
- }
-
- @Test
- public void componentTests() throws Exception {
- this.runComponentTest(config);
- this.runModuleUnitTestsIfEnabled(config);
- }
-
-}
[camel] 01/13: Removed Camel-SCR remaining stuff
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 57e66704ee4c31fd7a3a75696fbcdfc6a52ad487
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:26:58 2019 +0100
Removed Camel-SCR remaining stuff
---
bom/camel-bom/pom.xml | 5 -----
parent/pom.xml | 5 -----
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 -----
.../java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 2 +-
4 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 27e368f..9ebdcd5 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2041,11 +2041,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scr</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-script</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 2a331dd..231bc3c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1838,11 +1838,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scr</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-script</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 972db96..b705316 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
@@ -2256,11 +2256,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scr</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-script</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index 54b8aef..1330665 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -85,7 +85,7 @@ import org.apache.maven.shared.dependency.tree.traversal.CollectingDependencyNod
public class SpringBootStarterMojo extends AbstractMojo {
private static final String[] IGNORE_MODULES = {
- /* OSGi -> */ "camel-blueprint", "camel-core-osgi", "camel-eventadmin", "camel-paxlogging", "camel-scr",
+ /* OSGi -> */ "camel-blueprint", "camel-core-osgi", "camel-eventadmin", "camel-paxlogging",
/* Java EE -> */ "camel-cdi", "camel-ejb",
/* deprecated (and not working perfectly) -> */ "camel-swagger", "camel-mina", "camel-ibatis",
/* currently incompatible */ "camel-spark-rest",
[camel] 08/13: Removed camel-xmlrpc remaining stuff
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 3d80efdc1fa51d321303edad5ec9a4c4e970db86
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:53:00 2019 +0100
Removed camel-xmlrpc remaining stuff
---
bom/camel-bom/pom.xml | 10 ----------
parent/pom.xml | 10 ----------
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ----------
3 files changed, 30 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 1893137..a66578c 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2621,16 +2621,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xmlrpc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xmlrpc-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-xmlsecurity</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index a44813e..cc71424 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2153,11 +2153,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xmlrpc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-xmlsecurity</artifactId>
<version>${project.version}</version>
</dependency>
@@ -3472,11 +3467,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xmlrpc-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-xmlsecurity-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 b319ed2..43ac398 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
@@ -2841,16 +2841,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-xmlrpc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xmlrpc-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-xmlsecurity</artifactId>
<version>${project.version}</version>
</dependency>
[camel] 07/13: Removed camel-servletlistener SB Itest
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 e774fefacb56bf8a09e86db730019b16deb377fe
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:48:18 2019 +0100
Removed camel-servletlistener SB Itest
---
.../itest/springboot/CamelServletlistenerTest.java | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletlistenerTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletlistenerTest.java
deleted file mode 100644
index 09881b4..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletlistenerTest.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 CamelServletlistenerTest extends AbstractSpringBootTestSupport {
-
- @Deployment
- public static Archive<?> createSpringBootPackage() throws Exception {
- return ArquillianPackager.springBootPackage(createTestConfig());
- }
-
- public static ITestConfig createTestConfig() {
- return new ITestConfigBuilder()
- .module(inferModuleName(CamelServletlistenerTest.class))
- .build();
- }
-
- @Test
- public void componentTests() throws Exception {
- // no component test
- this.runModuleUnitTestsIfEnabled(config);
- }
-
-
-}
[camel] 05/13: Removed camel-urlrewrite remaining stuff
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 e5564952ce6cc2817c4bb448d8f87a93d7ac8979
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:46:55 2019 +0100
Removed camel-urlrewrite remaining stuff
---
bom/camel-bom/pom.xml | 10 ----------
.../org/apache/camel/http/common/HttpServletUrlRewrite.java | 3 ---
parent/pom.xml | 10 ----------
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ----------
4 files changed, 33 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 5ccfaa9..1893137 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2541,16 +2541,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-urlrewrite</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-urlrewrite-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-util</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletUrlRewrite.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletUrlRewrite.java
index f6db8f1..39386cd 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletUrlRewrite.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletUrlRewrite.java
@@ -23,9 +23,6 @@ import org.apache.camel.Producer;
/**
* Extended {@link UrlRewrite} which leverages {@link HttpServletRequest}
* during the rewrite process.
- * <p/>
- * For example the camel-urlrewrite component supports
- * {@link HttpServletUrlRewrite} implementations.
*/
public interface HttpServletUrlRewrite extends UrlRewrite {
diff --git a/parent/pom.xml b/parent/pom.xml
index b57c418..a44813e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2113,11 +2113,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-urlrewrite</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
<version>${project.version}</version>
</dependency>
@@ -3442,11 +3437,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-urlrewrite-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-velocity-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 a524d9e..b319ed2 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
@@ -2761,16 +2761,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-urlrewrite</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-urlrewrite-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-util</artifactId>
<version>${project.version}</version>
</dependency>
[camel] 11/13: Removed property placeholders for xmlrpc
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 bd65e6d67609362e850eeeef75cc0116d40143d3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 09:05:40 2019 +0100
Removed property placeholders for xmlrpc
---
parent/pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4b19908..8b04331 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -717,8 +717,6 @@
<xmlgraphics-commons-bundle-version>2.3_1</xmlgraphics-commons-bundle-version>
<xmlgraphics-batik-version>1.10</xmlgraphics-batik-version>
<xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
- <xmlrpc-version>3.1.3</xmlrpc-version>
- <xmlrpc-client-bundle-version>3.1.3_1</xmlrpc-client-bundle-version>
<xmlsec-version>2.1.2</xmlsec-version>
<xmlunit-version>2.6.2</xmlunit-version>
<xpp3-bundle-version>1.1.4c_7</xpp3-bundle-version>
[camel] 04/13: Removed camel-testng remaining stuff
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 e68418b925ad760ecf2423a3d41dd5851cad77a6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:36:11 2019 +0100
Removed camel-testng remaining stuff
---
bom/camel-bom/pom.xml | 5 -----
parent/pom.xml | 5 -----
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 -----
.../java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 1 -
4 files changed, 16 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index db2d08f..5ccfaa9 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2481,11 +2481,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testng</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-thrift</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index e608ce7..b57c418 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2083,11 +2083,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testng</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-thrift</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 52bb737..a524d9e 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
@@ -2701,11 +2701,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testng</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-thrift</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index 1330665..ae8c9f7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -549,7 +549,6 @@ public class SpringBootStarterMojo extends AbstractMojo {
}
if (IGNORE_TEST_MODULES && (project.getArtifactId().startsWith("camel-test")
- || project.getArtifactId().startsWith("camel-testng")
|| project.getArtifactId().startsWith("camel-testcontainers"))) {
getLog().debug("Test components are ignored");
return false;
[camel] 02/13: Removed Camel-servletlistener remaining stuff
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 ee833bb6f843a63e6fa4ab6b9692d491b3d5c36a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:30:07 2019 +0100
Removed Camel-servletlistener remaining stuff
---
bom/camel-bom/pom.xml | 10 ----------
parent/pom.xml | 10 ----------
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ----------
.../src/main/resources/spring-boot-fix-dependencies.properties | 2 --
4 files changed, 32 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 9ebdcd5..f07a5f5 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2081,16 +2081,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-servletlistener</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-servletlistener-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-shiro</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 231bc3c..e608ce7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1858,11 +1858,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-servletlistener</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-sip</artifactId>
<version>${project.version}</version>
</dependency>
@@ -3237,11 +3232,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-servletlistener-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-servlet-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 b705316..52bb737 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
@@ -2296,16 +2296,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-servletlistener</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-servletlistener-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-shiro</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
index 2ee924b..b2a0a0e 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
@@ -50,7 +50,5 @@ camel-spring-ws=org.springframework.boot:spring-boot-starter-web:${spring-boot-v
# Force the spring-boot version of jetty
camel-salesforce=org.eclipse.jetty:jetty-client,org.eclipse.jetty:jetty-util,org.eclipse.jetty:jetty-util-ajax,org.eclipse.jetty:jetty-io
-camel-servletlistener=javax.servlet:javax.servlet-api
-
# Existed for Netty 3
exclude_camel-hbase=io.netty:netty
[camel] 03/13: Removed camel-swagger remaining stuff
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 6f5e2d5de51882865183706b7e7514ad60bbb9c3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:33:50 2019 +0100
Removed camel-swagger remaining stuff
---
bom/camel-bom/pom.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index f07a5f5..db2d08f 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2396,11 +2396,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-swagger</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-swagger-java</artifactId>
<version>${project.version}</version>
</dependency>
[camel] 06/13: Removed Camel-urlrewrite SB itest
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 6392b0ec171c77ad0a3daa21b9aa300d6940deb4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 08:47:22 2019 +0100
Removed Camel-urlrewrite SB itest
---
.../itest/springboot/CamelUrlrewriteTest.java | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUrlrewriteTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUrlrewriteTest.java
deleted file mode 100644
index bfd7a97..0000000
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUrlrewriteTest.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 CamelUrlrewriteTest extends AbstractSpringBootTestSupport {
-
- @Deployment
- public static Archive<?> createSpringBootPackage() throws Exception {
- return ArquillianPackager.springBootPackage(createTestConfig());
- }
-
- public static ITestConfig createTestConfig() {
- return new ITestConfigBuilder()
- .module(inferModuleName(CamelUrlrewriteTest.class))
- .build();
- }
-
- @Test
- public void componentTests() throws Exception {
- // no component test
- this.runModuleUnitTestsIfEnabled(config);
- }
-
-
-}
[camel] 12/13: Regen
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 114b2205a144bf1d7c0d3224ad64e7f129effae0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 09:44:19 2019 +0100
Regen
---
bom/camel-bom/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index a66578c..d235056 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2396,6 +2396,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-swagger</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-swagger-java</artifactId>
<version>${project.version}</version>
</dependency>
[camel] 10/13: Removed property placeholders for urlrewrite
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 a48786f67afbce369cf092a4966d790e18b28b99
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 09:04:50 2019 +0100
Removed property placeholders for urlrewrite
---
parent/pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index cc71424..4b19908 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -683,8 +683,6 @@
<univocity-parsers-version>2.7.6</univocity-parsers-version>
<unix-socket-factory-version>2015-01-27T15-02-14</unix-socket-factory-version>
<unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version>
- <urlrewritefilter-version>4.0.4</urlrewritefilter-version>
- <urlrewritefilter-bundle-version>4.0.4_1</urlrewritefilter-bundle-version>
<validation-1-api-version>1.1.0.Final</validation-1-api-version>
<validation-api-version>2.0.1.Final</validation-api-version>
<velocity-bundle-version>1.7_6</velocity-bundle-version>
[camel] 13/13: Removed camel-swagger remaining stuff (finally)
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 80d4c762f68020942e0a1870bae4dc135385f3a3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 14 09:45:53 2019 +0100
Removed camel-swagger remaining stuff (finally)
---
bom/camel-bom/pom.xml | 5 -----
parent/pom.xml | 5 -----
2 files changed, 10 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index d235056..a66578c 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2396,11 +2396,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-swagger</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-swagger-java</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8b04331..6473e29 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2019,11 +2019,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-swagger</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-swagger-java</artifactId>
<version>${project.version}</version>
</dependency>