camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject git commit: Removed the asm2-bundle-version Maven property & it's usage. Also synced the currently used asm version with it's SMX counterpart.
Date Sat, 30 Nov 2013 17:10:02 GMT
Updated Branches:
  refs/heads/master 5520035be -> bd5600276


Removed the asm2-bundle-version Maven property & it's usage. Also synced the currently
used asm version with it's SMX counterpart.

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

Branch: refs/heads/master
Commit: bd5600276d0a9f0046223bc424c78d090e628f27
Parents: 5520035
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Sat Nov 30 18:09:51 2013 +0100
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Sat Nov 30 18:09:51 2013 +0100

----------------------------------------------------------------------
 parent/pom.xml                                           | 5 ++---
 platforms/karaf/features/src/main/resources/features.xml | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bd560027/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6388e74..e17806f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -51,9 +51,8 @@
     <aries-util-version>1.1.0</aries-util-version>
     <arquillian-junit-container-version>1.0.0.CR7</arquillian-junit-container-version>
     <arquillian-weld-ee-embedded-version>1.0.0.CR3</arquillian-weld-ee-embedded-version>
-    <asm-bundle-version>3.3_2</asm-bundle-version>
-    <asm-version>3.1</asm-version>
-    <asm2-bundle-version>2.2.3_5</asm2-bundle-version>
+    <asm-bundle-version>3.3.1_1</asm-bundle-version>
+    <asm-version>3.3.1</asm-version>
     <aspectj-version>1.6.2</aspectj-version>
     <atomikos-transactions-version>3.8.0</atomikos-transactions-version>
     <avalon-bundle-version>4.3.1_1</avalon-bundle-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/bd560027/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 e8c6c43..ec254c1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -905,7 +905,6 @@
   <feature name='camel-script' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm2-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino-bundle-version}</bundle>
     <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>


Mime
View raw message