[weld-commits] Weld SVN: r4495 - in cdi-tck/trunk: doc/reference/en-US and 1 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-11-01 08:31:46 -0500 (Sun, 01 Nov 2009)
New Revision: 4495

Modified:
   cdi-tck/trunk/doc/reference/en-US/reporting.xml
   cdi-tck/trunk/impl/pom.xml
   cdi-tck/trunk/pom.xml
Log:
always run audit if in Java 6, remove dist from aggregator

Modified: cdi-tck/trunk/doc/reference/en-US/reporting.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/reporting.xml	2009-11-01 13:22:14 UTC (rev 4494)
+++ cdi-tck/trunk/doc/reference/en-US/reporting.xml	2009-11-01 13:31:46 UTC (rev 4495)
@@ -132,12 +132,12 @@
             The coverage report is an HTML report generated as part of the TCK
             project build.  Specifically, it is generated by an annotation
             processor that attaches to the compilation of the classes in the TCK
-            test suite, another tool from the JBoss Test Utils project. You can
-            enable this report by setting the commandline property tck-audit to
-            true when running the Maven 2 build in the tck directory.
+            test suite, another tool from the JBoss Test Utils project. The report
+            is only generated when using Java 6 or above, as it requires the annotation
+            processor.
          </para>
          
-         <programlisting>mvn clean install -Dtck-audit=true</programlisting>
+         <programlisting>mvn clean install</programlisting>
 
          <note>
             <para>

Modified: cdi-tck/trunk/impl/pom.xml
===================================================================
--- cdi-tck/trunk/impl/pom.xml	2009-11-01 13:22:14 UTC (rev 4494)
+++ cdi-tck/trunk/impl/pom.xml	2009-11-01 13:31:46 UTC (rev 4495)
@@ -183,9 +183,7 @@
       <profile>
          <id>tck-audit</id>
          <activation>
-            <property>
-               <name>tck-audit</name>
-            </property>
+            <jdk>1.6</jdk>
          </activation>
          <dependencies>
             <dependency>
@@ -205,25 +203,6 @@
                   </configuration>
                </plugin>
                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-enforcer-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>enforce-versions</id>
-                        <goals>
-                           <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                           <rules>
-                              <requireJavaVersion>
-                                 <version>1.6</version>
-                              </requireJavaVersion>
-                           </rules>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
                   <groupId>org.codehaus.mojo</groupId>
                   <artifactId>build-helper-maven-plugin</artifactId>
                   <executions>
@@ -271,7 +250,6 @@
                   </executions>
                </plugin>
             </plugins>
-            <defaultGoal>compile</defaultGoal>
          </build>
       </profile>
 

Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml	2009-11-01 13:22:14 UTC (rev 4494)
+++ cdi-tck/trunk/pom.xml	2009-11-01 13:31:46 UTC (rev 4495)
@@ -322,17 +322,35 @@
             <module>doc/reference</module>
          </modules>
       </profile>
-
+      
       <profile>
-         <id>dist</id>
+         <id>verify-release</id>
          <activation>
             <property>
                <name>release</name>
             </property>
          </activation>
-         <modules>
-            <module>dist</module>
-         </modules>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId> 
+                  <artifactId>maven-enforcer-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>enforce-java-release</id>
+                        <goals>
+                           <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                           <requireJavaVersion>
+                              <version>1.6</version>
+                           </requireJavaVersion>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
       </profile>
 
    </profiles>