You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/05/23 14:22:31 UTC
svn commit: r1341845 - in /karaf/branches/karaf-2.3.x: ./
assemblies/apache-karaf/src/main/filtered-resources/etc/
assemblies/apache-karaf/src/main/filtered-resources/minimal/
assemblies/features/enterprise/src/main/resources/
assemblies/features/stand...
Author: pieber
Date: Wed May 23 12:22:30 2012
New Revision: 1341845
URL: http://svn.apache.org/viewvc?rev=1341845&view=rev
Log:
[KARAF-1498] Upgrade to aries bug-fix releases snapshot versions
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
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/enterprise/src/main/resources/features.xml
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/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=1341845&r1=1341844&r2=1341845&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 Wed May 23 12:22:30 2012
@@ -57,9 +57,9 @@ org/apache/karaf/diagnostic/org.apache.k
org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.management/${project.version}/org.apache.karaf.diagnostic.management-${project.version}.jar=30
org/apache/karaf/management/org.apache.karaf.management.server/${project.version}/org.apache.karaf.management.server-${project.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.version}/org.apache.aries.jmx.api-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.version}/org.apache.aries.jmx.core-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}/org.apache.aries.jmx.api-${aries.jmx.api.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.core.version}/org.apache.aries.jmx.core-${aries.jmx.core.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.blueprint.version}/org.apache.aries.jmx.blueprint-${aries.jmx.blueprint.version}.jar=30
org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar=30
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=1341845&r1=1341844&r2=1341845&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 Wed May 23 12:22:30 2012
@@ -52,6 +52,6 @@ org/apache/karaf/features/org.apache.kar
org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
org/apache/karaf/management/org.apache.karaf.management.server/${project.version}/org.apache.karaf.management.server-${project.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.version}/org.apache.aries.jmx.api-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.version}/org.apache.aries.jmx.core-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}/org.apache.aries.jmx.api-${aries.jmx.api.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.core.version}/org.apache.aries.jmx.core-${aries.jmx.core.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.blueprint.version}/org.apache.aries.jmx.blueprint-${aries.jmx.blueprint.version}.jar=30
Modified: karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml?rev=1341845&r1=1341844&r2=1341845&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml Wed May 23 12:22:30 2012
@@ -23,9 +23,9 @@
<feature name="transaction" description="OSGi Transaction Manager" version="${aries.transaction.version}" resolver="(obr)">
<details>The Aries JTA</details>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.wrappers/${aries.transaction.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.manager.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.wrappers/${aries.transaction.wrappers.version}</bundle>
</feature>
<feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.version}" resolver="(obr)">
@@ -41,10 +41,10 @@
<feature name="jndi" description="OSGi Service Registry JNDI access" version="${aries.jndi.version}" resolver="(obr)">
<bundle start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/${aries.jndi.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.rmi/${aries.jndi.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.url/${aries.jndi.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.jndi.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/${aries.jndi.core.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.rmi/${aries.jndi.rmi.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.url/${aries.jndi.url.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.jndi.legacy.version}</bundle>
</feature>
<feature name="application-without-isolation" version="${aries.application.version}">
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=1341845&r1=1341844&r2=1341845&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 Wed May 23 12:22:30 2012
@@ -42,9 +42,9 @@
<bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.management/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.core.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.blueprint.version}</bundle>
</feature>
<feature name="spring" version="${spring2.version}" resolver="(obr)">
@@ -260,9 +260,9 @@
<feature name="management" version="${project.version}">
<bundle start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.core.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.blueprint.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.system/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.bundles/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/${project.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=1341845&r1=1341844&r2=1341845&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Wed May 23 12:22:30 2012
@@ -132,13 +132,22 @@
<felix.eventadmin-plugin.version>1.0.2</felix.eventadmin-plugin.version>
<felix.obr.version>1.0.2</felix.obr.version>
<aries.application.version>0.3</aries.application.version>
- <aries.blueprint.version>0.3.1</aries.blueprint.version>
- <aries.jmx.version>0.3</aries.jmx.version>
+ <aries.blueprint.version>0.3.2-SNAPSHOT</aries.blueprint.version>
+ <aries.jmx.api.version>0.3</aries.jmx.api.version>
+ <aries.jmx.core.version>0.3.1-SNAPSHOT</aries.jmx.core.version>
+ <aries.jmx.blueprint.version>0.3</aries.jmx.blueprint.version>
<aries.jpa.version>0.3</aries.jpa.version>
<aries.jndi.version>0.3</aries.jndi.version>
+ <aries.jndi.core.version>0.3</aries.jndi.core.version>
+ <aries.jndi.rmi.version>0.3</aries.jndi.rmi.version>
+ <aries.jndi.url.version>0.3</aries.jndi.url.version>
+ <aries.jndi.legacy.version>0.3</aries.jndi.legacy.version>
<aries.proxy.version>0.3</aries.proxy.version>
<aries.transaction.version>0.3</aries.transaction.version>
- <aries.util.version>0.3</aries.util.version>
+ <aries.transaction.blueprint.version>0.3</aries.transaction.blueprint.version>
+ <aries.transaction.manager.version>0.3.1-SNAPSHOT</aries.transaction.manager.version>
+ <aries.transaction.wrappers.version>0.3</aries.transaction.wrappers.version>
+ <aries.util.version>0.3.1-SNAPSHOT</aries.util.version>
<jansi.version>1.8</jansi.version>
<jline.version>2.6</jline.version>
<jsw.version>3.2.3</jsw.version>
@@ -918,17 +927,17 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>${aries.jmx.version}</version>
+ <version>${aries.jmx.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${aries.jmx.version}</version>
+ <version>${aries.jmx.core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
- <version>${aries.jmx.version}</version>
+ <version>${aries.jmx.blueprint.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>