You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/11/23 14:37:21 UTC

svn commit: r1038108 - in /myfaces/extensions/validator/trunk: assembly/pom.xml pom.xml

Author: struberg
Date: Tue Nov 23 13:37:20 2010
New Revision: 1038108

URL: http://svn.apache.org/viewvc?rev=1038108&view=rev
Log:
EXTVAL release preparation - only build assembly in apache-release profile


Modified:
    myfaces/extensions/validator/trunk/assembly/pom.xml
    myfaces/extensions/validator/trunk/pom.xml

Modified: myfaces/extensions/validator/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/assembly/pom.xml?rev=1038108&r1=1038107&r2=1038108&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/assembly/pom.xml (original)
+++ myfaces/extensions/validator/trunk/assembly/pom.xml Tue Nov 23 13:37:20 2010
@@ -18,195 +18,90 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/assembly</developerConnection>
         <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/assembly</url>
     </scm>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator</groupId>
-                                    <artifactId>myfaces-extval-core</artifactId>
-                                    <version>${core.version}</version>
-                                    <classifier>javadoc</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
-                                    <artifactId>myfaces-extval-generic-support</artifactId>
-                                    <version>${generic-support.version}</version>
-                                    <classifier>javadoc</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
-                                    <artifactId>myfaces-extval-trinidad-support</artifactId>
-                                    <version>${trinidad-support.version}</version>
-                                    <classifier>javadoc</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-                                    <artifactId>myfaces-extval-property-validation</artifactId>
-                                    <version>${property-validation.version}</version>
-                                    <classifier>javadoc</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-                                    <artifactId>myfaces-extval-bean-validation</artifactId>
-                                    <version>${bean-validation.version}</version>
-                                    <classifier>javadoc</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-source</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator</groupId>
-                                    <artifactId>myfaces-extval-core</artifactId>
-                                    <version>${core.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
-                                    <artifactId>myfaces-extval-generic-support</artifactId>
-                                    <version>${generic-support.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
-                                    <artifactId>myfaces-extval-trinidad-support</artifactId>
-                                    <version>${trinidad-support.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-                                    <artifactId>myfaces-extval-property-validation</artifactId>
-                                    <version>${property-validation.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-                                    <artifactId>myfaces-extval-bean-validation</artifactId>
-                                    <version>${bean-validation.version}</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/src</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <!-- EXECUTE mvn package to generate assembly files -->
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make_assembly_src</id>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/coresrc.xml</descriptor>
-                            </descriptors>
-                            <finalName>myfaces-extval12-${version}-src</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <outputDirectory>target/assembly/out</outputDirectory>
-                            <workDirectory>target/assembly/work</workDirectory>
-                        </configuration>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>make_assembly_bin</id>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>${basedir}/src/main/assembly/corebin.xml</descriptor>
-                            </descriptors>
-                            <finalName>myfaces-extval12-${version}-bin</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <outputDirectory>target/assembly/out</outputDirectory>
-                            <workDirectory>target/assembly/work</workDirectory>
-                        </configuration>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.validator</groupId>
-            <artifactId>myfaces-extval-core</artifactId>
-            <version>${core.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-            <artifactId>myfaces-extval-property-validation</artifactId>
-            <version>${property-validation.version}</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.persistence</groupId>
-                    <artifactId>persistence-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-            <artifactId>myfaces-extval-bean-validation</artifactId>
-            <version>${bean-validation.version}</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
-            <artifactId>myfaces-extval-trinidad-support</artifactId>
-            <version>${trinidad-support.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
-            <artifactId>myfaces-extval-generic-support</artifactId>
-            <version>${generic-support.version}</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>cglib</groupId>
-                    <artifactId>cglib</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
 
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <!-- EXECUTE mvn package to generate assembly files -->
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>make_assembly_bin</id>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>${basedir}/src/main/assembly/corebin.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.validator</groupId>
+                    <artifactId>myfaces-extval-core</artifactId>
+                    <version>${core.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+                    <artifactId>myfaces-extval-property-validation</artifactId>
+                    <version>${property-validation.version}</version>
+                    <scope>compile</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>javax.persistence</groupId>
+                            <artifactId>persistence-api</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+                    <artifactId>myfaces-extval-bean-validation</artifactId>
+                    <version>${bean-validation.version}</version>
+                    <scope>compile</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>javax.validation</groupId>
+                            <artifactId>validation-api</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
+                    <artifactId>myfaces-extval-trinidad-support</artifactId>
+                    <version>${trinidad-support.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
+                    <artifactId>myfaces-extval-generic-support</artifactId>
+                    <version>${generic-support.version}</version>
+                    <scope>compile</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+    
     <!-- Since extval could be async released, an generated assembly could contain different
          artifact versions -->
     <properties>

Modified: myfaces/extensions/validator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/pom.xml?rev=1038108&r1=1038107&r2=1038108&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/pom.xml (original)
+++ myfaces/extensions/validator/trunk/pom.xml Tue Nov 23 13:37:20 2010
@@ -62,6 +62,7 @@
         <module>core</module>
         <module>validation-modules</module>
         <module>component-support</module>
+        <module>assembly</module>
         <!--module>test-modules</module>
         <module>examples</module-->
     </modules>