[jboss-cvs] Repository SVN: r1013 - in maven2/org/jboss/jboss-retro: 1.1.2 and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Aug 14 12:33:21 EDT 2007


Author: pgier
Date: 2007-08-14 12:33:20 -0400 (Tue, 14 Aug 2007)
New Revision: 1013

Modified:
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar.md5
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar.sha1
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar.md5
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar.sha1
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar.md5
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar.sha1
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar.md5
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar.sha1
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom.md5
   maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom.sha1
   maven2/org/jboss/jboss-retro/maven-metadata.xml
   maven2/org/jboss/jboss-retro/maven-metadata.xml.md5
   maven2/org/jboss/jboss-retro/maven-metadata.xml.sha1
Log:
Release of jboss-retro 1.1.2

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar
===================================================================
(Binary files differ)

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar.md5
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar.md5	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar.md5	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-e1bd3143157309bb019a90da80311539
\ No newline at end of file
+c1ddccbbfdf1808f679de586379d879a
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar.sha1
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar.sha1	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-retrocheck.jar.sha1	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-55dc17f494de3853ac10aa440d7702f9857106a7
\ No newline at end of file
+210eb8184c7930ecb3bfb493bb41481afcba2b30
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar
===================================================================
(Binary files differ)

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar.md5
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar.md5	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar.md5	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-b0731be187d3e31f0d2028b919456121
\ No newline at end of file
+2920a4d0b6faf8bad7af22c71ec27810
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar.sha1
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar.sha1	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-rt.jar.sha1	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-4b4788e2296b93e8f1d48a02a808e6c85288198e
\ No newline at end of file
+38d9175df2d6c51f653bf1572b0e941465cc18ef
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar
===================================================================
(Binary files differ)

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar.md5
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar.md5	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar.md5	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-3ee4f0bd0103167ad98085ca60419942
\ No newline at end of file
+5cbfb14799c01cab7e18589cccbb0258
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar.sha1
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar.sha1	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2-sources.jar.sha1	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-f32a68257bf29fe9b29bc493bbbc46f3c33bc43e
\ No newline at end of file
+8da6d6f1d3c006f398c53a8741b04183b013a1e8
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar
===================================================================
(Binary files differ)

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar.md5
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar.md5	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar.md5	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-dbcd1b4b4ab278d214f19d0b0339019c
\ No newline at end of file
+bbe39fd81046f51cb899d2389578b1de
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar.sha1
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar.sha1	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.jar.sha1	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-1b8374ee2f8ce25d613771697406cdddf27d2bbd
\ No newline at end of file
+fc47ff74035c2c9fb108cdf8fcea66025b148b09
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Notes for building and running tests.
+  - Do to some limitations of the maven compiler plugin and the surefire plugin,
+  - A full build and test must occur in three steps.
+  - Step 1.  mvn install - This will create the build artifacts for deployment and run the jdk5 tests.
+  - Step 2 (optional). mvn -Pbuild-jdk14-tests test - This will compile the jdk14 tests and retro weave them.
+  - Step 3 (requires step 2). mvn -Prun-jdk14-tests surefire:test - This will run the jdk14 unit tests. 
+  -      Note: step 3 will not work by calling mvn test, it must be performed by calling surefire directly.
+  -->
 <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.jboss</groupId>
     <artifactId>jboss-parent</artifactId>
     <version>3</version>
   </parent>
+  
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss</groupId>
   <artifactId>jboss-retro</artifactId>
@@ -15,20 +26,24 @@
     A byte code weaver which will transform Java SE 1.5 byte code to its Java 1.4 equivalent.
   </description>
   <url>http://labs.jboss.com/jbossretro</url>
+  
   <licenses>
     <license>
       <name>GNU Lesser General Public License</name>
       <url>http://www.gnu.org/licenses/lgpl.html</url>
     </license>
   </licenses>
+  
   <scm>
     <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossretro/tags/jboss-retro-1.1.2</connection>
     <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossretro/tags/jboss-retro-1.1.2</developerConnection>
   </scm>
+  
   <issueManagement>
     <system>jira</system>
     <url>http://jira.jboss.com/jira/browse/JBBUILD</url>
   </issueManagement>
+  
   <developers>
     <developer>
       <id>adrian</id>
@@ -56,75 +71,50 @@
       <timezone>-5</timezone>
     </developer>
   </developers>
+  
   <inceptionYear>2005</inceptionYear>
+  
   <organization>
     <name>JBoss, a division of Red Hat, Inc</name>
     <url>http://www.jboss.org</url>
   </organization>
