[jboss-svn-commits] JBL Code SVN: r36638 - in labs/jbosstm/trunk: ArjunaJTA and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Feb 20 12:11:51 EST 2011


Author: tomjenkinson
Date: 2011-02-20 12:11:51 -0500 (Sun, 20 Feb 2011)
New Revision: 36638

Modified:
   labs/jbosstm/trunk/ArjunaCore/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/pom.xml
   labs/jbosstm/trunk/narayana-build-common/pom.xml
Log:
JBTM-574 updated to make sure we rebuild the dependency versions each time

Modified: labs/jbosstm/trunk/ArjunaCore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/pom.xml	2011-02-20 17:01:51 UTC (rev 36637)
+++ labs/jbosstm/trunk/ArjunaCore/pom.xml	2011-02-20 17:11:51 UTC (rev 36638)
@@ -45,7 +45,7 @@
 	</build>
 
 	<modules>
-<!--
+		<module>../narayana-build-common</module>
 		<module>../common</module>
 		<module>arjuna</module>
 		<module>arjuna/services</module>
@@ -53,8 +53,6 @@
 		<module>txoj</module>
 		<module>arjunacore</module>
 		<module>docs</module>
--->
-		<module>arjunacore</module>
 		<module>dist</module>
 	</modules>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml	2011-02-20 17:01:51 UTC (rev 36637)
+++ labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml	2011-02-20 17:11:51 UTC (rev 36638)
@@ -23,7 +23,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>arjunajta-dist</artifactId>
+	<artifactId>jbossjta-dist</artifactId>
 	<packaging>pom</packaging>
 	<name>ArjunaCore</name>
 
@@ -101,16 +101,16 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
+			<artifactId>jbossjta</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
+			<artifactId>jbossjta</artifactId>
 			<classifier>javadoc</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
+			<artifactId>jbossjta</artifactId>
 			<classifier>sources</classifier>
 		</dependency>
 		<dependency>

Modified: labs/jbosstm/trunk/ArjunaJTA/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/pom.xml	2011-02-20 17:01:51 UTC (rev 36637)
+++ labs/jbosstm/trunk/ArjunaJTA/pom.xml	2011-02-20 17:11:51 UTC (rev 36638)
@@ -45,6 +45,7 @@
 	</build>
 
 	<modules>
+		<module>../narayana-build-common</module>
 		<module>../common</module>
 		<module>../ArjunaCore/arjuna</module>
 		<module>../ArjunaCore/txoj</module>

Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build-common/pom.xml	2011-02-20 17:01:51 UTC (rev 36637)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml	2011-02-20 17:11:51 UTC (rev 36638)
@@ -1,145 +1,137 @@
 <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">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <!--
-      JBoss, Home of Professional Open Source
-      Copyright 2009, Red Hat Middleware LLC, and individual contributors
-      as indicated by the @author tags.
-      See the copyright.txt in the distribution for a
-      full listing of individual contributors.
-      This copyrighted material is made available to anyone wishing to use,
-      modify, copy, or redistribute it subject to the terms and conditions
-      of the GNU Lesser General Public License, v. 2.1.
-      This program is distributed in the hope that it will be useful, but WITHOUT A
-      WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-      PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-      You should have received a copy of the GNU Lesser General Public License,
-      v.2.1 along with this distribution; if not, write to the Free Software
-      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-      MA  02110-1301, USA.
-
-      (C) 2009,
-      @author JBoss Inc. (jonathan.halliday at redhat.com)
-    -->
+	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+		LLC, and individual contributors as indicated by the @author tags. See the 
+		copyright.txt in the distribution for a full listing of individual contributors. 
+		This copyrighted material is made available to anyone wishing to use, modify, 
+		copy, or redistribute it subject to the terms and conditions of the GNU Lesser 
+		General Public License, v. 2.1. This program is distributed in the hope that 
+		it will be useful, but WITHOUT A WARRANTY; without even the implied warranty 
+		of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser 
+		General Public License for more details. You should have received a copy 
+		of the GNU Lesser General Public License, v.2.1 along with this distribution; 
+		if not, write to the Free Software Foundation, Inc., 51 Franklin Street, 
+		Fifth Floor, Boston, MA 02110-1301, USA. (C) 2009, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
 	<parent>
 		<groupId>org.jboss.jbossas</groupId>
 		<artifactId>jboss-as-component-matrix</artifactId>
 		<version>5.1.0.GA</version>
 	</parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.jboss.jbossts</groupId>
