You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2011/01/20 10:11:36 UTC
svn commit: r1061168 - in /myfaces/trinidad/trunk: pom.xml
trinidad-examples/pom.xml
Author: matzew
Date: Thu Jan 20 09:11:36 2011
New Revision: 1061168
URL: http://svn.apache.org/viewvc?rev=1061168&view=rev
Log:
pom pollishing for next release
Modified:
myfaces/trinidad/trunk/pom.xml
myfaces/trinidad/trunk/trinidad-examples/pom.xml
Modified: myfaces/trinidad/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/pom.xml?rev=1061168&r1=1061167&r2=1061168&view=diff
==============================================================================
--- myfaces/trinidad/trunk/pom.xml (original)
+++ myfaces/trinidad/trunk/pom.xml Thu Jan 20 09:11:36 2011
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>6</version>
+ <version>9</version>
</parent>
<groupId>org.apache.myfaces.trinidad</groupId>
@@ -144,11 +144,11 @@
<repositories>
<!-- needed for Bean Validation API -->
- <repository>
+ <!--repository>
<id>apache.snapshots</id>
<name>Apache Snapshots</name>
<url>http://repository.apache.org/snapshots</url>
- </repository>
+ </repository-->
<repository>
<id>jboss</id>
<name>jboss nexus</name>
@@ -161,7 +161,7 @@
<url>http://download.java.net/maven/2/</url>
</repository>
<!-- apache snapshot repository should be disabled... -->
- <repository>
+ <!--repository>
<id>apache.snapshots.old</id>
<name>Apache Snapshot Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
@@ -172,7 +172,7 @@
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
- </repository>
+ </repository-->
</repositories>
<pluginRepositories>
@@ -673,74 +673,23 @@
-->
<!--
- This profile is for preparing a release. Execute this profile like this:
+ Add the assembly module when performing an apache-release
- mvn release:prepare -DprepareRelease=true
+ USAGE:
+ - mvn release:prepare -Papache-release
+ - mvn release:perform -Papache-release
+
+ NOTE that for the maven lifecycle invoked by the release plugin, -Papache-release will
+ be added automatically because of the config in apache-parent-7.
-->
<profile>
- <id>prepare-release</id>
+ <id>apache-release</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- </property>
- </activation>
-
<modules>
<module>trinidad-assembly</module>
</modules>
</profile>
- <!--
- This profile is for building the release artifacts for review. Execute this profile
- like this:
-
- mvn clean source:jar install deploy -DaltDeploymentRepository=matzew::default::file://FOLDER -DperformRelease=true
-
- Issuing this command will also perform the "sign-artifacts" profile from the master pom.
- -->
- <profile>
- <id>release</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>org.apache.myfaces.trinidadinternal.*</excludePackageNames>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <id>getting-scm.revision</id>
- <goals>
- <goal>update</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<!--
This profile enables asserts in the surefire tests. Do not use this with Maven 2.0.6 or
you will get an error. Execute this profile like this:
Modified: myfaces/trinidad/trunk/trinidad-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/pom.xml?rev=1061168&r1=1061167&r2=1061168&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/pom.xml Thu Jan 20 09:11:36 2011
@@ -87,15 +87,11 @@
<!--
This profile is for preparing a release. Execute this profile like this:
- mvn release:prepare -DprepareRelease=true
+ mvn release:prepare -Papache-releae
-->
<profile>
- <id>prepare-release</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- </property>
- </activation>
+ <id>apache-release</id>
+
<modules>
<module>trinidad-example-assembly</module>
</modules>