[jboss-svn-commits] JBL Code SVN: r36615 - in labs/jbosstm/trunk: ArjunaCore/arjuna and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2011-02-17 04:25:47 -0500 (Thu, 17 Feb 2011)
New Revision: 36615

Added:
   labs/jbosstm/trunk/narayana-build-common/
Removed:
   labs/jbosstm/trunk/narayana-build/common/
Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
   labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
   labs/jbosstm/trunk/narayana-build-common/pom.xml
   labs/jbosstm/trunk/narayana-build/pom.xml
Log:
JBTM-574 need to use java 6 for @Overrides

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml	2011-02-16 16:08:41 UTC (rev 36614)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml	2011-02-17 09:25:47 UTC (rev 36615)
@@ -32,6 +32,7 @@
 				<directory>etc</directory>
 			</resource>
 		</resources>
+		<testSourceDirectory>tests/classes</testSourceDirectory>
 		<testResources>
 			<testResource>
 				<directory>etc</directory>
@@ -58,7 +59,6 @@
 						</goals>
 						<configuration>
 							<sources>
-								<source>${basedir}/tests</source>
 								<source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
 							</sources>
 						</configuration>

Modified: labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml	2011-02-16 16:08:41 UTC (rev 36614)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml	2011-02-17 09:25:47 UTC (rev 36615)
@@ -32,6 +32,7 @@
 				<directory>etc</directory>
 			</resource>
 		</resources>
+		<testSourceDirectory>tests/classes</testSourceDirectory>
 		<testResources>
 			<testResource>
 				<directory>../</directory>
@@ -54,7 +55,6 @@
 						</goals>
 						<configuration>
 							<sources>
-								<source>${basedir}/tests</source>
 								<source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
 							</sources>
 						</configuration>

Modified: labs/jbosstm/trunk/narayana-build/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build/pom.xml	2011-02-16 16:08:41 UTC (rev 36614)
+++ labs/jbosstm/trunk/narayana-build/pom.xml	2011-02-17 09:25:47 UTC (rev 36615)
@@ -133,7 +133,7 @@
     </repositories>
 
 	<modules>
-		<module>common/pom.xml</module>
+		<module>../narayana-build-common/pom.xml</module>
 		<module>../ArjunaCore/pom.xml</module>
 		<module>../qa/tests/pom.xml</module>
 		<module>../ArjunaJTS/jtax/pom.xml</module>

Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build/common/pom.xml	2011-02-15 15:41:13 UTC (rev 36605)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml	2011-02-17 09:25:47 UTC (rev 36615)
@@ -160,8 +160,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>