aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r1083059 [4/4] - in /aries/trunk: ./ application/ application/application-api/ application/application-bundle/ application/application-converters/ application/application-default-local-platform/ application/application-deployment-management...
Date Fri, 18 Mar 2011 20:47:11 GMT
Modified: aries/trunk/quiesce/quiesce-manager-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager-itest/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager-itest/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-manager-itest/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,23 +19,29 @@
 -->
 <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">
     <parent>
-        <artifactId>quiesce</artifactId>
-        <groupId>org.apache.aries.quiesce</groupId>
-        <version>0.4-SNAPSHOT</version>
+     <groupId>org.apache.aries</groupId>
+     <artifactId>java5-parent</artifactId>
+     <version>0.4</version>
+     <relativePath />
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.aries.quiesce</groupId>
     <artifactId>org.apache.aries.quiesce.manager.itest</artifactId>
+    <version>0.3.1-SNAPSHOT</version>
     <name>Aries Quiesce Manager iTests</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.quiesce</groupId>
             <artifactId>org.apache.aries.quiesce.api</artifactId>
+            <version>0.3.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.quiesce</groupId>
             <artifactId>org.apache.aries.quiesce.manager</artifactId>
+            <version>0.3.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -82,29 +88,44 @@
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>
+            <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <scope>test</scope>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.configadmin</artifactId>
+                <version>1.2.4</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
+            <version>2.4</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
             <scope>test</scope>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>commons-pool</groupId>
             <artifactId>commons-pool</artifactId>
             <scope>test</scope>
+            <version>1.5.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.serp</artifactId>
+            <version>1.13.1_2</version>
         </dependency>
    </dependencies>
 

Modified: aries/trunk/quiesce/quiesce-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-manager/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,18 +19,28 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.aries.quiesce</groupId>
-        <artifactId>quiesce</artifactId>
-        <version>0.4-SNAPSHOT</version>
+    <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
     </parent>
 
+    <groupId>org.apache.aries.quiesce</groupId>
     <artifactId>org.apache.aries.quiesce.manager</artifactId>
     <packaging>bundle</packaging>
+    <version>0.3.1-SNAPSHOT</version>
     <name>Apache Aries Quiesce Manager</name>
     <description>
       Quiesce Manager.
     </description>
 
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/quiesce/quiesce-manager</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/quiesce/quiesce-manager</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager</url>
+     </scm>
+
+
     <properties>
         <aries.osgi.export.pkg>
         </aries.osgi.export.pkg>
@@ -54,10 +64,12 @@
         <dependency>
             <groupId>org.apache.aries.quiesce</groupId>
             <artifactId>org.apache.aries.quiesce.api</artifactId>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
+            <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</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=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Fri Mar 18 20:47:07 2011
@@ -176,40 +176,49 @@
         <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/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-assembly/pom.xml (original)
+++ aries/trunk/samples/blog/blog-assembly/pom.xml Fri Mar 18 20:47:07 2011
@@ -164,44 +164,53 @@
 		<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-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/pom.xml (original)
+++ aries/trunk/samples/blog/blog-itests/pom.xml Fri Mar 18 20:47:07 2011
@@ -315,36 +315,56 @@
 			<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>
@@ -409,6 +429,7 @@
             <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/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/samples/pom.xml (original)
+++ aries/trunk/samples/pom.xml Fri Mar 18 20:47:07 2011
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.apache.aries.samples</groupId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <artifactId>samples</artifactId>
     <name>Apache Aries Samples</name>
     <packaging>pom</packaging>
@@ -39,16 +39,16 @@
     </scm>
 
     <properties>
