Repository: camel Updated Branches: refs/heads/master 4c103d84d -> 037b49485
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index ecd5565..ecbae00 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -76,7 +76,6 @@ <module>camel-example-mybatis</module> <module>camel-example-netty-http</module> <module>camel-example-opentracing</module> - <module>camel-example-osgi-rmi</module> <module>camel-example-pojo-messaging</module> <module>camel-example-reactive-streams</module> <module>camel-example-reload</module> http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 450c3cb..fb23dc3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -619,8 +619,6 @@ <spring-ldap-bundle-version>2.3.1.RELEASE_1</spring-ldap-bundle-version> <!-- spring 1.1.0 is not OSGi bundle any more --> <spring-retry-version>1.0.3.RELEASE</spring-retry-version> - <!-- spring-dm only supports spring 3.x --> - <spring-dm-version-range>[3.2,4)</spring-dm-version-range> <spring-all-version-range>[3.2,5)</spring-all-version-range> <!-- karaf 3.x/4.x supports spring 4.1 onwards --> <spring-version-range>[4.1,5)</spring-version-range> @@ -1905,11 +1903,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-dm</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-spring-batch</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/platforms/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index 11adb87..65919f7 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -186,8 +186,7 @@ <!-- camel-ignite requires to install apache ignite first --> <!-- camel-guice does not work in OSGi currently --> <!-- camel-leveldb uses some wrap magic to install which validator fails but it works --> - <!-- camel-spring-dm cannot be validated --> - <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb|spring-dm))*</feature> + <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb))*</feature> </features> <configuration>file://${project.build.directory}/classes/config.properties</configuration> </configuration> http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 7e4a776..ab40858 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -34,7 +34,7 @@ <feature name='camel' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <feature version='${project.version}'>camel-blueprint</feature> - <!-- we no longer install camel-spring by default as spring-dm is deprecated --> + <!-- we no longer install camel-spring by default --> </feature> <feature name='camel-core' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${servicemix-specs-version}'>xml-specs-api</feature> @@ -64,15 +64,6 @@ <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-spring/${project.version}</bundle> </feature> - <!-- disabled camel-spring-dm so users don't install it by accident: CAMEL-11059 - <feature name='camel-spring-dm' version='${project.version}' resolver='(obr)' start-level='50'> - <details>camel-spring-dm is deprecated and is strongly advised not to be used. Use blueprint instead</details> - <feature version='[1.2,2)'>spring-dm</feature> - <feature version='${spring-dm-version-range}'>spring</feature> - <feature version='${spring-dm-version-range}'>spring-tx</feature> - <bundle>mvn:org.apache.camel/camel-spring-dm/${project.version}</bundle> - </feature> - --> <feature name='camel-scr' version='${project.version}' resolver='(obr)' start-level='50'> <details>camel-scr is deprecated. Consider using blueprint instead</details> <feature version='${project.version}'>camel-core</feature> http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java deleted file mode 100644 index d312b2e..0000000 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelSpringTest.java +++ /dev/null @@ -1,60 +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; - -import java.net.URL; - -import org.apache.camel.CamelContext; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.karaf.AbstractFeatureTest; -import org.apache.camel.test.karaf.CamelKarafTestSupport; -import org.apache.camel.util.ObjectHelper; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; - -@Ignore("spring-dm not work and is to be removed") -@RunWith(PaxExam.class) -public class CamelSpringTest extends AbstractFeatureTest { - - @Test - public void testCamelSpring() throws Exception { - // install the camel blueprint xml file we use in this test - URL url = ObjectHelper.loadResourceAsURL("org/apache/camel/itest/CamelSpringTest.xml", CamelSpringTest.class.getClassLoader()); - installSpringAsBundle("CamelSpringTest", url, true); - - // lookup Camel from OSGi - CamelContext camel = getOsgiService(bundleContext, CamelContext.class); - - // test camel - MockEndpoint mock = camel.getEndpoint("mock:result", MockEndpoint.class); - mock.expectedBodiesReceived("Bye World"); - - camel.createProducerTemplate().sendBody("direct:start", "World"); - - mock.assertIsSatisfied(); - } - - @Configuration - public Option[] configure() { - return CamelKarafTestSupport.configure("camel-test-karaf", "camel-spring-dm"); - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java index f98d4f3..b4235e9 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java @@ -147,11 +147,6 @@ public class PrepareCatalogKarafMojo extends AbstractMojo { File[] components = componentsDir.listFiles(); if (components != null) { for (File dir : components) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } - if (dir.isDirectory() && !"target".equals(dir.getName())) { File target = new File(dir, "target/classes"); @@ -235,10 +230,6 @@ public class PrepareCatalogKarafMojo extends AbstractMojo { if (dataFormats != null) { for (File dir : dataFormats) { if (dir.isDirectory() && !"target".equals(dir.getName())) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } // the directory must be in the list of known features if (!features.contains(dir.getName())) { continue; @@ -309,10 +300,6 @@ public class PrepareCatalogKarafMojo extends AbstractMojo { File[] languages = componentsDir.listFiles(); if (languages != null) { for (File dir : languages) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } // the directory must be in the list of known features if (!features.contains(dir.getName())) { continue; http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index 1701390..4f6c09b 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -339,10 +339,6 @@ public class PrepareCatalogMojo extends AbstractMojo { File[] components = componentsDir.listFiles(); if (components != null) { for (File dir : components) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } if (dir.isDirectory() && !"target".equals(dir.getName())) { File target = new File(dir, "target/classes"); @@ -669,10 +665,6 @@ public class PrepareCatalogMojo extends AbstractMojo { File[] languages = componentsDir.listFiles(); if (languages != null) { for (File dir : languages) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } if (dir.isDirectory() && !"target".equals(dir.getName())) { File target = new File(dir, "target/classes"); findLanguageFilesRecursive(target, jsonFiles, languageFiles, new CamelLanguagesFileFilter()); http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java index dc17b64..6618520 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java @@ -142,12 +142,6 @@ public class PrepareCatalogSpringBootMojo extends AbstractMojo { File[] components = componentsDir.listFiles(); if (components != null) { for (File dir : components) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } - - if (dir.isDirectory() && !"target".equals(dir.getName())) { File target = new File(dir, "target/classes"); @@ -241,10 +235,6 @@ public class PrepareCatalogSpringBootMojo extends AbstractMojo { if (dataFormats != null) { for (File dir : dataFormats) { if (dir.isDirectory() && !"target".equals(dir.getName())) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } // the directory must be in the list of known starters if (!starters.contains(dir.getName())) { continue; @@ -326,10 +316,6 @@ public class PrepareCatalogSpringBootMojo extends AbstractMojo { File[] languages = componentsDir.listFiles(); if (languages != null) { for (File dir : languages) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } // the directory must be in the list of known starters if (!starters.contains(dir.getName())) { continue; @@ -412,10 +398,6 @@ public class PrepareCatalogSpringBootMojo extends AbstractMojo { File[] others = componentsDir.listFiles(); if (others != null) { for (File dir : others) { - // skip camel-spring-dm - if (dir.isDirectory() && "camel-spring-dm".equals(dir.getName())) { - continue; - } // the directory must be in the list of known starters if (!starters.contains(dir.getName())) { continue; http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java ---------------------------------------------------------------------- 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 19098fa..ac480d6 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 @@ -81,7 +81,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-spring-dm", "camel-eventadmin", "camel-paxlogging", "camel-scr", + /* OSGi -> */ "camel-blueprint", "camel-core-osgi", "camel-eventadmin", "camel-paxlogging", "camel-scr", /* Java EE -> */ "camel-cdi", "camel-ejb", /* deprecated (and not working perfectly) -> */ "camel-swagger", "camel-mina", "camel-ibatis", "camel-quartz", /* currently incompatible */ "camel-jclouds", "camel-spark-rest",