+  
   <build>
     <finalName>${artifactId}</finalName>
+    <outputDirectory>${mainOutputDir}</outputDirectory>
+    <testSourceDirectory>${testSourceDir}</testSourceDirectory>
+    <testOutputDirectory>${testOutputDir}</testOutputDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagBase>https://svn.jboss.org/repos/jbossretro/tags</tagBase>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.3</version>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.0-alpha-3</version>
         <executions>
           <execution>
-            <id>jdk5-tests</id>
+            <id>enforce-jdk14-property</id>
             <goals>
-              <goal>test</goal>
+              <goal>enforce-once</goal>
             </goals>
             <configuration>
-              <skip>false</skip>
-              <!-- Use the default plugin configuration -->
+              <rules>
+                <requireProperty>
+                  <property>java14_home</property>
+                  <message>
+                    The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
+                  </message>
+                </requireProperty>
+              </rules>
             </configuration>
           </execution>
-          <execution>
-            <id>jdk14-tests</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <!-- Currently maven does not set the classpath correctly, so
-                -  we have to skip these tests. -->
-              <skip>true</skip>
-              <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
-              <testClassesDirectory>${project.build.directory}/test-classes-jdk14</testClassesDirectory>
-              <testFailureIgnore>true</testFailureIgnore>
-              <jvm>${java14_home}/bin/${javaExecutable}</jvm>
-              <includes>
-                <include>**/*TestCase.java</include>
-                <include>org/jboss/test/concurrent/*Test.java</include>
-              </includes>
-              <excludes>
-                <exclude>**/JSR166TestCase.java</exclude>
-                <exclude>**/ThreadLocalTest.java</exclude>
-              </excludes>
-            </configuration>
-          </execution>
         </executions>
-        <configuration>
-          <skip>true</skip>
-          <testFailureIgnore>true</testFailureIgnore>
-          <forkMode>always</forkMode>
-          <includes>
-            <include>**/*TestCase.java</include>
-          </includes>
-          <useSystemClassLoader>true</useSystemClassLoader>
-        </configuration>
       </plugin>
       <!-- Assembly must come before the retro plugin so that we can use the assembled jar
         -  in the retro check tests 
         -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-1</version>
         <executions>
           <execution>
             <id>create-rt-jar</id>
@@ -159,6 +149,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
         <configuration>
           <archive>
             <manifest>
@@ -178,10 +169,6 @@
         <groupId>org.jboss.maven.plugins</groupId>
         <artifactId>maven-jboss-retro-plugin</artifactId>
         <version>1.0-beta-1</version>
-        <configuration>
-          <attachJar>false</attachJar>
-          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
-        </configuration>
         <executions>
           <execution>
             <id>weave-classes</id>
@@ -193,15 +180,6 @@
             </configuration>
           </execution>
           <execution>
-            <id>weave-test-classes</id>
-            <goals>
-              <goal>weave-tests</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
             <id>check-weaved-classes</id>
             <goals>
               <goal>retro-check</goal>
@@ -211,24 +189,20 @@
               <jvm>${java14_home}/bin/${javaExecutable}</jvm>
             </configuration>
           </execution>
-          <execution>
-            <id>check-weaved-test-classes</id>
-            <goals>
-              <goal>retro-check</goal>
-            </goals>
-            <configuration>
-              <checkDirectory>test-classes-jdk14</checkDirectory>
-              <jvm>${java14_home}/bin/${javaExecutable}</jvm>
-            </configuration>
-          </execution>
         </executions>
         <dependencies>
+          <!-- Junit dependency is need for the retro check of the test classes -->
           <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>3.8.1</version>
           </dependency>
         </dependencies>
+        <configuration>
+          <fork>true</fork>
+          <attachJar>false</attachJar>
+          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.jboss.maven.plugins</groupId>
@@ -245,8 +219,22 @@
           <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <forkMode>always</forkMode>
+          <includes>
+            <include>**/*TestCase.java</include>
+          </includes>
+          <useSystemClassLoader>true</useSystemClassLoader>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
+  
   <dependencies>
     <dependency>
       <groupId>jboss</groupId>
@@ -270,6 +258,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
   <profiles>
     <!-- Set the name of the java executable for each os -->
     <profile>
@@ -295,7 +284,107 @@
         <javaExecutable>java</javaExecutable>
       </properties>
     </profile>
