incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r917418 - in /incubator/aries/trunk/transaction: LICENSE NOTICE pom.xml transaction-blueprint/pom.xml transaction-manager/pom.xml
Date Mon, 01 Mar 2010 08:37:26 GMT
Author: djencks
Date: Mon Mar  1 08:37:26 2010
New Revision: 917418

URL: http://svn.apache.org/viewvc?rev=917418&view=rev
Log:
ARIES-173 clean up transaction dependencies, add legal files

Added:
    incubator/aries/trunk/transaction/LICENSE
      - copied unchanged from r917416, incubator/aries/trunk/LICENSE
    incubator/aries/trunk/transaction/NOTICE
      - copied unchanged from r917416, incubator/aries/trunk/NOTICE
Modified:
    incubator/aries/trunk/transaction/pom.xml
    incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
    incubator/aries/trunk/transaction/transaction-manager/pom.xml

Modified: incubator/aries/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/pom.xml?rev=917418&r1=917417&r2=917418&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/pom.xml (original)
+++ incubator/aries/trunk/transaction/pom.xml Mon Mar  1 08:37:26 2010
@@ -30,16 +30,53 @@
     <artifactId>transaction</artifactId>
     <version>1.0.0-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Apache Aries Transaction</name> 
+    <name>Apache Aries Transaction</name>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/transaction</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/transaction</developerConnection>
         <url>http://svn.apache.org/viewvc/incubator/aries/trunk/transaction</url>
     </scm>
-	<modules>
-		<module>transaction-manager</module>
-		<module>transaction-blueprint</module>
-	</modules>
-	
+
+    <dependencyManagement>
+        <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.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint</artifactId>
+                <version>1.0.0-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.testsupport</groupId>
+                <artifactId>org.apache.aries.testsupport.unit</artifactId>
+                <version>1.0.0-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-transaction</artifactId>
+                <version>2.1.3</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>
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>transaction-manager</module>
+        <module>transaction-blueprint</module>
+    </modules>
+
 </project>

Modified: incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=917418&r1=917417&r2=917418&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/pom.xml Mon Mar  1 08:37:26 2010
@@ -31,10 +31,6 @@
     <packaging>bundle</packaging>
     <name>Apache Aries Transaction Blueprint</name> 
 
-    <properties>
-        <geronimo-transaction-version>2.1.3</geronimo-transaction-version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -49,23 +45,15 @@
 		<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>${version}</version>
           <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
           <groupId>org.apache.aries.testsupport</groupId>
           <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>1.0.0-incubating-SNAPSHOT</version>
           <scope>test</scope>
         </dependency>
         <dependency>
@@ -77,6 +65,11 @@
           <artifactId>slf4j-simple</artifactId>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: incubator/aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-manager/pom.xml?rev=917418&r1=917417&r2=917418&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-manager/pom.xml Mon Mar  1 08:37:26 2010
@@ -31,10 +31,6 @@
     <packaging>bundle</packaging>
     <name>Apache Aries Transaction Manager</name> 
 
-    <properties>
-        <geronimo-transaction-version>2.1.3</geronimo-transaction-version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -49,40 +45,19 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-transaction</artifactId>
-            <version>2.1.3</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>
             <optional>true</optional>
         </dependency>
     </dependencies>
 
     <build>
-       <resources>
-            <resource>
-                <targetPath>OSGI-INF/blueprint</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/OSGI-INF/blueprint</directory>
-                <includes>
-                    <include>*.xml</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>org/apache/aries/transaction/parsing</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/org/apache/aries/transaction/parsing</directory>
-                <includes>
-                  <include>*.xsd</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>



Mime
View raw message