You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2016/04/28 02:56:10 UTC
svn commit: r1741369 - in /myfaces/trinidad/trunk: pom.xml
trinidad-assembly/pom.xml trinidad-examples/pom.xml
trinidad-examples/trinidad-example-assembly/pom.xml
Author: lu4242
Date: Thu Apr 28 00:56:10 2016
New Revision: 1741369
URL: http://svn.apache.org/viewvc?rev=1741369&view=rev
Log:
try fix assembly generation on release
Modified:
myfaces/trinidad/trunk/pom.xml
myfaces/trinidad/trunk/trinidad-assembly/pom.xml
myfaces/trinidad/trunk/trinidad-examples/pom.xml
myfaces/trinidad/trunk/trinidad-examples/trinidad-example-assembly/pom.xml
Modified: myfaces/trinidad/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/pom.xml?rev=1741369&r1=1741368&r2=1741369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/pom.xml (original)
+++ myfaces/trinidad/trunk/pom.xml Thu Apr 28 00:56:10 2016
@@ -770,6 +770,7 @@ Create A Branch (http://maven.apache.org
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>apache-release</id>
@@ -793,6 +794,51 @@ Create A Branch (http://maven.apache.org
</plugins>
</build>
</profile>
+ -->
+
+ <profile>
+ <id>prepare-release</id>
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+ <modules>
+ <module>trinidad-assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-DprepareRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>perform-release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <modules>
+ <module>trinidad-assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-Papache-release -DperformRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>enableRat</id>
Modified: myfaces/trinidad/trunk/trinidad-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-assembly/pom.xml?rev=1741369&r1=1741368&r2=1741369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-assembly/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-assembly/pom.xml Thu Apr 28 00:56:10 2016
@@ -94,7 +94,6 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<id>make_assembly_trinidad</id>
@@ -102,8 +101,11 @@
<descriptors>
<descriptor>src/main/assembly/dep.xml</descriptor>
</descriptors>
- <appendAssemblyId>true</appendAssemblyId> <!-- adds "-bin" and "-src" -->
+ <finalName>trinidad-assembly-${project.version}-dist</finalName>
+ <appendAssemblyId>false</appendAssemblyId> <!-- adds "-bin" and "-src" -->
<tarLongFileMode>gnu</tarLongFileMode>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
</configuration>
<phase>package</phase>
<goals>
@@ -112,6 +114,35 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/assembly/out/trinidad-assembly-${project.version}-dist.zip</file>
+ <type>zip</type>
+ <classifier>dist</classifier>
+ </artifact>
+ <artifact>
+ <file>target/assembly/out/trinidad-assembly-${project.version}-dist.tar.gz</file>
+ <type>tar.gz</type>
+ <classifier>dist</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: myfaces/trinidad/trunk/trinidad-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/pom.xml?rev=1741369&r1=1741368&r2=1741369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/pom.xml Thu Apr 28 00:56:10 2016
@@ -121,12 +121,58 @@
NOTE: the apache-release profile is invoked on any execution of the maven-release-plugin
as per the apache-10 common ancestor file.
-->
+ <!--
<profile>
<id>apache-release</id>
<modules>
<module>trinidad-example-assembly</module>
</modules>
</profile>
+ -->
+ <profile>
+ <id>prepare-release</id>
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+ <modules>
+ <module>trinidad-example-assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-DprepareRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>perform-release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <modules>
+ <module>trinidad-example-assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-Papache-release -DperformRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!--
This profile activates MyFaces as the release to use for these demos. By default
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-example-assembly/pom.xml?rev=1741369&r1=1741368&r2=1741369&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-example-assembly/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-example-assembly/pom.xml Thu Apr 28 00:56:10 2016
@@ -111,6 +111,35 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/trinidad-example-assembly-${project.version}-example.zip</file>
+ <type>zip</type>
+ <classifier>example</classifier>
+ </artifact>
+ <artifact>
+ <file>target/trinidad-example-assembly-${project.version}-example.tar.gz</file>
+ <type>tar.gz</type>
+ <classifier>example</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>