You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/03/19 15:56:30 UTC
svn commit: r1083187 - in /aries/trunk/samples: ./ ariestrader/
ariestrader/assemblies/ ariestrader/assemblies/ariestrader-all-eba/
ariestrader/assemblies/ariestrader-jdbc-eba/
ariestrader/assemblies/equinox-test-harness/ ariestrader/modules/
ariestrad...
Author: zoe
Date: Sat Mar 19 14:56:28 2011
New Revision: 1083187
URL: http://svn.apache.org/viewvc?rev=1083187&view=rev
Log:
ARIES-610 Samples build and pass tests
Modified:
aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
aries/trunk/samples/ariestrader/assemblies/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml
aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml
aries/trunk/samples/ariestrader/modules/pom.xml
aries/trunk/samples/ariestrader/pom.xml
aries/trunk/samples/blog/blog-api/pom.xml
aries/trunk/samples/blog/blog-assembly/pom.xml
aries/trunk/samples/blog/blog-biz/pom.xml
aries/trunk/samples/blog/blog-datasource/pom.xml
aries/trunk/samples/blog/blog-itests/pom.xml
aries/trunk/samples/blog/blog-jdbc-eba/pom.xml
aries/trunk/samples/blog/blog-jpa-eba/pom.xml
aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml
aries/trunk/samples/blog/blog-persistence-jpa/pom.xml
aries/trunk/samples/blog/blog-web/pom.xml
aries/trunk/samples/blog/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml
aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml
aries/trunk/samples/blueprint/helloworld/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml
aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml
aries/trunk/samples/blueprint/idverifier/pom.xml
aries/trunk/samples/blueprint/pom.xml
aries/trunk/samples/pom.xml
aries/trunk/samples/twitter/pom.xml
aries/trunk/samples/twitter/twitter-bundle/pom.xml
aries/trunk/samples/twitter/twitter-eba/pom.xml
aries/trunk/samples/twitter/twitter-itests/pom.xml
aries/trunk/samples/twitter/twitter-twitter4j/pom.xml
Modified: aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>assemblies</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>assemblies</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>assemblies</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
@@ -176,49 +176,40 @@
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.install</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.management</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.modeller</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.deployment.management</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.default.local.platform</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
Modified: aries/trunk/samples/ariestrader/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>ariestrader</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-api/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-beans/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-core/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-entities/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-util/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>modules</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/modules/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>ariestrader</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/ariestrader/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/pom.xml (original)
+++ aries/trunk/samples/ariestrader/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples</groupId>
<artifactId>samples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/samples/blog/blog-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-api/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-api/pom.xml (original)
+++ aries/trunk/samples/blog/blog-api/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blog.api</artifactId>
Modified: aries/trunk/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-assembly/pom.xml (original)
+++ aries/trunk/samples/blog/blog-assembly/pom.xml Sat Mar 19 14:56:28 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blog.assembly</artifactId>
@@ -102,10 +102,10 @@
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
@@ -164,53 +164,44 @@
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.install</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.management</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.default.local.platform</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.modeller</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.deployment.management</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
- <version>0.4-SNAPSHOT</version>
</dependency>
<!-- Additional (JPA persistence layer) Aries dependencies -->
Modified: aries/trunk/samples/blog/blog-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-biz/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-biz/pom.xml (original)
+++ aries/trunk/samples/blog/blog-biz/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blog.biz</artifactId>
Modified: aries/trunk/samples/blog/blog-datasource/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-datasource/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-datasource/pom.xml (original)
+++ aries/trunk/samples/blog/blog-datasource/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>org.apache.aries.samples.blog.datasource</artifactId>
Modified: aries/trunk/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/pom.xml (original)
+++ aries/trunk/samples/blog/blog-itests/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blog.itests</artifactId>
@@ -160,6 +160,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
<scope>test</scope>
</dependency>
@@ -190,13 +191,9 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
@@ -294,18 +291,6 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi</artifactId>
<scope>test</scope>
@@ -315,56 +300,48 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.install</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.deployment.management</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.management</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.modeller</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.default.local.platform</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -429,7 +406,6 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/samples/blog/blog-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-jdbc-eba/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-jdbc-eba/pom.xml (original)
+++ aries/trunk/samples/blog/blog-jdbc-eba/pom.xml Sat Mar 19 14:56:28 2011
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blog</groupId>
Modified: aries/trunk/samples/blog/blog-jpa-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-jpa-eba/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-jpa-eba/pom.xml (original)
+++ aries/trunk/samples/blog/blog-jpa-eba/pom.xml Sat Mar 19 14:56:28 2011
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blog</groupId>
Modified: aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml (original)
+++ aries/trunk/samples/blog/blog-persistence-jdbc/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blog</groupId>
Modified: aries/trunk/samples/blog/blog-persistence-jpa/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-persistence-jpa/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-persistence-jpa/pom.xml (original)
+++ aries/trunk/samples/blog/blog-persistence-jpa/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blog</groupId>
Modified: aries/trunk/samples/blog/blog-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-web/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-web/pom.xml (original)
+++ aries/trunk/samples/blog/blog-web/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.blog</groupId>
<artifactId>blog</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blog</groupId>
Modified: aries/trunk/samples/blog/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blog/pom.xml (original)
+++ aries/trunk/samples/blog/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples</groupId>
<artifactId>samples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blog</groupId>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
<artifactId>helloworld</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml Sat Mar 19 14:56:28 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
<artifactId>helloworld</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.assembly</artifactId>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml Sat Mar 19 14:56:28 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
<artifactId>helloworld</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-eba/pom.xml Sat Mar 19 14:56:28 2011
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
<artifactId>helloworld</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld</artifactId>
Modified: aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
<artifactId>helloworld</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
Modified: aries/trunk/samples/blueprint/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/helloworld/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/helloworld/pom.xml (original)
+++ aries/trunk/samples/blueprint/helloworld/pom.xml Sat Mar 19 14:56:28 2011
@@ -14,14 +14,14 @@
the specific language governing permissions and limitations under the
License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/3.1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.samples.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-api/pom.xml Sat Mar 19 14:56:28 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
<artifactId>idverifier</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.idverifier.api</artifactId>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-assembly/pom.xml Sat Mar 19 14:56:28 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
<artifactId>idverifier</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.idverifier.assembly</artifactId>
@@ -51,6 +51,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
</dependency>
<dependency>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-client/pom.xml Sat Mar 19 14:56:28 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
<artifactId>idverifier</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.idverifier.client</artifactId>
Modified: aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/idverifier-server/pom.xml Sat Mar 19 14:56:28 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
<artifactId>idverifier</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.blueprint.idverifier.server</artifactId>
Modified: aries/trunk/samples/blueprint/idverifier/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/idverifier/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/idverifier/pom.xml (original)
+++ aries/trunk/samples/blueprint/idverifier/pom.xml Sat Mar 19 14:56:28 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.samples.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
Modified: aries/trunk/samples/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blueprint/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/blueprint/pom.xml (original)
+++ aries/trunk/samples/blueprint/pom.xml Sat Mar 19 14:56:28 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.samples</groupId>
<artifactId>samples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.blueprint</groupId>
Modified: aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/pom.xml (original)
+++ aries/trunk/samples/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>0.4</version>
- <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,14 +40,14 @@
<properties>
<ariesApplicationVersion>0.3.1-SNAPSHOT</ariesApplicationVersion>
- <ariesBlueprintVersion>0.3.1-SNAPSHOT</ariesBlueprintVersion>
+ <ariesBlueprintVersion>0.3.2-SNAPSHOT</ariesBlueprintVersion>
<ariesJmxVersion>0.3.1-SNAPSHOT</ariesJmxVersion>
<ariesJndiVersion>0.3.1-SNAPSHOT</ariesJndiVersion>
<ariesJpaVersion>0.3.1-SNAPSHOT</ariesJpaVersion>
<ariesProxyVersion>0.3.1-SNAPSHOT</ariesProxyVersion>
<ariesQuiesceVersion>0.3.1-SNAPSHOT</ariesQuiesceVersion>
<ariesTransactionVersion>0.3.1-SNAPSHOT</ariesTransactionVersion>
- <ariesUtilVersion>0.3.1-SNAPSHOT</ariesUtilVersion>
+ <ariesUtilVersion>0.4-SNAPSHOT</ariesUtilVersion>
<ariesWebVersion>0.3.1-SNAPSHOT</ariesWebVersion>
<openjpaVersion>2.0.0</openjpaVersion>
<geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>
@@ -59,6 +59,8 @@
<dependencyManagement>
<dependencies>
+ <!-- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
+ <!-- External project dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
@@ -189,82 +191,275 @@
<version>1.6.4</version>
</dependency>
+ <!-- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
<!-- other aries subproject dependency management -->
+ <!--application-->
<dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${ariesUtilVersion}</version>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.api</artifactId>
+ <version>${ariesApplicationVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application</artifactId>
<version>${ariesApplicationVersion}</version>
- <type>pom</type>
- <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.converters</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.deployment.management</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.install</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.management</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.modeller</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.resolver.noop</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.resolver.obr</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.runtime</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.runtime.framework</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.runtime.framework.management</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.runtime.isolated</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.runtime.repository</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.utils</artifactId>
+ <version>${ariesApplicationVersion}</version>
+ </dependency>
+ <!-- blueprint -->
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
+ <version>${ariesBlueprintVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
+ <version>${ariesBlueprintVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>${ariesBlueprintVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<version>${ariesBlueprintVersion}</version>
- <type>pom</type>
- <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.cm</artifactId>
+ <version>${ariesBlueprintVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>${ariesBlueprintVersion}</version>
+ </dependency>
+ <!-- jmx -->
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>${ariesJmxVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
+ <version>${ariesJmxVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.blueprint</artifactId>
+ <version>${ariesJmxVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
+ <version>${ariesJmxVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx</artifactId>
+ <version>${ariesJmxVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.core</artifactId>
+ <version>${ariesJmxVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.whiteboard</artifactId>
+ <version>${ariesJmxVersion}</version>
+ </dependency>
+ <!-- jndi -->
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.api</artifactId>
+ <version>${ariesJndiVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi</artifactId>
+ <version>${ariesJndiVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.core</artifactId>
+ <version>${ariesJndiVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.legacy.support</artifactId>
+ <version>${ariesJndiVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.rmi</artifactId>
+ <version>${ariesJndiVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url</artifactId>
+ <version>${ariesJndiVersion}</version>
+ </dependency>
+ <!-- jpa -->
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.api</artifactId>
+ <version>${ariesJpaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
+ <version>${ariesJpaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.container</artifactId>
+ <version>${ariesJpaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.container.context</artifactId>
+ <version>${ariesJpaVersion}</version>
+ </dependency>
+ <!-- proxy -->
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>${ariesProxyVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${ariesProxyVersion}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
<dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>${ariesProxyVersion}</version>
+ </dependency>
+ <!-- quiesce -->
+ <dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<version>${ariesQuiesceVersion}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.manager</artifactId>
<version>${ariesQuiesceVersion}</version>
</dependency>
+ <!-- transaction -->
<dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx</artifactId>
- <version>${ariesJmxVersion}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.blueprint</artifactId>
+ <version>${ariesTransactionVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- <version>${ariesJndiVersion}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.manager</artifactId>
+ <version>${ariesTransactionVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa</artifactId>
- <version>${ariesJpaVersion}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.testds</artifactId>
+ <version>${ariesTransactionVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction</artifactId>
+ <artifactId>org.apache.aries.transaction.wrappers</artifactId>
<version>${ariesTransactionVersion}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
+ <!--util-->
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>${ariesUtilVersion}</version>
+ </dependency>
+ <!-- web-->
<dependency>
<groupId>org.apache.aries.web</groupId>
- <artifactId>org.apache.aries.web</artifactId>
+ <artifactId>org.apache.aries.web.urlhandler</artifactId>
<version>${ariesWebVersion}</version>
- <type>pom</type>
- <scope>import</scope>
</dependency>
-
- <!-- internal dependencies -->
+ <!-- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
+ <!-- internal samples dependencies -->
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>ariestrader</artifactId>
@@ -280,14 +475,15 @@
<artifactId>blueprint</artifactId>
<version>${project.version}</version>
</dependency>
-
</dependencies>
</dependencyManagement>
<modules>
- <module>ariestrader</module>
+ <!--
<module>blog</module>
+ <module>ariestrader</module>
<module>blueprint</module>
+ -->
<module>twitter</module>
</modules>
Modified: aries/trunk/samples/twitter/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/twitter/pom.xml (original)
+++ aries/trunk/samples/twitter/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples</groupId>
<artifactId>samples</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.samples.twitter</groupId>
Modified: aries/trunk/samples/twitter/twitter-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-bundle/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-bundle/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-bundle/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.twitter</groupId>
<artifactId>twitter</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.twitter.bundle</artifactId>
Modified: aries/trunk/samples/twitter/twitter-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-eba/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-eba/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-eba/pom.xml Sat Mar 19 14:56:28 2011
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.aries.samples.twitter</groupId>
<artifactId>twitter</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.twitter.eba</artifactId>
Modified: aries/trunk/samples/twitter/twitter-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-itests/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-itests/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-itests/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<artifactId>twitter</artifactId>
<groupId>org.apache.aries.samples.twitter</groupId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -42,6 +42,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -62,6 +63,7 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -108,7 +110,6 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
@@ -122,69 +123,59 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.management</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.framework</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.framework.management</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.repository</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.isolated</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.noop</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.default.local.platform</artifactId>
<scope>test</scope>
- <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
Modified: aries/trunk/samples/twitter/twitter-twitter4j/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-twitter4j/pom.xml?rev=1083187&r1=1083186&r2=1083187&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-twitter4j/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-twitter4j/pom.xml Sat Mar 19 14:56:28 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.samples.twitter</groupId>
<artifactId>twitter</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.samples.twitter.twitter4j</artifactId>
<packaging>bundle</packaging>