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 08:42:37 UTC
svn commit: r1214645 - in /karaf/trunk: ./
assemblies/features/spring/src/main/feature/
assemblies/features/standard/src/main/feature/
demos/deployer/src/main/filtered-resources/resources/demos/deployer/kar/
demos/deployer/src/main/resources/resources/...
Author: jbonofre
Date: Thu Dec 15 07:42:37 2011
New Revision: 1214645
URL: http://svn.apache.org/viewvc?rev=1214645&view=rev
Log:
[KARAF-1107] Now use directly the commons-* in place of ServiceMix commons-* bundles
Modified:
karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/demos/deployer/src/main/filtered-resources/resources/demos/deployer/kar/README.txt
karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/pom.xml
karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/src/main/resources/features.xml
karaf/trunk/manual/src/main/webapp/users-guide/kar.conf
karaf/trunk/pom.xml
karaf/trunk/shell/obr/pom.xml
Modified: karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml?rev=1214645&r1=1214644&r2=1214645&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml Thu Dec 15 07:42:37 2011
@@ -74,7 +74,7 @@
<feature name="spring-struts" description="Spring Struts support" 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>
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1214645&r1=1214644&r2=1214645&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Thu Dec 15 07:42:37 2011
@@ -27,6 +27,8 @@
</feature>
<feature name="obr" description="Provide OSGi Bundle Repository (OBR) support" version="${project.version}">
+ <bundle dependency="true" start-level="30">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle start-level="30">mvn:org.apache.felix/org.osgi.service.obr/${felix.obr.version}</bundle>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${project.version}</bundle>
@@ -159,8 +161,8 @@
</feature>
<feature name="jasypt-encryption" description="Advanced encryption support for Karaf security" 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/trunk/demos/deployer/src/main/filtered-resources/resources/demos/deployer/kar/README.txt
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/deployer/src/main/filtered-resources/resources/demos/deployer/kar/README.txt?rev=1214645&r1=1214644&r2=1214645&view=diff
==============================================================================
--- karaf/trunk/demos/deployer/src/main/filtered-resources/resources/demos/deployer/kar/README.txt (original)
+++ karaf/trunk/demos/deployer/src/main/filtered-resources/resources/demos/deployer/kar/README.txt Thu Dec 15 07:42:37 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/${pom.version}/users-guide/kar.html
Modified: karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/pom.xml?rev=1214645&r1=1214644&r2=1214645&view=diff
==============================================================================
--- karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/pom.xml (original)
+++ karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/pom.xml Thu Dec 15 07:42:37 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/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/src/main/resources/features.xml?rev=1214645&r1=1214644&r2=1214645&view=diff
==============================================================================
--- karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/src/main/resources/features.xml (original)
+++ karaf/trunk/demos/deployer/src/main/resources/resources/demos/deployer/kar/src/main/resources/features.xml Thu Dec 15 07:42:37 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/trunk/manual/src/main/webapp/users-guide/kar.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/kar.conf?rev=1214645&r1=1214644&r2=1214645&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/kar.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/kar.conf Thu Dec 15 07:42:37 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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1214645&r1=1214644&r2=1214645&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Dec 15 07:42:37 2011
@@ -111,14 +111,14 @@
<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-compress.version>1.3</commons-compress.version>
<commons-io.version>1.3.2</commons-io.version>
<commons-jexl.version>2.0</commons-jexl.version>
- <commons-lang.bundle.version>2.4_5</commons-lang.bundle.version>
+ <commons-lang.version>2.6</commons-lang.version>
<jasypt.bundle.version>1.8_1</jasypt.bundle.version>
<jetty.version>7.5.4.v20111024</jetty.version>
<junit.bundle.version>4.7_3</junit.bundle.version>
@@ -1369,19 +1369,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.commons</groupId>
Modified: karaf/trunk/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/pom.xml?rev=1214645&r1=1214644&r2=1214645&view=diff
==============================================================================
--- karaf/trunk/shell/obr/pom.xml (original)
+++ karaf/trunk/shell/obr/pom.xml Thu Dec 15 07:42:37 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>