You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/12/22 16:33:09 UTC
svn commit: r1051952 - in /karaf/trunk: assembly/pom.xml
assembly/src/main/descriptors/unix-bin.xml
assembly/src/main/descriptors/windows-bin.xml
assembly/src/main/filtered-resources/etc/startup.properties pom.xml
Author: gnodet
Date: Wed Dec 22 15:33:09 2010
New Revision: 1051952
URL: http://svn.apache.org/viewvc?rev=1051952&view=rev
Log:
Upgrade to recent aries (without the incubating flag in the version)
Modified:
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
karaf/trunk/pom.xml
Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1051952&r1=1051951&r2=1051952&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Wed Dec 22 15:33:09 2010
@@ -292,6 +292,14 @@
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
</dependency>
@@ -337,8 +345,8 @@
<artifactId>jetty-xml</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
Modified: karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1051952&r1=1051951&r2=1051952&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Dec 22 15:33:09 2010
@@ -324,6 +324,39 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/apache/aries/proxy/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.apache.aries.proxy:org.apache.aries.proxy</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/apache/aries/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.apache.aries:org.apache.aries.util</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>asm:asm-all</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
Modified: karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1051952&r1=1051951&r2=1051952&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Dec 22 15:33:09 2010
@@ -311,6 +311,39 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/apache/aries/proxy/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.apache.aries.proxy:org.apache.aries.proxy</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/apache/aries/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.apache.aries:org.apache.aries.util</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>asm:asm-all</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
Modified: karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=1051952&r1=1051951&r2=1051952&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties Wed Dec 22 15:33:09 2010
@@ -33,6 +33,9 @@ org/apache/felix/org.apache.felix.filein
#
# The rest of the services..
#
+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/${aries.proxy.version}/org.apache.aries.proxy-${aries.proxy.version}.jar=20
org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1051952&r1=1051951&r2=1051952&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Dec 22 15:33:09 2010
@@ -104,7 +104,7 @@
<properties>
<!-- Apache ServiceMix Bundles -->
<aopalliance.bundle.version>1.0_4</aopalliance.bundle.version>
- <asm.bundle.version>3.1_1</asm.bundle.version>
+ <asm.version>3.2</asm.version>
<cglib.bundle.version>2.1_3_6</cglib.bundle.version>
<commons-codec.bundle.version>1.3_3</commons-codec.bundle.version>
<commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
@@ -130,9 +130,11 @@
<felix.metatype.version>1.0.4</felix.metatype.version>
<felix.eventadmin.version>1.2.6</felix.eventadmin.version>
<felix.eventadmin-plugin.version>1.0.2</felix.eventadmin-plugin.version>
- <aries.blueprint.version>0.3-incubating-SNAPSHOT</aries.blueprint.version>
- <aries.jmx.version>0.3-incubating-SNAPSHOT</aries.jmx.version>
- <aries.jndi.version>0.3-incubating-SNAPSHOT</aries.jndi.version>
+ <aries.blueprint.version>0.3-SNAPSHOT</aries.blueprint.version>
+ <aries.jmx.version>0.3-SNAPSHOT</aries.jmx.version>
+ <aries.jndi.version>0.3-SNAPSHOT</aries.jndi.version>
+ <aries.proxy.version>0.3-SNAPSHOT</aries.proxy.version>
+ <aries.util.version>0.3-SNAPSHOT</aries.util.version>
<jansi.version>1.4</jansi.version>
<jline.version>2.5</jline.version>
<jsw.version>3.2.3</jsw.version>
@@ -698,9 +700,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>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -855,6 +857,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>${aries.proxy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>${aries.util.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
<version>${aries.jmx.version}</version>