activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject [1/2] git commit: https://issues.apache.org/jira/browse/AMQ-5176 - use scala 2.11 in karaf
Date Tue, 03 Jun 2014 11:26:52 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk aa2dfb60a -> 14fcd7cbe


https://issues.apache.org/jira/browse/AMQ-5176 - use scala 2.11 in karaf


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a4682fcb
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a4682fcb
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a4682fcb

Branch: refs/heads/trunk
Commit: a4682fcb476b1122d719e3b3a6e2fcac918cfed7
Parents: aa2dfb6
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Tue Jun 3 13:23:39 2014 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Tue Jun 3 13:23:39 2014 +0200

----------------------------------------------------------------------
 activemq-karaf/src/main/resources/features-core.xml | 3 ---
 pom.xml                                             | 1 -
 2 files changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/a4682fcb/activemq-karaf/src/main/resources/features-core.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 6e2d43b..50c1245 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -59,9 +59,6 @@
       <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
       <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
       <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
-      <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}</bundle>
-<!-- Scala 2.9 is not OSGi bundle. But 2.10 is
       <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
--->
     </feature>
   </features>

http://git-wip-us.apache.org/repos/asf/activemq/blob/a4682fcb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a5df708..42518e0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,6 @@
     <saxon-bundle-version>9.5.1-1_1</saxon-bundle-version>
     <scala-plugin-version>3.1.0</scala-plugin-version>
     <scala-version>2.11.0</scala-version>
-    <scala-bundle-version>2.9.1_3</scala-bundle-version>
     <shiro-version>1.2.2</shiro-version>
     <scalatest-version>2.1.5</scalatest-version>
     <slf4j-version>1.7.5</slf4j-version>


Mime
View raw message