-        <ariesApplicationVersion>0.4-SNAPSHOT</ariesApplicationVersion>
-        <ariesBlueprintVersion>0.4-SNAPSHOT</ariesBlueprintVersion>
-        <ariesJmxVersion>0.4-SNAPSHOT</ariesJmxVersion>
-        <ariesJndiVersion>0.4-SNAPSHOT</ariesJndiVersion>
-        <ariesJpaVersion>0.4-SNAPSHOT</ariesJpaVersion>
-        <ariesProxyVersion>0.4-SNAPSHOT</ariesProxyVersion>
-        <ariesQuiesceVersion>0.4-SNAPSHOT</ariesQuiesceVersion>
-        <ariesTransactionVersion>0.4-SNAPSHOT</ariesTransactionVersion>
-        <ariesUtilVersion>0.4-SNAPSHOT</ariesUtilVersion>
-        <ariesWebVersion>0.4-SNAPSHOT</ariesWebVersion>
+        <ariesApplicationVersion>0.3.1-SNAPSHOT</ariesApplicationVersion>
+        <ariesBlueprintVersion>0.3.1-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>
+        <ariesWebVersion>0.3.1-SNAPSHOT</ariesWebVersion>
         <openjpaVersion>2.0.0</openjpaVersion>
         <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>
         <geronimoJtaSpecVersion>1.1.1</geronimoJtaSpecVersion>
