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 2012/04/17 06:11:48 UTC
svn commit: r1326908 - in /myfaces/orchestra/trunk: core/pom.xml
core12/pom.xml core20/pom.xml
Author: lu4242
Date: Tue Apr 17 04:11:48 2012
New Revision: 1326908
URL: http://svn.apache.org/viewvc?rev=1326908&view=rev
Log:
synch pom files and fix some site bugs
Modified:
myfaces/orchestra/trunk/core/pom.xml
myfaces/orchestra/trunk/core12/pom.xml
myfaces/orchestra/trunk/core20/pom.xml
Modified: myfaces/orchestra/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/pom.xml?rev=1326908&r1=1326907&r2=1326908&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/pom.xml (original)
+++ myfaces/orchestra/trunk/core/pom.xml Tue Apr 17 04:11:48 2012
@@ -161,7 +161,6 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
<executions>
<execution>
<!-- unpack the shared sources into target/shared_sources-->
@@ -190,11 +189,10 @@
so also the shared sources are automatically included by the attach source plugin -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<id>add-source</id>
- <phase>process-sources</phase>
+ <phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
Modified: myfaces/orchestra/trunk/core12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core12/pom.xml?rev=1326908&r1=1326907&r2=1326908&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core12/pom.xml (original)
+++ myfaces/orchestra/trunk/core12/pom.xml Tue Apr 17 04:11:48 2012
@@ -148,6 +148,17 @@
</resources>
<plugins>
<plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -403,10 +414,42 @@
</reporting>
</profile>
<profile>
+ <id>perform-release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-Papache-release -DperformRelease -Pgenerate-assembly</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>generate-assembly</id>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make_site_assembly</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
@@ -416,6 +459,41 @@
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
+ <executions>
+ <execution>
+ <id>make_assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </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/${project.artifactId}-${project.version}.zip</file>
+ <type>zip</type>
+ </artifact>
+ <artifact>
+ <file>target/${project.artifactId}-${project.version}.tar.gz</file>
+ <type>tar.gz</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -486,4 +564,4 @@
<maven.compile.target>1.5</maven.compile.target>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/orchestra/trunk/core20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core20/pom.xml?rev=1326908&r1=1326907&r2=1326908&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core20/pom.xml (original)
+++ myfaces/orchestra/trunk/core20/pom.xml Tue Apr 17 04:11:48 2012
@@ -15,9 +15,9 @@
<version>1.5-SNAPSHOT</version>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/orchestra/trunk/core12</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/orchestra/trunk/core12</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/orchestra/trunk/core12</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/orchestra/trunk/core20</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/orchestra/trunk/core20</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/orchestra/trunk/core20</url>
</scm>
<dependencies>
@@ -137,6 +137,17 @@
</resources>
<plugins>
<plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -392,10 +403,42 @@
</reporting>
</profile>
<profile>
+ <id>perform-release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-Papache-release -DperformRelease -Pgenerate-assembly</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>generate-assembly</id>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make_site_assembly</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
@@ -405,6 +448,41 @@
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
+ <executions>
+ <execution>
+ <id>make_assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </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/${project.artifactId}-${project.version}.zip</file>
+ <type>zip</type>
+ </artifact>
+ <artifact>
+ <file>target/${project.artifactId}-${project.version}.tar.gz</file>
+ <type>tar.gz</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -475,4 +553,4 @@
<maven.compile.target>1.5</maven.compile.target>
</properties>
-</project>
\ No newline at end of file
+</project>