+    <!-- Note: building and running the jdk14 tests need to happen separately
+      -  from the main build until some maven issues are resolved.
+      -->
+    <profile>
+      <id>build-jdk14-tests</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jboss.maven.plugins</groupId>
+            <artifactId>maven-jboss-retro-plugin</artifactId>
+            <version>1.0-beta-1</version>
+            <executions>
+              <execution>
+                <id>weave-test-classes</id>
+                <goals>
+                  <goal>weave-tests</goal>
+                </goals>
+                <configuration>
+                  <verbose>false</verbose>
+                  <classesDirectory>${project.build.directory}/test-classes-java14</classesDirectory>
+                  <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+                </configuration>
+              </execution>
+              <execution>
+                <id>check-weaved-test-classes</id>
+                <goals>
+                  <goal>retro-check</goal>
+                </goals>
+                <configuration>
+                  <checkDirectory>test-classes-jdk14</checkDirectory>
+                  <jvm>${java14_home}/bin/${javaExecutable}</jvm>
+                </configuration>
+              </execution>
+            </executions>
+            <configuration>
+              <fork>true</fork>
+              <attachJar>false</attachJar>
+              <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.3</version>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <mainOutputDir>target/classes</mainOutputDir>
+        <testSourceDir>src/test/java14</testSourceDir>
+        <testOutputDir>target/test-classes-java14</testOutputDir>
+      </properties>
+    </profile>
+    <profile>
+      <id>run-jdk14-tests</id>
+      <activation>
+        <property>
+          <name>jdk14-tests</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.3</version>
+            <configuration>
+              <jvm>${java14_home}/bin/${javaExecutable}</jvm>
+              <forkMode>always</forkMode>
+              <useSystemClassLoader>true</useSystemClassLoader>
+              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+              <systemProperties>
+                <property>
+                  <name>jbosstest.output</name>
+                  <value>${project.build.directory}</value>
+                </property>
+                <jbosstest.output>${project.build.directory}</jbosstest.output>
+              </systemProperties>
+              <includes>
+                <include>**/*TestCase.java</include>
+                <include>org/jboss/test/concurrent/*Test.java</include>
+              </includes>
+              <excludes>
+                <exclude>**/JSR166TestCase.java</exclude>
+                <exclude>**/ThreadLocalTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <mainOutputDir>target/classes-jdk14</mainOutputDir>
+        <testSourceDir>src/test/java14</testSourceDir>
+        <testOutputDir>target/test-classes-jdk14</testOutputDir>
+      </properties>
+    </profile>
   </profiles>
+  
   <distributionManagement>
     <site>
       <id>www.jboss.org</id>
@@ -304,4 +393,10 @@
       <url>file://${jbossretro.site.root}</url>
     </site>
   </distributionManagement>
+  
+  <properties>
+    <mainOutputDir>target/classes</mainOutputDir>
+    <testSourceDir>src/test/java</testSourceDir>
+    <testOutputDir>target/test-classes</testOutputDir>
+  </properties>
 </project>

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom.md5
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom.md5	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom.md5	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-f16275a815b09f144c7862e5a24f4a7e
\ No newline at end of file
+48f4048693cd6628afe5dee2bece941c
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom.sha1
===================================================================
--- maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom.sha1	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/1.1.2/jboss-retro-1.1.2.pom.sha1	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-303893c2185523cbe36993f5075de5b5d199605c
\ No newline at end of file
+bee00b2554c4f796206261bc556267631dd1963c
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/maven-metadata.xml
===================================================================
--- maven2/org/jboss/jboss-retro/maven-metadata.xml	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/maven-metadata.xml	2007-08-14 16:33:20 UTC (rev 1013)
@@ -10,6 +10,6 @@
       <version>1.1.2-beta</version>
       <version>1.1.2</version>
     </versions>
-    <lastUpdated>20070809213900</lastUpdated>
+    <lastUpdated>20070814163033</lastUpdated>
   </versioning>
 </metadata>
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/maven-metadata.xml.md5
===================================================================
--- maven2/org/jboss/jboss-retro/maven-metadata.xml.md5	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/maven-metadata.xml.md5	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-52241bc4f113edc9fb322b3072d23f51
\ No newline at end of file
+36a3e7b605ec43bdcf7b99629ba3c937
\ No newline at end of file

Modified: maven2/org/jboss/jboss-retro/maven-metadata.xml.sha1
===================================================================
--- maven2/org/jboss/jboss-retro/maven-metadata.xml.sha1	2007-08-14 14:34:37 UTC (rev 1012)
+++ maven2/org/jboss/jboss-retro/maven-metadata.xml.sha1	2007-08-14 16:33:20 UTC (rev 1013)
@@ -1 +1 @@
-64e2cac2fe873add902dd189a1e70b8667978bb5
\ No newline at end of file
+e9c22fb150930ef30f94cfafc8d53d8feb9324d7
\ No newline at end of file




More information about the jboss-cvs-commits mailing list