You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/05/04 21:55:50 UTC
svn commit: r941015 - in /geronimo/server/trunk:
framework/configs/karaf-framework/pom.xml plugins/aries/pom.xml
plugins/connector-1_6/pom.xml plugins/openjpa2/pom.xml plugins/wab/pom.xml
pom.xml
Author: gawor
Date: Tue May 4 19:55:50 2010
New Revision: 941015
URL: http://svn.apache.org/viewvc?rev=941015&view=rev
Log:
use aries artifacts under the vote
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/plugins/aries/pom.xml
geronimo/server/trunk/plugins/connector-1_6/pom.xml
geronimo/server/trunk/plugins/openjpa2/pom.xml
geronimo/server/trunk/plugins/wab/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=941015&r1=941014&r2=941015&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue May 4 19:55:50 2010
@@ -52,7 +52,7 @@
<felix.prefs.version>1.0.4</felix.prefs.version>
<felix.webconsole.version>2.0.0</felix.webconsole.version>
<felix.metatype.version>1.0.2</felix.metatype.version>
- <aries.blueprint.version>0.1-incubating-SNAPSHOT</aries.blueprint.version>
+ <aries.blueprint.version>0.1-incubating</aries.blueprint.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<jansi.version>1.1</jansi.version>
<jetty.bundle.version>6.1.14_1</jetty.bundle.version>
Modified: geronimo/server/trunk/plugins/aries/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/pom.xml?rev=941015&r1=941014&r2=941015&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/pom.xml Tue May 4 19:55:50 2010
@@ -48,17 +48,17 @@
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.management</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/server/trunk/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/pom.xml?rev=941015&r1=941014&r2=941015&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Tue May 4 19:55:50 2010
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=941015&r1=941014&r2=941015&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Tue May 4 19:55:50 2010
@@ -137,25 +137,25 @@
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/server/trunk/plugins/wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/pom.xml?rev=941015&r1=941014&r2=941015&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/pom.xml Tue May 4 19:55:50 2010
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.aries.web</groupId>
<artifactId>org.apache.aries.web.urlhandler</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=941015&r1=941014&r2=941015&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue May 4 19:55:50 2010
@@ -1909,31 +1909,31 @@ only found in cxf
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -1945,7 +1945,7 @@ only found in cxf
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -1957,7 +1957,7 @@ only found in cxf
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -1969,7 +1969,7 @@ only found in cxf
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -1981,7 +1981,7 @@ only found in cxf
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.1-incubating</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -2363,7 +2363,32 @@ only found in cxf
<repositories>
<repository>
- <!-- org.ops4j routing -->
+ <id>aries1</id>
+ <name>aries1</name>
+ <layout>default</layout>
+ <url>https://repository.apache.org/content/repositories/orgapachearies-009</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <repository>
+ <id>aries2</id>
+ <name>aries2</name>
+ <layout>default</layout>
+ <url>https://repository.apache.org/content/repositories/orgapachearies-004</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <repository>
<id>ops4j.snapshots</id>
<name>OPS4J Snapshots Repository</name>
<layout>default</layout>