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 2011/12/15 09:09:46 UTC
svn commit: r1214650 - in /karaf/branches/karaf-2.2.x: ./
assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/
assemblies/features/standard/src/main/resources/ demos/deployer/kar/
demos/deployer/kar/src/main/resources/ manual/src/mai...
Author: jbonofre
Date: Thu Dec 15 08:09:46 2011
New Revision: 1214650
URL: http://svn.apache.org/viewvc?rev=1214650&view=rev
Log:
[KARAF-1107] Now use commons-* in place of ServiceMix commons-* bundles
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.2.x/demos/deployer/kar/pom.xml
karaf/branches/karaf-2.2.x/demos/deployer/kar/src/main/resources/features.xml
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/kar.conf
karaf/branches/karaf-2.2.x/pom.xml
karaf/branches/karaf-2.2.x/shell/obr/pom.xml
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt?rev=1214650&r1=1214649&r2=1214650&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/deployer/kar/README.txt Thu Dec 15 08:09:46 2011
@@ -66,7 +66,7 @@ Now you can use any commands available o
Feature has no configuration files
Feature has no dependencies.
Feature contains followed bundles:
- mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/3.2.1_1
+ mvn:commons-collections/commons-collections/3.2.1
For more information on Karaf Archives please visit:
http://karaf.apache.org/manual/latest-2.2.x/users-guide/kar.html
Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1214650&r1=1214649&r2=1214650&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml Thu Dec 15 08:09:46 2011
@@ -115,7 +115,7 @@
<feature name="spring-struts" version="${spring.version}" resolver="(obr)">
<feature version="${spring.version}">spring-web</feature>
- <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-struts/${spring.version}</bundle>
</feature>
@@ -270,8 +270,8 @@
</feature>
<feature name="jasypt-encryption" version="${project.version}" resolver="(obr)">
- <bundle dependency='true' start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
- <bundle dependency='true' start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+ <bundle dependency='true' start-level="30">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle dependency='true' start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version}</bundle>
</feature>
Modified: karaf/branches/karaf-2.2.x/demos/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/deployer/kar/pom.xml?rev=1214650&r1=1214649&r2=1214650&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/deployer/kar/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/deployer/kar/pom.xml Thu Dec 15 08:09:46 2011
@@ -39,9 +39,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
- <version>3.2.1_1</version>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: karaf/branches/karaf-2.2.x/demos/deployer/kar/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/demos/deployer/kar/src/main/resources/features.xml?rev=1214650&r1=1214649&r2=1214650&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/demos/deployer/kar/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.2.x/demos/deployer/kar/src/main/resources/features.xml Thu Dec 15 08:09:46 2011
@@ -2,7 +2,7 @@
<features>
<feature name="my-kar" version="1.0">
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/3.2.1_1</bundle>
+ <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
</feature>
</features>
Modified: karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/kar.conf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/kar.conf?rev=1214650&r1=1214649&r2=1214650&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/kar.conf (original)
+++ karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/kar.conf Thu Dec 15 08:09:46 2011
@@ -69,7 +69,7 @@ For the example, the features descriptor
<features>
<feature name="my" version="1.0">
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/3.2.1_1</bundle>
+ <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
</feature>
</features>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1214650&r1=1214649&r2=1214650&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Thu Dec 15 08:09:46 2011
@@ -104,11 +104,11 @@
<aopalliance.bundle.version>1.0_5</aopalliance.bundle.version>
<asm.bundle.version>3.3_2</asm.bundle.version>
<cglib.bundle.version>2.1_3_7</cglib.bundle.version>
- <commons-beanutils.bundle.version>1.8.2_2</commons-beanutils.bundle.version>
- <commons-codec.bundle.version>1.3_4</commons-codec.bundle.version>
- <commons-collections.bundle.version>3.2.1_2</commons-collections.bundle.version>
+ <commons-beanutils.version>1.8.3</commons-beanutils.version>
+ <commons-codec.version>1.6</commons-codec.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.1.1</commons-fileupload.version>
- <commons-lang.bundle.version>2.4_5</commons-lang.bundle.version>
+ <commons-lang.version>2.6</commons-lang.version>
<icu4j.version>4.8.1.1</icu4j.version>
<jasypt.bundle.version>1.8_1</jasypt.bundle.version>
<jetty.version>7.5.4.v20111024</jetty.version>
@@ -991,19 +991,19 @@
<version>${jsw.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
- <version>${commons-codec.bundle.version}</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
- <version>${commons-collections.bundle.version}</version>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
- <version>${commons-lang.bundle.version}</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: karaf/branches/karaf-2.2.x/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/obr/pom.xml?rev=1214650&r1=1214649&r2=1214650&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/obr/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/obr/pom.xml Thu Dec 15 08:09:46 2011
@@ -39,13 +39,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<scope>provided</scope>
</dependency>
<dependency>