incubator-bval-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r944255 - in /incubator/bval/trunk: DISCLAIMER DISCLAIMER.txt LICENSE LICENSE.txt NOTICE NOTICE.txt bval-guice/pom.xml bval-json/pom.xml bval-tck/pom.xml pom.xml
Date Fri, 14 May 2010 13:38:37 GMT
Author: dwoods
Date: Fri May 14 13:38:36 2010
New Revision: 944255

URL: http://svn.apache.org/viewvc?rev=944255&view=rev
Log:
BVAL-46 Create a project source assembly and some other build updates.

Added:
    incubator/bval/trunk/DISCLAIMER
      - copied unchanged from r944220, incubator/bval/trunk/DISCLAIMER.txt
    incubator/bval/trunk/LICENSE
      - copied unchanged from r944220, incubator/bval/trunk/LICENSE.txt
    incubator/bval/trunk/NOTICE
      - copied unchanged from r944220, incubator/bval/trunk/NOTICE.txt
Removed:
    incubator/bval/trunk/DISCLAIMER.txt
    incubator/bval/trunk/LICENSE.txt
    incubator/bval/trunk/NOTICE.txt
Modified:
    incubator/bval/trunk/bval-guice/pom.xml
    incubator/bval/trunk/bval-json/pom.xml
    incubator/bval/trunk/bval-tck/pom.xml
    incubator/bval/trunk/pom.xml

Modified: incubator/bval/trunk/bval-guice/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-guice/pom.xml?rev=944255&r1=944254&r2=944255&view=diff
==============================================================================
--- incubator/bval/trunk/bval-guice/pom.xml (original)
+++ incubator/bval/trunk/bval-guice/pom.xml Fri May 14 13:38:36 2010
@@ -31,34 +31,28 @@
     </parent>
 
     <artifactId>bval-guice</artifactId>
-    <name>Apache Bean Validation :: bval-guice</name>
+    <name>Apache Bean Validation :: bval-guice (optional)</name>
     <packaging>bundle</packaging>
 
     <description>Bean Validation - Google Guice Integration</description>
 
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.bval</groupId>
             <artifactId>bval-jsr303</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
             <version>2.0</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>aopalliance</groupId>
             <artifactId>aopalliance</artifactId>
             <version>1.0</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -67,6 +61,49 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <!--
+            default profile using geronimo-validation_1.0_spec.jar
+            active when property "ri" is not present.
+        -->
+        <profile>
+            <id>geronimo</id>
+            <activation>
+                <property>
+                    <name>!ri</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-validation_1.0_spec</artifactId>
+                    <!-- allow users to choose an API provider -->
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!--
+            optional profile using javax.validation/validation-api.jar
+            from RI manually active when property "-Pri" is provided.
+        -->
+        <profile>
+            <id>ri</id>
+            <activation>
+                <property>
+                    <name>ri</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                    <!-- allow users to choose an API provider -->
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
     <build>
         <defaultGoal>install</defaultGoal>
 

Modified: incubator/bval/trunk/bval-json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-json/pom.xml?rev=944255&r1=944254&r2=944255&view=diff
==============================================================================
--- incubator/bval/trunk/bval-json/pom.xml (original)
+++ incubator/bval/trunk/bval-json/pom.xml Fri May 14 13:38:36 2010
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>bval-json</artifactId>
-    <name>Apache Bean Validation :: bval-json</name>
+    <name>Apache Bean Validation :: bval-json (optional)</name>
     <packaging>bundle</packaging>
 
     <description>Bean Validation - Optional JSON Component</description>

Modified: incubator/bval/trunk/bval-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-tck/pom.xml?rev=944255&r1=944254&r2=944255&view=diff
==============================================================================
--- incubator/bval/trunk/bval-tck/pom.xml (original)
+++ incubator/bval/trunk/bval-tck/pom.xml Fri May 14 13:38:36 2010
@@ -28,49 +28,14 @@
     </parent>
 
     <artifactId>bval-tck-runner</artifactId>
-    <name>Apache BeanValidation TCK Runner</name>
+    <name>Apache Bean Validation :: bval-tck (TCK Runner)</name>
     <description>Aggregates dependencies and runs the JSR-303 TCK</description>
 
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.bval</groupId>
             <artifactId>bval-jsr303</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.bval</groupId>
-            <artifactId>bval-core</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.6</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <classifier>jdk15</classifier>
-            <version>5.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.jsr303.tck</groupId>
-            <artifactId>jsr303-tck</artifactId>
-            <version>1.0.3.GA</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.test-harness</groupId>
-            <artifactId>jboss-test-harness-jboss-as-51</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -84,97 +49,147 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <stripVersion>true</stripVersion>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.hibernate.jsr303.tck</groupId>
-                                    <artifactId>jsr303-tck</artifactId>
-                                    <type>xml</type>
-                                    <classifier>suite</classifier>
-                                    <overWrite>false</overWrite>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.validation</groupId>
-                                    <artifactId>validation-api</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.bval</groupId>
-                                    <artifactId>bval-jsr303</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.bval</groupId>
-                                    <artifactId>bval-core</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.thoughtworks.xstream</groupId>
-                                    <artifactId>xstream</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.slf4j</groupId>
-                                    <artifactId>slf4j-log4j12</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-suite.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                    <argLine>-Xmx128m</argLine>
-                    <forkMode>once</forkMode>
-                    <systemProperties>
-                        <property>
-                            <name>validation.provider</name>
-                            <value>${validation.provider}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-report</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report-only</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
-                    <outputName>test-report</outputName>
+                    <!-- Don't publish these artifacts to central -->
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
     </build>