-    <artifactId>narayana-build-common</artifactId>
-    <packaging>pom</packaging>
-    <version>5.0.0.M1-SNAPSHOT</version>
-    <name>narayana-build-common</name>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jboss.jbossts</groupId>
+	<artifactId>narayana-build-common</artifactId>
+	<packaging>pom</packaging>
+	<version>5.0.0.M1-SNAPSHOT</version>
+	<name>narayana-build-common</name>
 
-    <description>narayana-build-common</description>
+	<description>narayana-build-common</description>
 
-    <url>http://www.jboss.org/jbosstm/</url>
-    <issueManagement>
-        <system>JIRA</system>
-        <url>https://jira.jboss.org/jira/browse/JBTM/</url>
-    </issueManagement>
-    <ciManagement>
-        <system>hudson</system>
-        <url>http://hudson.qa.jboss.com/hudson/view/JBossTS/</url>
-    </ciManagement>
+	<url>http://www.jboss.org/jbosstm/</url>
+	<issueManagement>
+		<system>JIRA</system>
+		<url>https://jira.jboss.org/jira/browse/JBTM/</url>
+	</issueManagement>
+	<ciManagement>
+		<system>hudson</system>
+		<url>http://hudson.qa.jboss.com/hudson/view/JBossTS/</url>
+	</ciManagement>
 
-    <developers>
+	<developers>
 
-        <developer>
-            <id>jhalliday</id>
-            <name>Jonathan Halliday</name>
-            <email>jonathan.halliday at redhat.com</email>
-            <organization>JBoss</organization>
-            <organizationUrl>http://www.jboss.org/</organizationUrl>
-            <roles>
-                <role>project lead</role>
-            </roles>
-            <timezone>0</timezone>
-        </developer>
+		<developer>
+			<id>jhalliday</id>
+			<name>Jonathan Halliday</name>
+			<email>jonathan.halliday at redhat.com</email>
+			<organization>JBoss</organization>
+			<organizationUrl>http://www.jboss.org/</organizationUrl>
+			<roles>
+				<role>project lead</role>
+			</roles>
+			<timezone>0</timezone>
+		</developer>
 
-        <developer>
-            <id>adinn</id>
-            <name>Andrew Dinn</name>
-            <email>adinn at redhat.com</email>
-            <organization>JBoss</organization>
-            <organizationUrl>http://www.jboss.org/</organizationUrl>
-            <roles>
-                <role>XTS lead</role>
-            </roles>
-            <timezone>0</timezone>
-        </developer>
+		<developer>
+			<id>adinn</id>
+			<name>Andrew Dinn</name>
+			<email>adinn at redhat.com</email>
+			<organization>JBoss</organization>
+			<organizationUrl>http://www.jboss.org/</organizationUrl>
+			<roles>
+				<role>XTS lead</role>
+			</roles>
+			<timezone>0</timezone>
+		</developer>
 
-        <developer>
-            <id>mmusgrov</id>
-            <name>Michael Musgrove</name>
-            <email>mmusgrov at redhat.com</email>
-            <organization>JBoss</organization>
-            <organizationUrl>http://www.jboss.org/</organizationUrl>
-            <roles>
-                <role>Core Developer</role>
-            </roles>
-            <timezone>0</timezone>
-        </developer>
+		<developer>
+			<id>mmusgrov</id>
+			<name>Michael Musgrove</name>
+			<email>mmusgrov at redhat.com</email>
+			<organization>JBoss</organization>
+			<organizationUrl>http://www.jboss.org/</organizationUrl>
+			<roles>
+				<role>Core Developer</role>
+			</roles>
+			<timezone>0</timezone>
+		</developer>
 
