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/02 15:50:31 UTC
svn commit: r940222 - in /geronimo/server/trunk:
plugins/activemq/geronimo-activemq-blueprint/pom.xml
plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
plugins/connector-1_6/pom.xml plugins/j2ee/pom.xml pom.xml
Author: gawor
Date: Sun May 2 13:50:31 2010
New Revision: 940222
URL: http://svn.apache.org/viewvc?rev=940222&view=rev
Log:
move xbean dependencies definitions to root pom so that maven does not download j2ee pom first
Modified:
geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/connector-1_6/pom.xml
geronimo/server/trunk/plugins/j2ee/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=940222&r1=940221&r2=940222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Sun May 2 13:50:31 2010
@@ -75,7 +75,6 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-blueprint</artifactId>
- <version>3.7-SNAPSHOT</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=940222&r1=940221&r2=940222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml Sun May 2 13:50:31 2010
@@ -78,6 +78,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-locator</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-osgi-registry</artifactId>
<type>jar</type>
</dependency>
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=940222&r1=940221&r2=940222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Sun May 2 13:50:31 2010
@@ -63,13 +63,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>j2ee</artifactId>
- <version>${version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<!-- internal dependencies -->
<dependency>
@@ -108,11 +101,6 @@
<artifactId>tranql-connector</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <version>3.7-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
Modified: geronimo/server/trunk/plugins/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/pom.xml?rev=940222&r1=940221&r2=940222&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/pom.xml Sun May 2 13:50:31 2010
@@ -51,18 +51,4 @@
<module>jsr88-war-configurer</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <version>3.7-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <version>3.7-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=940222&r1=940221&r2=940222&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sun May 2 13:50:31 2010
@@ -523,14 +523,14 @@
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
+ <artifactId>xbean-blueprint</artifactId>
+ <version>${xbeanVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
<version>${xbeanVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -2362,21 +2362,6 @@ only found in cxf
<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>
-
<repository>
<!-- org.ops4j routing -->
<id>ops4j.snapshots</id>