[hibernate-commits] Hibernate SVN: r20720 - in validator/trunk: hibernate-validator and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2010-09-27 08:21:21 -0400 (Mon, 27 Sep 2010)
New Revision: 20720

Modified:
   validator/trunk/hibernate-validator/pom.xml
   validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml
   validator/trunk/pom.xml
Log:
HV-378 Updated pom variables. Also finally found the right syntax for the testng package syntax

Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml	2010-09-27 11:30:37 UTC (rev 20719)
+++ validator/trunk/hibernate-validator/pom.xml	2010-09-27 12:21:21 UTC (rev 20720)
@@ -154,7 +154,7 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestFile>${pom.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
             </plugin>
@@ -172,10 +172,10 @@
                             org.slf4j.*;version="[1.5.6,2.0.0)"
                         </Import-Package>
                         <Export-Package>
-                            org.hibernate.validator;version="${pom.version}",
-                            org.hibernate.validator.constraints;version="${pom.version}",
-                            org.hibernate.validator.messageinterpolation;version="${pom.version}",
-                            org.hibernate.validator.resourceloading;version="${pom.version}",
+                            org.hibernate.validator;version="${project.version}",
+                            org.hibernate.validator.constraints;version="${project.version}",
+                            org.hibernate.validator.messageinterpolation;version="${project.version}",
+                            org.hibernate.validator.resourceloading;version="${project.version}",
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -244,7 +244,7 @@
                     <doctitle>Hibernate Validator ${project.version}</doctitle>
                     <windowtitle>Hibernate Validator ${project.version}</windowtitle>
                     <bottom>
-                        <![CDATA[Copyright &copy; ${inceptionYear}-{currentYear} <a href="http://redhat.com">Red Hat Middleware, LLC.</a>  All Rights Reserved]]></bottom>
+                        <![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://redhat.com">Red Hat Middleware, LLC.</a>  All Rights Reserved]]></bottom>
                 </configuration>
             </plugin>
             <plugin>
@@ -342,12 +342,4 @@
             </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>

Modified: validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml
===================================================================
--- validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml	2010-09-27 11:30:37 UTC (rev 20719)
+++ validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml	2010-09-27 12:21:21 UTC (rev 20720)
@@ -3,25 +3,7 @@
 <suite name="Hibernate Validator Unit Tests" verbose="1">
     <test name="Unit tests">
         <packages>
-            <package name="org.hibernate.validator.test"/>
-            <package name="org.hibernate.validator.test.bootstrap"/>
-            <package name="org.hibernate.validator.test.cfg"/>
-            <package name="org.hibernate.validator.test.constraints"/>
-            <package name="org.hibernate.validator.test.constraints.impl"/>
-            <package name="org.hibernate.validator.test.constraints.composition"/>
-            <package name="org.hibernate.validator.test.engine"/>
-            <package name="org.hibernate.validator.test.engine.customerror"/>
-            <package name="org.hibernate.validator.test.engine.groups"/>
-            <package name="org.hibernate.validator.test.engine.messageinterpolation"/>
-            <package name="org.hibernate.validator.test.engine.proxy"/>
-            <package name="org.hibernate.validator.test.engine.serialization"/>
-            <package name="org.hibernate.validator.test.engine.traversableresolver"/>
-            <package name="org.hibernate.validator.test.metadata"/>
-            <package name="org.hibernate.validator.test.resourceloading"/>
-            <package name="org.hibernate.validator.test.util"/>
-            <package name="org.hibernate.validator.test.util.annotationfactory"/>
-            <package name="org.hibernate.validator.test.xml"/>
-            <package name="org.hibernate.validator.test.xml.mixedconfiguration"/>
+            <package name="org.hibernate.validator.test.*"/>
         </packages>
     </test>
-</suite>
\ No newline at end of file
+</suite>

Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml	2010-09-27 11:30:37 UTC (rev 20719)
+++ validator/trunk/pom.xml	2010-09-27 12:21:21 UTC (rev 20720)
@@ -56,7 +56,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-validator</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.validation</groupId>
@@ -345,43 +345,4 @@
             <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.0.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jxr-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-clover-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <configuration>
-                    <targetJdk>1.5</targetJdk>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>changelog-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>changes-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>