You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/10/05 14:57:57 UTC
svn commit: r1394490 - in /karaf/branches/karaf-2.3.x: ./
assemblies/apache-karaf/ assemblies/apache-karaf/src/main/descriptors/
assemblies/apache-karaf/src/main/filtered-resources/etc/
assemblies/apache-karaf/src/main/filtered-resources/minimal/ assem...
Author: jbonofre
Date: Fri Oct 5 12:57:56 2012
New Revision: 1394490
URL: http://svn.apache.org/viewvc?rev=1394490&view=rev
Log:
[KARAF-1883] Upgrade to ASM 4.0
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.3.x/pom.xml
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml Fri Oct 5 12:57:56 2012
@@ -364,8 +364,8 @@
<artifactId>jetty-xml</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml Fri Oct 5 12:57:56 2012
@@ -315,10 +315,10 @@
<useProjectArtifact>false</useProjectArtifact>
<fileMode>0644</fileMode>
<outputFileNameMapping>
- org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ org/ow2/asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
+ <include>org.ow2.asm:asm-all</include>
</includes>
</dependencySet>
</dependencySets>
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml Fri Oct 5 12:57:56 2012
@@ -284,10 +284,10 @@
<useProjectArtifact>false</useProjectArtifact>
<fileMode>0664</fileMode>
<outputFileNameMapping>
- org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ org/ow2/asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
+ <include>org.ow2.asm:asm-all</include>
</includes>
</dependencySet>
<dependencySet>
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml Fri Oct 5 12:57:56 2012
@@ -297,10 +297,10 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
- org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ org/ow2/asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
+ <include>org.ow2.asm:asm-all</include>
</includes>
</dependencySet>
</dependencySets>
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml Fri Oct 5 12:57:56 2012
@@ -269,10 +269,10 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
- org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ org/ow2/asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
+ <include>org.ow2.asm:asm-all</include>
</includes>
</dependencySet>
<dependencySet>
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties Fri Oct 5 12:57:56 2012
@@ -33,7 +33,7 @@ org/apache/felix/org.apache.felix.filein
#
# The rest of the services..
#
-org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar=20
+org/ow2/asm/asm-all/${asm.version}/asm-all-${asm.version}.jar=20
org/apache/aries/org.apache.aries.util/${aries.util.version}/org.apache.aries.util-${aries.util.version}.jar=20
org/apache/aries/proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}/org.apache.aries.proxy.api-${aries.proxy.api.version}.jar=20
org/apache/aries/proxy/org.apache.aries.proxy.impl/${aries.proxy.version}/org.apache.aries.proxy.impl-${aries.proxy.version}.jar=20
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties Fri Oct 5 12:57:56 2012
@@ -33,7 +33,7 @@ org/apache/felix/org.apache.felix.filein
#
# The rest of the services..
#
-org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar=20
+org/ow2/asm/asm-all/${asm.version}/asm-all-${asm.version}.jar=20
org/apache/aries/org.apache.aries.util/${aries.util.version}/org.apache.aries.util-${aries.util.version}.jar=20
org/apache/aries/proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}/org.apache.aries.proxy.api-${aries.proxy.api.version}.jar=20
org/apache/aries/proxy/org.apache.aries.proxy.impl/${aries.proxy.version}/org.apache.aries.proxy.impl-${aries.proxy.version}.jar=20
Modified: karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml Fri Oct 5 12:57:56 2012
@@ -25,7 +25,7 @@
<bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle>
<bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<bundle start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
- <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
+ <bundle start-level="20">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.version}</bundle>
Modified: karaf/branches/karaf-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1394490&r1=1394489&r2=1394490&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Fri Oct 5 12:57:56 2012
@@ -102,7 +102,7 @@
<properties>
<aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
- <asm.bundle.version>3.3.1_1</asm.bundle.version>
+ <asm.version>4.0</asm.version>
<bndlib.version>1.50.0</bndlib.version>
<cglib.bundle.version>2.2.2_1</cglib.bundle.version>
<commons-beanutils.version>1.8.3</commons-beanutils.version>
@@ -767,9 +767,9 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
- <version>${asm.bundle.version}</version>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>