You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/11/23 19:57:49 UTC
svn commit: r1038277 - in /myfaces/extensions/validator/trunk:
assembly/pom.xml pom.xml
Author: jakobk
Date: Tue Nov 23 18:57:49 2010
New Revision: 1038277
URL: http://svn.apache.org/viewvc?rev=1038277&view=rev
Log:
refactor poms for new release procedure
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=1038277&r1=1038276&r2=1038277&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/assembly/pom.xml (original)
+++ myfaces/extensions/validator/trunk/assembly/pom.xml Tue Nov 23 18:57:49 2010
@@ -13,96 +13,83 @@
<version>1.2.4-SNAPSHOT</version>
</parent>
- <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>
+ <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>
- <!-- Since extval could be async released, an generated assembly could contain different
- artifact versions -->
- <properties>
- <core.version>1.2.4-SNAPSHOT</core.version>
- <trinidad-support.version>1.2.4-SNAPSHOT</trinidad-support.version>
- <generic-support.version>1.2.4-SNAPSHOT</generic-support.version>
- <property-validation.version>1.2.4-SNAPSHOT</property-validation.version>
- <bean-validation.version>1.2.4-SNAPSHOT</bean-validation.version>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.validator</groupId>
+ <artifactId>myfaces-extval-core</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+ <artifactId>myfaces-extval-property-validation</artifactId>
+ <version>${project.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>${project.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>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
+ <artifactId>myfaces-extval-generic-support</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
</project>
Modified: myfaces/extensions/validator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/pom.xml?rev=1038277&r1=1038276&r2=1038277&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/pom.xml (original)
+++ myfaces/extensions/validator/trunk/pom.xml Tue Nov 23 18:57:49 2010
@@ -193,65 +193,14 @@
</plugins>
</build>
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- </repositories>
-
<profiles>
- <!-- This profile is invoked by -DprepareRelease=true. This allows mvn release:prepare to
- run successfully on the assembly projects. -->
+ <!-- Add the assembly module when performing an apache-release -->
<profile>
- <id>prepare-release</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- </property>
- </activation>
+ <id>apache-release</id>
+
<modules>
<module>assembly</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <arguments>-DprepareRelease</arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- TODO jakobk -->
- <profile>
- <id>generate-assembly</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
</profiles>
@@ -259,7 +208,6 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
@@ -309,6 +257,15 @@
</plugins>
</reporting>
+ <repositories>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+
<properties>
<jsf.version>1.2.4</jsf.version>
</properties>