+
     <profiles>
         <profile>
+            <id>tck</id>
+            <activation>
+                <property>
+                    <name>tck</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <version>1.5.6</version>
+                    <scope>runtime</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.testng</groupId>
+                    <artifactId>testng</artifactId>
+                    <classifier>jdk15</classifier>
+                    <version>5.8</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate.jsr303.tck</groupId>
+                    <artifactId>jsr303-tck</artifactId>
+                    <version>1.0.3.GA</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.test-harness</groupId>
+                    <artifactId>jboss-test-harness-jboss-as-51</artifactId>
+                    <version>1.0.0</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <stripVersion>true</stripVersion>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.hibernate.jsr303.tck</groupId>
+                                            <artifactId>jsr303-tck</artifactId>
+                                            <type>xml</type>
+                                            <classifier>suite</classifier>
+                                            <overWrite>false</overWrite>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>javax.validation</groupId>
+                                            <artifactId>validation-api</artifactId>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.apache.bval</groupId>
+                                            <artifactId>bval-jsr303</artifactId>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.apache.bval</groupId>
+                                            <artifactId>bval-core</artifactId>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>com.thoughtworks.xstream</groupId>
+                                            <artifactId>xstream</artifactId>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.slf4j</groupId>
+                                            <artifactId>slf4j-log4j12</artifactId>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/dependency/jsr303-tck-suite.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                            <argLine>-Xmx128m</argLine>
+                            <forkMode>once</forkMode>
+                            <systemProperties>
+                                <property>
+                                    <name>validation.provider</name>
+                                    <value>${validation.provider}</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-report-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>generate-test-report</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>report-only</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+                            <outputName>test-report</outputName>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
             <id>incontainer-debug</id>
             <activation>
                 <property>
@@ -182,11 +197,11 @@
                 </property>
             </activation>
             <properties>
-                <remote.debug>-Xnoagent -Djava.compiler=NONE -Xdebug
-                    -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
+                <remote.debug>-Xnoagent -Djava.compiler=NONE -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
                 </remote.debug>
             </properties>
         </profile>
+
         <profile>
             <id>incontainer</id>
             <activation>
@@ -244,6 +259,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>write-artifacts-to-disk</id>
             <activation>

Modified: incubator/bval/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/pom.xml?rev=944255&r1=944254&r2=944255&view=diff
==============================================================================
--- incubator/bval/trunk/pom.xml (original)
+++ incubator/bval/trunk/pom.xml Fri May 14 13:38:36 2010
@@ -32,7 +32,7 @@
 
     <groupId>org.apache.bval</groupId>
     <artifactId>bval-parent</artifactId>
-    <name>Apache BeanValidation :: Parent POM</name>
+    <name>Apache Bean Validation :: bval-parent (Parent POM)</name>
     <packaging>pom</packaging>
     <version>0.1-incubating-SNAPSHOT</version>
 
@@ -162,18 +162,18 @@
     -->
     <dependencyManagement>
         <dependencies>
-            <!-- Optional profile to use Spec RI API -->
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>1.0.0.GA</version>
-            </dependency>
             <!-- Default of Apache Geronimo version of the Spec API -->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-validation_1.0_spec</artifactId>
                 <version>1.1</version>
             </dependency>
+            <!-- Optional profile to use Spec RI API -->
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>1.0.0.GA</version>
+            </dependency>
             <!-- JPA2 spec required for JPA aware TraversableResolver support -->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -217,11 +217,11 @@
                 <artifactId>commons-collections</artifactId>
                 <version>3.2.1</version>
             </dependency>
+            <!-- Optional - only used by bval-json -->
             <dependency>
                 <groupId>org.freemarker</groupId>
                 <artifactId>freemarker</artifactId>
                 <version>2.3.15</version>
-                <!-- some older version is also compatible -->
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -277,7 +277,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.0.2</version>
+                    <version>2.1</version>
                     <configuration>
                         <source>1.5</source>
                         <target>1.5</target>
@@ -297,7 +297,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.0-alpha-4</version>
+                    <version>1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -307,7 +307,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.3</version>
                     <configuration>
                         <archive>
                             <manifest>
@@ -320,7 +320,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.6.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -330,7 +330,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-9</version>
+                    <version>2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -348,7 +348,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-3</version>
+                    <version>2.2-beta-5</version>
+                    <configuration>
+                        <tarLongFileMode>gnu</tarLongFileMode>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -416,12 +419,29 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.4.3</version>
+                    <configuration>
+                        <useFile>false</useFile>
+                        <trimStackTrace>false</trimStackTrace>
+                        <useSystemClassLoader>true</useSystemClassLoader>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
                     <version>2.1.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>2.2</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.codehaus.plexus</groupId>
+                            <artifactId>plexus-velocity</artifactId>
+                            <version>1.1.3</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -502,6 +522,34 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                            <descriptorRefs>
+                                <descriptorRef>
+                                    source-release
+                                </descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.apache.resources</groupId>
+                        <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                        <version>1.0.2</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
 
@@ -510,7 +558,7 @@
         <module>bval-jsr303</module>
         <module>bval-json</module>
         <module>bval-guice</module>
-        <!-- <module>bval-tck</module> -->
+        <module>bval-tck</module>
     </modules>
 
     <profiles>



Mime
View raw message