You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/01/27 21:31:46 UTC
svn commit: r1727181 - in /myfaces/tobago/trunk: pom.xml
src/site/apt/release-checklist.apt tobago-example/pom.xml
tobago-theme/pom.xml tobago-tool/pom.xml
Author: lofwyr
Date: Wed Jan 27 20:31:46 2016
New Revision: 1727181
URL: http://svn.apache.org/viewvc?rev=1727181&view=rev
Log:
TOBAGO-1527: Clean up pom.xml dependencies and modules
- remove the all-modules profile
- simplify the release call, because now we use the default behaviour
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/src/site/apt/release-checklist.apt
myfaces/tobago/trunk/tobago-example/pom.xml
myfaces/tobago/trunk/tobago-theme/pom.xml
myfaces/tobago/trunk/tobago-tool/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1727181&r1=1727180&r2=1727181&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Jan 27 20:31:46 2016
@@ -979,13 +979,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3</version>
+ <version>2.3.2</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/myfaces/tobago/tags</tagBase>
<preparationGoals>clean install</preparationGoals>
<remoteTagging>true</remoteTagging>
<autoVersionSubmodules>true</autoVersionSubmodules>
<waitBeforeTagging>20</waitBeforeTagging>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <arguments>-Papache-release,generate-assembly ${arguments}</arguments>
</configuration>
</plugin>
<plugin>
@@ -1015,6 +1018,8 @@
<module>tobago-core</module>
<module>tobago-theme</module>
<module>tobago-extension</module>
+ <module>tobago-example</module>
+ <module>tobago-assembly</module>
</modules>
<distributionManagement>
@@ -1037,13 +1042,6 @@
<profiles>
<profile>
- <id>all-modules</id>
- <modules>
- <module>tobago-example</module>
- <module>tobago-assembly</module>
- </modules>
- </profile>
- <profile>
<id>apache-release</id>
<!--
NOTE: To use you need to enable this profile and pass in the passphrase:
@@ -1144,10 +1142,6 @@
</plugin>
</plugins>
</build>
- <modules>
- <module>tobago-extension</module>
- <module>tobago-example</module>
- </modules>
</profile>
<!--name of the runtime classes file-->
@@ -1175,11 +1169,6 @@
</profile>
<profile>
<id>generate-assembly</id>
- <modules>
- <module>tobago-extension</module>
- <module>tobago-example</module>
- <module>tobago-assembly</module>
- </modules>
<build>
<plugins>
<plugin>
Modified: myfaces/tobago/trunk/src/site/apt/release-checklist.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/release-checklist.apt?rev=1727181&r1=1727180&r2=1727181&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/release-checklist.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/release-checklist.apt Wed Jan 27 20:31:46 2016
@@ -49,11 +49,14 @@ mvn checkstyle:check rat:check -Pall-mod
# for Tobago 1.5.x and higher
mvn clean install -Pall-modules && mvn checkstyle:check apache-rat:check animal-sniffer:check -Pall-modules
+
+# for Tobago 2.0.9 and higher
+mvn clean install && mvn checkstyle:check apache-rat:check animal-sniffer:check
+------------------------+
* You need to add your GPG keys in {{{https://svn.apache.org/repos/asf/myfaces/keys/KEYS}Subversion}} and the {{{https://www.apache.org/dist/myfaces/KEYS}Apache site}} before a release.
-* Building the Release
+* Building the Release (Tobago 1.0.x to 2.0.8)
* Prepare the release with:
@@ -78,11 +81,20 @@ mvn install -Papache-release,jdk14retro,
# "deploy" with Java 1.7 and Maven 3 (hotfix: also comment out the maven-apt-plugin stuff)
mvn deploy -Papache-release,generate-assembly --no-plugin-updates -Dnon-default-modules
-# for Tobago 1.5.x and higher
+# for Tobago 1.5.x to 2.0.8
mvn deploy -Papache-release,generate-assembly --no-plugin-updates -Dnon-default-modules
+------------------------+
- For more information please consult the pom.xml files.
+* Building the Release (Tobago 2.0.9 and higher)
+
+ * Prepare and perform the release with:
+
++------------------------+
+mvn release:prepare
+mvn release:perform
++------------------------+
+
+* Staging repository
* <Close> the repository on the {{{https://repository.apache.org/}Nexus}} instance for stating (you will receive a mail with the staging location).
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1727181&r1=1727180&r2=1727181&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Wed Jan 27 20:31:46 2016
@@ -26,6 +26,19 @@
<name>Tobago Examples</name>
<artifactId>tobago-example</artifactId>
+ <modules>
+ <module>tobago-example-addressbook</module>
+ <module>tobago-example-addressbook-cdi</module>
+ <module>tobago-example-blank</module>
+ <module>tobago-example-data</module>
+ <module>tobago-example-demo</module>
+ <module>tobago-example-portlet</module>
+ <module>tobago-example-sandbox</module>
+ <module>tobago-example-security</module>
+ <module>tobago-example-test</module>
+ <module>tobago-example-assembly</module>
+ </modules>
+
<build>
<!-- NOTE The addressbook run only with mvn jetty:run-exploded.
For the other examples mvn jetty:run should work.
@@ -130,55 +143,6 @@
<profiles>
<profile>
- <id>default-modules</id>
- <activation>
- <property>
- <name>!non-default-modules</name>
- </property>
- </activation>
- <modules>
- <module>tobago-example-addressbook</module>
- <module>tobago-example-addressbook-cdi</module>
- <module>tobago-example-blank</module>
- <module>tobago-example-data</module>
- <module>tobago-example-demo</module>
- <module>tobago-example-test</module>
- </modules>
- </profile>
- <profile>
- <id>all-modules</id>
- <modules>
- <module>tobago-example-addressbook</module>
- <module>tobago-example-addressbook-cdi</module>
- <module>tobago-example-blank</module>
- <module>tobago-example-data</module>
- <module>tobago-example-demo</module>
- <module>tobago-example-portlet</module>
- <module>tobago-example-sandbox</module>
- <module>tobago-example-security</module>
- <module>tobago-example-test</module>
- <module>tobago-example-assembly</module>
- </modules>
- </profile>
- <profile>
- <id>apache-release</id>
- <modules>
- <module>tobago-example-blank</module>
- <module>tobago-example-data</module>
- <module>tobago-example-demo</module>
- </modules>
- </profile>
- <profile>
- <id>generate-assembly</id>
- <modules>
- <module>tobago-example-blank</module>
- <module>tobago-example-data</module>
- <module>tobago-example-demo</module>
- <module>tobago-example-assembly</module>
- </modules>
- </profile>
-
- <profile>
<id>jsf-provided</id>
<activation>
<property>
Modified: myfaces/tobago/trunk/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/pom.xml?rev=1727181&r1=1727180&r2=1727181&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Wed Jan 27 20:31:46 2016
@@ -49,17 +49,9 @@
<module>tobago-theme-richmond</module>
<module>tobago-theme-charlotteville</module>
<module>tobago-theme-example</module>
+ <module>tobago-theme-example</module>
</modules>
- <profiles>
- <profile>
- <id>modules-all</id>
- <modules>
- <module>tobago-theme-example</module>
- </modules>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
Modified: myfaces/tobago/trunk/tobago-tool/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/pom.xml?rev=1727181&r1=1727180&r2=1727181&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/pom.xml Wed Jan 27 20:31:46 2016
@@ -25,9 +25,11 @@
<packaging>pom</packaging>
<name>Tobago Tool</name>
<artifactId>tobago-tool</artifactId>
+
<modules>
<module>tobago-tool-apt</module>
<module>tobago-tool-annotation</module>
<module>tobago-theme-plugin</module>
</modules>
+
</project>