-        <developer>
-            <id>mark.little at jboss.com</id>
-            <name>Mark Little</name>
-            <email>mlittle at redhat.com</email>
-            <organization>JBoss</organization>
-            <organizationUrl>http://www.jboss.org/</organizationUrl>
-            <roles>
-                <role>JBoss CTO</role>
-            </roles>
-            <timezone>0</timezone>
-        </developer>
+		<developer>
+			<id>mark.little at jboss.com</id>
+			<name>Mark Little</name>
+			<email>mlittle at redhat.com</email>
+			<organization>JBoss</organization>
+			<organizationUrl>http://www.jboss.org/</organizationUrl>
+			<roles>
+				<role>JBoss CTO</role>
+			</roles>
+			<timezone>0</timezone>
+		</developer>
 
-        <developer>
-            <id>istudens at redhat.com</id>
-            <name>Ivo Studensky</name>
-            <email>istudens at redhat.com</email>
-            <organization>JBoss</organization>
-            <organizationUrl>http://www.jboss.org/</organizationUrl>
-            <roles>
-                <role>QA lead</role>
-            </roles>
-            <timezone>0</timezone>
-        </developer>
+		<developer>
+			<id>istudens at redhat.com</id>
+			<name>Ivo Studensky</name>
+			<email>istudens at redhat.com</email>
+			<organization>JBoss</organization>
+			<organizationUrl>http://www.jboss.org/</organizationUrl>
+			<roles>
+				<role>QA lead</role>
+			</roles>
+			<timezone>0</timezone>
+		</developer>
 
-    </developers>
+	</developers>
 
-    <licenses>
-        <license>
-            <name>LGPL 2.1</name>
-            <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
-        </license>
-    </licenses>
+	<licenses>
+		<license>
+			<name>LGPL 2.1</name>
+			<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+		</license>
+	</licenses>
 
-    <scm>
-        <connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbosstm/</connection>
-        <developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbosstm/</developerConnection>
-        <url>http://fisheye.jboss.org/browse/JBossTS/</url>
-    </scm>
+	<scm>
+		<connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbosstm/</connection>
+		<developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbosstm/</developerConnection>
+		<url>http://fisheye.jboss.org/browse/JBossTS/</url>
+	</scm>
 
-    <repositories>
+	<repositories>
 		<repository>
 			<id>jbossThirdParty</id>
 			<url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/</url>
 		</repository>
-        <repository>
-            <id>jboss-public-repository-group</id>
-            <name>JBoss Public Maven Repository Group</name>
-            <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
+		<repository>
+			<id>jboss-public-repository-group</id>
+			<name>JBoss Public Maven Repository Group</name>
+			<url>https://repository.jboss.org/nexus/content/groups/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 
 	<distributionManagement>
 		<repository>
@@ -271,12 +263,24 @@
 				<artifactId>jbossjta</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.jboss.jbossts</groupId>
+				<artifactId>jbossjta</artifactId>
+				<version>${project.version}</version>
+				<classifier>javadoc</classifier>
+			</dependency>
+			<dependency>
+				<groupId>org.jboss.jbossts</groupId>
+				<artifactId>jbossjta</artifactId>
+				<version>${project.version}</version>
+				<classifier>sources</classifier>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
-<properties>
-    <maven.build.timestamp.format>yyyy/MMM/dd HH:mm</maven.build.timestamp.format>
-    <buildproperty.date>${maven.build.timestamp}</buildproperty.date>
-</properties>
+	<properties>
+		<maven.build.timestamp.format>yyyy/MMM/dd HH:mm</maven.build.timestamp.format>
+		<buildproperty.date>${maven.build.timestamp}</buildproperty.date>
+	</properties>
 
 </project>



More information about the jboss-svn-commits mailing list