You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/09/17 22:05:06 UTC
svn commit: r696424 - in /geronimo/samples/trunk/samples: bank/bank-client/
bank/bank-ejb/ bank/bank-war/ customer/ customer/customer-client/
jaxws-calculator/jaxws-calculator-war/ jms-mdb/ jms-mdb/jms-mdb-ejb/
myphonebook/ sample-datasource/
Author: jbohn
Date: Wed Sep 17 13:05:05 2008
New Revision: 696424
URL: http://svn.apache.org/viewvc?rev=696424&view=rev
Log:
leverage imported dependency management from geronimo- fix jaxws-calculator dependencies on axis2
Modified:
geronimo/samples/trunk/samples/bank/bank-client/pom.xml
geronimo/samples/trunk/samples/bank/bank-ejb/pom.xml
geronimo/samples/trunk/samples/bank/bank-war/pom.xml
geronimo/samples/trunk/samples/customer/customer-client/pom.xml
geronimo/samples/trunk/samples/customer/pom.xml
geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/pom.xml
geronimo/samples/trunk/samples/jms-mdb/pom.xml
geronimo/samples/trunk/samples/myphonebook/pom.xml
geronimo/samples/trunk/samples/sample-datasource/pom.xml
Modified: geronimo/samples/trunk/samples/bank/bank-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-client/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-client/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-client/pom.xml Wed Sep 17 13:05:05 2008
@@ -40,7 +40,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>3.0</version>
</dependency>
<dependency>
Modified: geronimo/samples/trunk/samples/bank/bank-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-ejb/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-ejb/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-ejb/pom.xml Wed Sep 17 13:05:05 2008
@@ -40,16 +40,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/pom.xml Wed Sep 17 13:05:05 2008
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <type>jar</type>
<scope>provided</scope>
</dependency>
@@ -60,7 +59,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- <type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/customer/customer-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer/customer-client/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer/customer-client/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer/customer-client/pom.xml Wed Sep 17 13:05:05 2008
@@ -40,7 +40,6 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>3.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -50,7 +49,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1.1</version>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/customer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer/pom.xml Wed Sep 17 13:05:05 2008
@@ -51,15 +51,11 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1.1</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml Wed Sep 17 13:05:05 2008
@@ -38,27 +38,23 @@
<dependencies>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
- <version>1.3</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
- <version>1.6.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/pom.xml Wed Sep 17 13:05:05 2008
@@ -40,8 +40,6 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
- <type>jar</type>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/jms-mdb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb/pom.xml Wed Sep 17 13:05:05 2008
@@ -50,15 +50,11 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/pom.xml Wed Sep 17 13:05:05 2008
@@ -50,16 +50,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1</version>
- <type>jar</type>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sample-datasource/pom.xml?rev=696424&r1=696423&r2=696424&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sample-datasource/pom.xml (original)
+++ geronimo/samples/trunk/samples/sample-datasource/pom.xml Wed Sep 17 13:05:05 2008
@@ -24,8 +24,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>samples</artifactId>
<groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>samples</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
@@ -41,7 +41,6 @@
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-derby-embed-xa</artifactId>
<type>rar</type>
- <version>1.4</version>
<scope>provided</scope>
</dependency>
<dependency>