SM-2474: Consistent usage of scala bundle
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/eac519e2 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/eac519e2 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/eac519e2 Branch: refs/heads/servicemix-5.4.x Commit: eac519e2b09e74c4b63b6c02d1af4545c22c62c8 Parents: 5582945 Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Mar 9 22:51:31 2015 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue Mar 10 20:31:37 2015 +0100 ---------------------------------------------------------------------- assembly/src/main/filtered-resources/features.xml | 2 +- itests/pom.xml | 7 ------- .../servicemix/itests/IntegrationTestConfigurations.scala | 2 +- pom.xml | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/eac519e2/assembly/src/main/filtered-resources/features.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml index b306ea2..95425d7 100644 --- a/assembly/src/main/filtered-resources/features.xml +++ b/assembly/src/main/filtered-resources/features.xml @@ -69,7 +69,7 @@ <!-- Akka support --> <feature name="akka" version="${akka.version}" resolver="(obr)"> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala.bundle.version}</bundle> + <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala.version}</bundle> <bundle dependency="true">mvn:com.typesafe/config/${typesafe-config.version}</bundle> <bundle>mvn:com.typesafe.akka/akka-osgi_2.10/${akka.version}</bundle> <bundle>mvn:com.typesafe.akka/akka-camel_2.10/${akka.version}</bundle> http://git-wip-us.apache.org/repos/asf/servicemix/blob/eac519e2/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index d2196b2..189a08b 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -44,13 +44,6 @@ </dependency> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.scala-library</artifactId> - <version>${scala.bundle.version}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/servicemix/blob/eac519e2/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala ---------------------------------------------------------------------- diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala index 5acbfd2..660dc23 100644 --- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala +++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala @@ -38,7 +38,7 @@ trait IntegrationTestConfigurations { * Add support for Scala-based integration tests */ def scalaTestConfiguration = - Array(mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.scala-library").versionAsInProject()) + Array(mavenBundle("org.scala-lang", "scala-library").versionAsInProject()) /** * Add an Apache ServiceMix container configuration http://git-wip-us.apache.org/repos/asf/servicemix/blob/eac519e2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3e8121b..ff42ad2 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,6 @@ <drools.bundle.version>${drools.version}_1</drools.bundle.version> <jaxb.api.version>2.2</jaxb.api.version> <osgi.version>5.0.0</osgi.version> - <scala.bundle.version>2.10.2_1</scala.bundle.version> <wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version> <swagger.bundle.version>1.3.2_1</swagger.bundle.version> <swagger.jaxrs.bundle.version>1.3.2_2</swagger.jaxrs.bundle.version>
