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 a137824e1b8a640a25ed2ba4cffeaef991acd364
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Jan 14 10:26:07 2019 +0100
Removed Camel-Scala remaining stuff
---
bom/camel-bom/pom.xml | 5 -----
parent/pom.xml | 5 -----
platforms/karaf/features/src/main/resources/bundles.properties | 3 ---
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 -----
.../java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 2 +-
.../src/main/resources/spring-boot-fix-dependencies.properties | 2 --
6 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index a66578c..51d31c6 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2026,11 +2026,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scala</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-schematron</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6473e29..d2ef2b7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1824,11 +1824,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scala</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-schematron</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/platforms/karaf/features/src/main/resources/bundles.properties
b/platforms/karaf/features/src/main/resources/bundles.properties
index 10a4220..69de20d 100644
--- a/platforms/karaf/features/src/main/resources/bundles.properties
+++ b/platforms/karaf/features/src/main/resources/bundles.properties
@@ -83,6 +83,3 @@
org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bu
#Apache CXF bundle
org.apache.cxf/cxf-bundle/${cxf-version}/jar
-
-#Other bundles
-org.scala-lang/scala-bundle/${scala-version}/jar
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 43ac398..462752a 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
@@ -2241,11 +2241,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scala</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-schematron</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 ae8c9f7..d86b469 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
@@ -89,7 +89,7 @@ public class SpringBootStarterMojo extends AbstractMojo {
/* Java EE -> */ "camel-cdi", "camel-ejb",
/* deprecated (and not working perfectly) -> */ "camel-swagger",
"camel-mina", "camel-ibatis",
/* currently incompatible */ "camel-spark-rest",
- /* others (not managed) -> */ "camel-core-xml", "camel-scala"};
+ /* others (not managed) -> */ "camel-core-xml"};
private static final boolean IGNORE_TEST_MODULES = true;
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 b2a0a0e..550c4e7 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
@@ -40,8 +40,6 @@ camel-jcr=org.apache.lucene:lucene-core:${lucene3-version}
camel-jms=org.apache.geronimo.specs:geronimo-jms_1.1_spec
camel-jpa=org.apache.geronimo.specs:geronimo-jpa_2.1_spec
-camel-scala=org.scala-lang:scala-library:${scala-version},org.scala-lang.modules:scala-xml_2.11:${scalaxml-version}
-
camel-sjms=org.apache.geronimo.specs:geronimo-jms_1.1_spec
camel-sjms2=org.apache.geronimo.specs:geronimo-jms_2.0_spec
camel-spring-boot=org.apache.camel:camel-core-starter
