[jboss-svn-commits] JBL Code SVN: r36705 - in labs/jbosstm/trunk: ArjunaCore/dist and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 24 11:57:06 EST 2011
Author: tomjenkinson
Date: 2011-02-24 11:57:06 -0500 (Thu, 24 Feb 2011)
New Revision: 36705
Modified:
labs/jbosstm/trunk/ArjunaCore/dist/pom.xml
labs/jbosstm/trunk/ArjunaCore/pom.xml
labs/jbosstm/trunk/ArjunaJTA/pom.xml
labs/jbosstm/trunk/ArjunaJTS/pom.xml
labs/jbosstm/trunk/narayana-build-common/pom.xml
Log:
JBTM-574 updated to include the emma jar that is in our local repository
Modified: labs/jbosstm/trunk/ArjunaCore/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/dist/pom.xml 2011-02-24 16:49:16 UTC (rev 36704)
+++ labs/jbosstm/trunk/ArjunaCore/dist/pom.xml 2011-02-24 16:57:06 UTC (rev 36705)
@@ -25,7 +25,7 @@
<groupId>org.jboss.jbossts</groupId>
<artifactId>arjunacore-dist</artifactId>
<packaging>pom</packaging>
- <name>ArjunaCore</name>
+ <name>ArjunaCore distribution</name>
<build>
<plugins>
Modified: labs/jbosstm/trunk/ArjunaCore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/pom.xml 2011-02-24 16:49:16 UTC (rev 36704)
+++ labs/jbosstm/trunk/ArjunaCore/pom.xml 2011-02-24 16:57:06 UTC (rev 36705)
@@ -13,36 +13,20 @@
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.jbossts</groupId>
+ <artifactId>narayana-build-common</artifactId>
+ <version>4.15.0.M1-SNAPSHOT</version>
+ </parent>
-
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossts</groupId>
<artifactId>arjunacore-all</artifactId>
- <version>4.15.0.M1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>ArjunaCore</name>
+ <name>ArjunaCore everything</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<modules>
- <module>../narayana-build-common</module>
<module>../common</module>
- <module>arjuna</module>
+ <module>arjuna</module>
<module>arjuna/services</module>
<module>tsmx</module>
<module>txoj</module>
Modified: labs/jbosstm/trunk/ArjunaJTA/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/pom.xml 2011-02-24 16:49:16 UTC (rev 36704)
+++ labs/jbosstm/trunk/ArjunaJTA/pom.xml 2011-02-24 16:57:06 UTC (rev 36705)
@@ -13,34 +13,18 @@
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.jbossts</groupId>
+ <artifactId>narayana-build-common</artifactId>
+ <version>4.15.0.M1-SNAPSHOT</version>
+ </parent>
-
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjta-all</artifactId>
- <version>4.15.0.M1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBossJTA everything</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<modules>
- <module>../narayana-build-common</module>
<module>../common</module>
<module>../ArjunaCore/arjuna</module>
<module>../ArjunaCore/txoj</module>
Modified: labs/jbosstm/trunk/ArjunaJTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-02-24 16:49:16 UTC (rev 36704)
+++ labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-02-24 16:57:06 UTC (rev 36705)
@@ -13,32 +13,17 @@
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.jbossts</groupId>
+ <artifactId>narayana-build-common</artifactId>
+ <version>4.15.0.M1-SNAPSHOT</version>
+ </parent>
-
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjts-all</artifactId>
- <version>4.15.0.M1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBossJTS everything</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<modules>
<module>../narayana-build-common</module>
<module>../common</module>
Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-24 16:49:16 UTC (rev 36704)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-24 16:57:06 UTC (rev 36705)
@@ -171,7 +171,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.0-alpha-3</version>
<inherited>true</inherited>
<configuration>
<metadataFile>${project.build.directory}/test-classes/coverage.em</metadataFile>
@@ -181,9 +181,41 @@
<dataFile>${project.build.directory}/test-classes/coverage.ec</dataFile>
</dataFiles>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>emma</groupId>
+ <artifactId>emma</artifactId>
+ <version>2.1.5320</version>
+ <scope>system</scope>
+ <systemPath>${TS_EMMA_JAR}/emma.jar</systemPath>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
+ <inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>TS_EMMA_JAR</property>
+ <message>"You must tell me where emma is located - set the -DTS_EMMA_JAR property"</message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
More information about the jboss-svn-commits
mailing list