@@ -197,14 +197,14 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.application</groupId>
-                <artifactId>application</artifactId>
+                <artifactId>org.apache.aries.application</artifactId>
                 <version>${ariesApplicationVersion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>blueprint</artifactId>
+                <artifactId>org.apache.aries.blueprint</artifactId>
                 <version>${ariesBlueprintVersion}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -230,35 +230,35 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jmx</groupId>
-                <artifactId>jmx</artifactId>
+                <artifactId>org.apache.aries.jmx</artifactId>
                 <version>${ariesJmxVersion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>jndi</artifactId>
+                <artifactId>org.apache.aries.jndi</artifactId>
                 <version>${ariesJndiVersion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
-                <artifactId>jpa</artifactId>
+                <artifactId>org.apache.aries.jpa</artifactId>
                 <version>${ariesJpaVersion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>transaction</artifactId>
+                <artifactId>org.apache.aries.transaction</artifactId>
                 <version>${ariesTransactionVersion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.web</groupId>
-                <artifactId>web</artifactId>
+                <artifactId>org.apache.aries.web</artifactId>
                 <version>${ariesWebVersion}</version>
                 <type>pom</type>
                 <scope>import</scope>

Modified: aries/trunk/samples/twitter/twitter-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-itests/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-itests/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-itests/pom.xml Fri Mar 18 20:47:07 2011
@@ -108,71 +108,83 @@
             <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.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
+            <version>0.3</version>
         </dependency>
 
         <dependency>
             <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/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/testsupport/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/testsupport/pom.xml (original)
+++ aries/trunk/testsupport/pom.xml Fri Mar 18 20:47:07 2011
@@ -22,26 +22,19 @@
         <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>
     <groupId>org.apache.aries.testsupport</groupId>
     <artifactId>testsupport</artifactId>
     <name>Apache Aries Test Support</name>
-    <version>0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <description>
-        Test Support for OSGi
+        Test Support for OSGi - reactor pom
     </description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/testsupport</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/testsupport</developerConnection>
-        <url>http://svn.apache.org/viewvc/aries/trunk/testsupport</url>
-    </scm>
-
     <modules>
         <module>testsupport-unit</module>
     </modules>

Modified: aries/trunk/testsupport/testsupport-unit/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/testsupport/testsupport-unit/pom.xml (original)
+++ aries/trunk/testsupport/testsupport-unit/pom.xml Fri Mar 18 20:47:07 2011
@@ -18,24 +18,39 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.aries.testsupport</groupId>
-    <artifactId>testsupport</artifactId>
-    <version>0.4-SNAPSHOT</version>
+  <groupId>org.apache.aries</groupId>
+       <artifactId>java5-parent</artifactId>
+       <version>0.4</version>
+       <relativePath />
   </parent>
 
+  <groupId>org.apache.aries.testsupport</groupId>
   <artifactId>org.apache.aries.testsupport.unit</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Aries Unit Test Support</name>
+  <version>0.3.1-SNAPSHOT</version>
   <description>
       This bundle provides unit test support.
   </description>
 
+  <scm>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/testsupport/testsupport-unit</connection>
+     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/testsupport/testsupport-unit</developerConnection>
+     <url>http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit</url>
+  </scm>
+
+
     <properties>
         <!-- Export package versions are maintained in packageinfo files -->
 
         <aries.osgi.export.pkg>
-            org.apache.aries.*
+            org.apache.aries.unittest.fixture,
+            org.apache.aries.mocks;uses:="junit.framework,org.osgi.framework,org.apache.aries.unittest.mocks,org.junit,org.apache.aries.unittest.mocks.ann otations,javax.naming,javax.naming.spi",
+            org.apache.aries.unittest.mocks.annotations;version="0.3.0",org.apache.aries.unittest.mocks;uses:="junit.framework,org.apache.aries.unittest.mocks.annotations",
+            org.apache.aries.unittest.junit;uses:="org.junit"
         </aries.osgi.export.pkg>
+        <aries.osgi.private.pkg />
+        <aries.osgi.import.pkg>*</aries.osgi.import.pkg>
     </properties>
 
    <dependencies>

Modified: aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/packageinfo (original)
+++ aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.0

Modified: aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/junit/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/junit/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/junit/packageinfo (original)
+++ aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/junit/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.0

Modified: aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/annotations/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/annotations/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/annotations/packageinfo (original)
+++ aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/annotations/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.0

Modified: aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/packageinfo (original)
+++ aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.0

Modified: aries/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/pom.xml (original)
+++ aries/trunk/transaction/pom.xml Fri Mar 18 20:47:07 2011
@@ -23,129 +23,14 @@
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
         <version>0.4</version>
-        <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
+        <relativePath />
     </parent>
 
-    <properties>
-        <geronimo-transaction-version>2.2.1</geronimo-transaction-version>
-    </properties>
-
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.aries.transaction</groupId>
     <artifactId>transaction</artifactId>
-    <version>0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Apache Aries Transaction</name>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction</developerConnection>
-        <url>http://svn.apache.org/viewvc/aries/trunk/transaction</url>
-    </scm>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- internal dependencies -->
-            <dependency>
-                <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>org.apache.aries.transaction.blueprint</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>org.apache.aries.transaction.manager</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>org.apache.aries.transaction.wrappers</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>org.apache.aries.transaction.testds</artifactId>
-                <version>${project.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>org.apache.aries.transaction.testbundle</artifactId>
-                <version>${project.version}</version>
-                <scope>test</scope>
-            </dependency>
-            
-            <!-- external dependencies -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.1_spec</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries</groupId>
-                <artifactId>org.apache.aries.util</artifactId>
-                <version>0.4-SNAPSHOT</version> 
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint</artifactId>
-                <version>0.4-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.proxy</groupId>
-                <artifactId>org.apache.aries.proxy</artifactId>
-                <version>0.4-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.testsupport</groupId>
-                <artifactId>org.apache.aries.testsupport.unit</artifactId>
-                <version>0.4-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-transaction</artifactId>
-                <version>${geronimo-transaction-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.objectweb.howl</groupId>
-                <artifactId>howl</artifactId>
-                <version>1.0.1-1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-tx</artifactId>
-                <version>2.5.6</version>
-            </dependency>
-            <dependency>
-                <groupId>asm</groupId>
-                <artifactId>asm-all</artifactId>
-                <version>3.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derby</artifactId>
-                <version>10.5.3.0_1</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0</version>
-                    <configuration>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <goals>deploy</goals>
-                        <arguments>-Papache-release -DskipTests=true</arguments>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+    <name>Apache Aries Transaction - reactor pom</name>
 
     <modules>
         <module>transaction-manager</module>

Modified: aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/pom.xml Fri Mar 18 20:47:07 2011
@@ -18,17 +18,25 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.apache.aries.transaction</groupId>
-		<artifactId>transaction</artifactId>
-		<version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.aries.transaction</groupId>
 	<artifactId>org.apache.aries.transaction.blueprint</artifactId>
 	<packaging>bundle</packaging>
+    <version>0.3.1-SNAPSHOT</version>
 	<name>Apache Aries Transaction Blueprint</name>
 
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/blueprint</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/blueprint</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/transaction/blueprint</url>
+     </scm>
+
 	<properties>
         <!-- Export package versions are maintained in packageinfo files -->
 
@@ -55,16 +63,19 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.aries.blueprint</groupId>
 			<artifactId>org.apache.aries.blueprint</artifactId>
+            <version>0.3</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.aries.testsupport</groupId>
 			<artifactId>org.apache.aries.testsupport.unit</artifactId>
 			<scope>test</scope>
+            <version>0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

Modified: aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/exception/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/exception/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/exception/packageinfo (original)
+++ aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/exception/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.0

Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Fri Mar 18 20:47:07 2011
@@ -20,13 +20,22 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.aries.transaction</groupId>
-        <artifactId>transaction</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
     </parent>
   <groupId>org.apache.aries.transaction</groupId>
   <artifactId>org.apache.aries.transaction.itests</artifactId>
   <name>Apache Aries Transaction Integration Tests</name>
+  <version>0.3.1-SNAPSHOT</version>
+
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/itests</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/itests</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/transaction/itests</url>
+     </scm>
+
   <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -81,41 +90,49 @@
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
             <scope>test</scope>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
             <scope>test</scope>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.manager</artifactId>
             <scope>test</scope>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.blueprint</artifactId>
             <scope>test</scope>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.wrappers</artifactId>
             <scope>test</scope>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.testds</artifactId>
             <scope>test</scope>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.testbundle</artifactId>
             <scope>test</scope>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
       <dependency>
           <groupId>asm</groupId>
           <artifactId>asm-all</artifactId>
           <scope>test</scope>
+          <version>3.2</version>
       </dependency>
     </dependencies>
   <build>

Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Fri Mar 18 20:47:07 2011
@@ -20,9 +20,10 @@
 <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">
 
     <parent>
-        <groupId>org.apache.aries.transaction</groupId>
-        <artifactId>transaction</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -30,10 +31,16 @@
     <artifactId>org.apache.aries.transaction.manager</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries Transaction Manager</name> 
+    <version>0.3.1-SNAPSHOT</version>
 
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/manager</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/manager</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/transaction/manager</url>
+     </scm>
     <properties>
         <aries.osgi.export>
-            org.apache.geronimo.transaction*;version="${geronimo-transaction-version}",
+            org.apache.geronimo.transaction*;version="2.2.1",
             javax.transaction*;version="1.1.0"
         </aries.osgi.export>
         <aries.osgi.import>
@@ -69,6 +76,7 @@
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>provided</scope>
+            <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -83,15 +91,18 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-transaction</artifactId>
+            <version>2.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.objectweb.howl</groupId>
             <artifactId>howl</artifactId>
+            <version>1.0.1-1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
             <optional>true</optional>
+            <version>2.5.6</version>
         </dependency>
     </dependencies>
 

Modified: aries/trunk/transaction/transaction-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testbundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-testbundle/pom.xml (original)
+++ aries/trunk/transaction/transaction-testbundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -20,15 +20,23 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.aries.transaction</groupId>
-        <artifactId>transaction</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
     </parent>
   <groupId>org.apache.aries.transaction</groupId>
   <artifactId>org.apache.aries.transaction.testbundle</artifactId>
   <packaging>bundle</packaging>
+  <version>0.3.1-SNAPSHOT</version>
   <name>Apache Aries Transaction Test Bundle</name>
 
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/testbundle</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/testbundle</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/transaction/testbundle</url>
+     </scm>
+
   <properties>
     <!-- Export package versions are maintained in packageinfo files -->
 
@@ -38,6 +46,8 @@
     <aries.osgi.private.pkg>
       org.apache.aries.transaction.test.impl
     </aries.osgi.private.pkg>
+    <aries.osgi.import.pkg>*
+    </aries.osgi.import.pkg>
   </properties>
 
 </project>

Modified: aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/packageinfo (original)
+++ aries/trunk/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.0

Modified: aries/trunk/transaction/transaction-testds/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testds/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-testds/pom.xml (original)
+++ aries/trunk/transaction/transaction-testds/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,18 +17,35 @@
 <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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.apache.aries.transaction</groupId>
-		<artifactId>transaction</artifactId>
-		<version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
 	</parent>
 	<groupId>org.apache.aries.transaction</groupId>
 	<artifactId>org.apache.aries.transaction.testds</artifactId>
 	<name>Apache Aries Transaction Test Datasource Configuration</name>
+    <version>0.3.1-SNAPSHOT</version>
 	<packaging>bundle</packaging>
+
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/testds</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/testds</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/transaction/testds</url>
+     </scm>
+
+     <properties>
+         <aries.osgi.import.pkg>*
+         </aries.osgi.import.pkg>
+         <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
+         <aries.osgi.private.pkg />
+     </properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
+            <version>10.5.3.0_1</version>
 		</dependency>
 	</dependencies>
 </project>

Modified: aries/trunk/transaction/transaction-wrappers/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-wrappers/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-wrappers/pom.xml (original)
+++ aries/trunk/transaction/transaction-wrappers/pom.xml Fri Mar 18 20:47:07 2011
@@ -20,15 +20,23 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.aries.transaction</groupId>
-        <artifactId>transaction</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
     </parent>
   <groupId>org.apache.aries.transaction</groupId>
   <artifactId>org.apache.aries.transaction.wrappers</artifactId>
   <name>Apache Aries Transaction Enlisting JDBC Datasource</name>
+  <version>0.3.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/wrappers</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/wrappers</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/transaction/wrappers</url>
+     </scm>
+
   <properties>
     <aries.osgi.export.pkg>
       !org.apache.aries.transaction.jdbc
@@ -45,10 +53,12 @@
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.manager</artifactId>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
+            <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: aries/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/util/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/util/pom.xml (original)
+++ aries/trunk/util/pom.xml Fri Mar 18 20:47:07 2011
@@ -22,7 +22,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>
 
     <artifactId>org.apache.aries.util</artifactId>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <version>0.4-SNAPSHOT</version>
+            <version>0.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: aries/trunk/util/src/main/java/org/apache/aries/util/nls/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/nls/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/util/src/main/java/org/apache/aries/util/nls/packageinfo (original)
+++ aries/trunk/util/src/main/java/org/apache/aries/util/nls/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.0

Modified: aries/trunk/util/src/main/java/org/apache/aries/util/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/util/src/main/java/org/apache/aries/util/packageinfo (original)
+++ aries/trunk/util/src/main/java/org/apache/aries/util/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.1

Modified: aries/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/web/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/web/pom.xml (original)
+++ aries/trunk/web/pom.xml Fri Mar 18 20:47:07 2011
@@ -21,7 +21,7 @@
         <artifactId>java5-parent</artifactId>
         <groupId>org.apache.aries</groupId>
         <version>0.4</version>
-        <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
+        <relativePath />
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -29,98 +29,10 @@
     <artifactId>web</artifactId>
     <packaging>pom</packaging>
     <name>Apache Aries Web Component</name>
-    <version>0.4-SNAPSHOT</version>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/web</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/web</developerConnection>
-        <url>http://svn.apache.org/viewvc/aries/trunk/web</url>
-    </scm>
 
     <modules>
         <module>web-urlhandler</module>
         <module>web-itests</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- internal dependencies -->
-            <dependency>
-                <groupId>org.apache.aries.web</groupId>
-                <artifactId>org.apache.aries.web.itests</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.web</groupId>
-                <artifactId>org.apache.aries.web.urlhandler</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- external dependencies -->
-            <dependency>
-                <groupId>asm</groupId>
-                <artifactId>asm-all</artifactId>
-                <version>3.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.aries.testsupport</groupId>
-                <artifactId>org.apache.aries.testsupport.unit</artifactId>
-                <version>0.4-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.sample</artifactId>
-                <version>0.4-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.proxy</groupId>
-                <artifactId>org.apache.aries.proxy</artifactId>
-                <version>0.4-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.configadmin</artifactId>
-                <version>1.2.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.compendium</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries</groupId>
-                <artifactId>org.apache.aries.util</artifactId>
-                <version>0.4-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint</artifactId>
-                <version>0.4-SNAPSHOT</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.0</version>
-          <configuration>
-            <useReleaseProfile>false</useReleaseProfile>
-            <goals>deploy</goals>
-            <arguments>-Papache-release -DskipTests=true</arguments>
-          </configuration>
-        </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>

Modified: aries/trunk/web/web-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-itests/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/web/web-itests/pom.xml (original)
+++ aries/trunk/web/web-itests/pom.xml Fri Mar 18 20:47:07 2011
@@ -15,15 +15,24 @@
 -->
 <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">
     <parent>
-        <artifactId>web</artifactId>
-        <groupId>org.apache.aries.web</groupId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>org.apache.aries.web</groupId>
     <artifactId>org.apache.aries.web.itests</artifactId>
     <packaging>jar</packaging>
     <name>Apache Aries Web integration tests</name>
+    <version>0.3.1-SNAPSHOT</version>
+
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/web/web-itests</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/web/web-itests</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/web/web-itests</url>
+     </scm>
 
     <dependencies>
         <dependency>
@@ -39,11 +48,13 @@
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
+            <version>3.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
+            <version>0.3</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -54,26 +65,40 @@
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.sample</artifactId>
             <scope>test</scope>
+            <version>0.3.2-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <scope>test</scope>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.configadmin</artifactId>
+                <version>1.2.4</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>
+            <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
             <scope>test</scope>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
             <scope>test</scope>
+            <version>0.3.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
@@ -114,6 +139,7 @@
             <groupId>org.apache.aries.web</groupId>
             <artifactId>org.apache.aries.web.urlhandler</artifactId>
             <scope>provided</scope>
+            <version>0.3.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: aries/trunk/web/web-urlhandler/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/web/web-urlhandler/pom.xml (original)
+++ aries/trunk/web/web-urlhandler/pom.xml Fri Mar 18 20:47:07 2011
@@ -18,16 +18,25 @@
 -->
 <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">
     <parent>
-        <artifactId>web</artifactId>
-        <groupId>org.apache.aries.web</groupId>
-        <version>0.4-SNAPSHOT</version>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>java5-parent</artifactId>
+        <version>0.4</version>
+        <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>org.apache.aries.web</groupId>
     <artifactId>org.apache.aries.web.urlhandler</artifactId>
     <packaging>bundle</packaging>
+    <version>0.3.1-SNAPSHOT</version>
     <name>Apache Aries Web Url handler</name>
 
+     <scm>
+         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/web/web-url-handler</connection>
+         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/web/web-url-handler</developerConnection>
+         <url>http://svn.apache.org/viewvc/aries/trunk/web/web-url-handler</url>
+     </scm>
+
 	<properties>
         <!-- Export package versions are maintained in packageinfo files -->
 
@@ -38,6 +47,8 @@
 			org.apache.aries.web.converter.impl,
 			org.apache.aries.web.url
 		</aries.osgi.private.pkg>
+		<aries.osgi.import.pkg>*
+		</aries.osgi.import.pkg>
 	</properties>
 
     <dependencies>
@@ -54,11 +65,13 @@
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
+            <version>3.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
+            <version>0.3</version>
         </dependency>
     </dependencies>
 

Modified: aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/packageinfo (original)
+++ aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 0.4.0
+version 0.3.0



Mime
View raw message