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/04/29 19:56:03 UTC
svn commit: r939402 - in /geronimo/server/trunk: ./ framework/
framework/configs/karaf-framework/src/main/filtered-resources/etc/
plugins/axis/ plugins/axis2/ plugins/clustering/
plugins/webservices/geronimo-webservices/
Author: gawor
Date: Thu Apr 29 17:56:03 2010
New Revision: 939402
URL: http://svn.apache.org/viewvc?rev=939402&view=rev
Log:
Use versions of the schema and bundle artifacts under vote - for testing purposes
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
geronimo/server/trunk/framework/pom.xml
geronimo/server/trunk/plugins/axis/pom.xml
geronimo/server/trunk/plugins/axis2/pom.xml
geronimo/server/trunk/plugins/clustering/pom.xml
geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=939402&r1=939401&r2=939402&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Thu Apr 29 17:56:03 2010
@@ -70,15 +70,15 @@ org/apache/servicemix/bundles/org.apache
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_4/org.apache.servicemix.bundles.cglib-2.1_3_4.jar=40
org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_1/org.apache.servicemix.bundles.commons-jexl-1.1_1.jar=40
org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_3/org.apache.servicemix.bundles.commons-lang-2.4_3.jar=40
-org/apache/geronimo/bundles/jaxb-impl/2.2_1-SNAPSHOT/jaxb-impl-2.2_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/jaxb-impl/2.2_1/jaxb-impl-2.2_1.jar=40
org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar=40
org/apache/geronimo/specs/geronimo-jaxb_2.2_spec/1.0/geronimo-jaxb_2.2_spec-1.0.jar=40
org/apache/geronimo/specs/geronimo-stax-api_1.2_spec/1.0/geronimo-stax-api_1.2_spec-1.0.jar=40
-org/apache/geronimo/bundles/woodstox/3.2.9_1-SNAPSHOT/woodstox-3.2.9_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/woodstox/3.2.9_1/woodstox-3.2.9_1.jar=40
asm/asm-all/3.2/asm-all-3.2.jar=40
commons-cli/commons-cli/1.2/commons-cli-1.2.jar=40
-org/apache/geronimo/bundles/sxc-jaxb/0.7.2_1-SNAPSHOT/sxc-jaxb-0.7.2_1-SNAPSHOT.jar=40
-org/apache/geronimo/bundles/sxc-runtime/0.7.2_1-SNAPSHOT/sxc-runtime-0.7.2_1-SNAPSHOT.jar=40
+org/apache/geronimo/bundles/sxc-jaxb/0.7.2_1/sxc-jaxb-0.7.2_1.jar=40
+org/apache/geronimo/bundles/sxc-runtime/0.7.2_1/sxc-runtime-0.7.2_1.jar=40
org/apache/xbean/xbean-finder/${xbeanVersion}/xbean-finder-${xbeanVersion}.jar=40
org/apache/xbean/xbean-reflect/${xbeanVersion}/xbean-reflect-${xbeanVersion}.jar=40
org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=40
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=939402&r1=939401&r2=939402&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Thu Apr 29 17:56:03 2010
@@ -119,13 +119,13 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-jaxb</artifactId>
- <version>0.7.2_1-SNAPSHOT</version>
+ <version>0.7.2_1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-runtime</artifactId>
- <version>0.7.2_1-SNAPSHOT</version>
+ <version>0.7.2_1</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/pom.xml?rev=939402&r1=939401&r2=939402&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/pom.xml Thu Apr 29 17:56:03 2010
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>axis</artifactId>
- <version>1.4_1-SNAPSHOT</version>
+ <version>1.4_1</version>
</dependency>
<dependency>
<groupId>org.apache.ws.scout</groupId>
@@ -83,4 +83,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/server/trunk/plugins/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/pom.xml?rev=939402&r1=939401&r2=939402&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/pom.xml Thu Apr 29 17:56:03 2010
@@ -342,7 +342,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>httpcore</artifactId>
- <version>4.0.1_1-SNAPSHOT</version>
+ <version>4.0.1_1</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=939402&r1=939401&r2=939402&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Thu Apr 29 17:56:03 2010
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>wadi-aop</artifactId>
- <version>${wadiVersion}_1-SNAPSHOT</version>
+ <version>${wadiVersion}_1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>wadi-core</artifactId>
- <version>${wadiVersion}_1-SNAPSHOT</version>
+ <version>${wadiVersion}_1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>wadi-group</artifactId>
- <version>${wadiVersion}_1-SNAPSHOT</version>
+ <version>${wadiVersion}_1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>wadi-tribes</artifactId>
- <version>${wadiVersion}_1-SNAPSHOT</version>
+ <version>${wadiVersion}_1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=939402&r1=939401&r2=939402&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Thu Apr 29 17:56:03 2010
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>axis</artifactId>
- <version>1.4_1-SNAPSHOT</version>
+ <version>1.4_1</version>
<scope>test</scope>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=939402&r1=939401&r2=939402&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Apr 29 17:56:03 2010
@@ -322,7 +322,7 @@
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.xmlbeans</groupId>
@@ -344,7 +344,7 @@
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-j2ee_1.4</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
<exclusions>
<exclusion>
<groupId>org.apache.xmlbeans</groupId>
@@ -356,7 +356,7 @@
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-javaee_6</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.xmlbeans</groupId>
@@ -560,13 +560,13 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.2_1-SNAPSHOT</version>
+ <version>1.6.2_1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.2_1-SNAPSHOT</version>
+ <version>1.6.2_1</version>
</dependency>
<dependency>
@@ -594,7 +594,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>2.2_1-SNAPSHOT</version>
+ <version>2.2_1</version>
</dependency>
<dependency>
@@ -612,7 +612,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>castor</artifactId>
- <version>1.0.5_1-SNAPSHOT</version>
+ <version>1.0.5_1</version>
</dependency>
<dependency>
@@ -816,7 +816,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>derby-all</artifactId>
- <version>${derbyVersion}_1-SNAPSHOT</version>
+ <version>${derbyVersion}_1</version>
</dependency>
<dependency>
@@ -946,7 +946,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>commons-discovery</artifactId>
- <version>0.4_1-SNAPSHOT</version>
+ <version>0.4_1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -982,7 +982,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.8_1-SNAPSHOT</version>
+ <version>1.8_1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -1047,47 +1047,16 @@
</exclusions>
</dependency>
- <!--<dependency>-->
- <!--<groupId>portlet-api</groupId>-->
- <!--<artifactId>portlet-api</artifactId>-->
- <!--<version>1.0</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>javax.portlet</groupId>-->
- <!--<artifactId>portlet-api</artifactId>-->
- <!--<version>1.0</version>-->
- <!--</dependency>-->
-
- <!-- Need a non-Sun RI version for Apache Harmony and IBM SDK -->
- <!--<dependency>-->
- <!--<groupId>javax.servlet</groupId>-->
- <!--<artifactId>jstl</artifactId>-->
- <!--<version>1.2</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jstl</artifactId>
- <version>1.2_1-SNAPSHOT</version>
+ <version>1.2_1</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.directwebremoting</groupId>-->
- <!--<artifactId>dwr</artifactId>-->
- <!--<version>3.0.M1</version>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>cometd</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
- <version>3.0.M1_1-SNAPSHOT</version>
+ <version>3.0.M1_1</version>
</dependency>
<dependency>
@@ -1351,7 +1320,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>woodstox</artifactId>
- <version>3.2.9_1-SNAPSHOT</version>
+ <version>3.2.9_1</version>
</dependency>
<dependency>
@@ -1389,7 +1358,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2_1-SNAPSHOT</version>
+ <version>2.2_1</version>
</dependency>
<dependency>
@@ -1646,7 +1615,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>woden-impl-dom</artifactId>
- <version>1.0M8_1-SNAPSHOT</version>
+ <version>1.0M8_1</version>
</dependency>
<dependency>
@@ -2392,6 +2361,37 @@ only found in cxf
</modules>
<repositories>
+
+ <!-- Added temporarily. Will be removed once the artifacts
+ are published to maven central. -->
+ <repository>
+ <id>geronimo-bundles</id>
+ <name>geronimo-bundles</name>
+ <layout>default</layout>
+ <url>https://repository.apache.org/content/repositories/orgapachegeronimo-031</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <!-- Added temporarily. Will be removed once the artifacts
+ are published to maven central. -->
+ <repository>
+ <id>geronimo-schemas</id>
+ <name>geronimo-schemas</name>
+ <layout>default</layout>
+ <url>https://repository.apache.org/content/repositories/orgapachegeronimo-027</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
<repository>
<!-- org.ops4j routing -->
<id>ops4j.snapshots</id>
@@ -2407,6 +2407,7 @@ only found in cxf
<enabled>false</enabled>
</releases>
</repository>
+
<repository>
<!-- org.eclipse.jetty routing -->
<id>jetty.oss.sonatype.org</id>