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 2008/04/22 23:10:50 UTC
svn commit: r650656 - in /myfaces/core/trunk_1.2.x/assembly: pom.xml
src/main/assembly/corebin.xml src/main/assembly/coresrc.xml
src/main/assembly/dep.xml
Author: lu4242
Date: Tue Apr 22 14:10:48 2008
New Revision: 650656
URL: http://svn.apache.org/viewvc?rev=650656&view=rev
Log:
MYFACES-1869 mvn assembly:assembly does not generate src zip or tag.gz properly
Added:
myfaces/core/trunk_1.2.x/assembly/src/main/assembly/corebin.xml
myfaces/core/trunk_1.2.x/assembly/src/main/assembly/coresrc.xml
Removed:
myfaces/core/trunk_1.2.x/assembly/src/main/assembly/dep.xml
Modified:
myfaces/core/trunk_1.2.x/assembly/pom.xml
Modified: myfaces/core/trunk_1.2.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/assembly/pom.xml?rev=650656&r1=650655&r2=650656&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/assembly/pom.xml (original)
+++ myfaces/core/trunk_1.2.x/assembly/pom.xml Tue Apr 22 14:10:48 2008
@@ -89,14 +89,18 @@
</goals>
<configuration>
<artifactItems>
-
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${version}</version>
<classifier>sources</classifier>
</artifactItem>
-
</artifactItems>
<outputDirectory>${project.build.directory}/src</outputDirectory>
</configuration>
@@ -105,20 +109,48 @@
</plugin>
<plugin>
+ <!-- EXECUTE mvn package to generate assembly files -->
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0-beta-1</version>
- <configuration>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- <finalName>myfaces-core-${version}</finalName>
- <outputDirectory>target/assembly/out</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
+ <executions>
+ <execution>
+ <id>make_assembly_src</id>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/coresrc.xml</descriptor>
+ </descriptors>
+ <finalName>myfaces-core-${version}-src</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>make_assembly_bin</id>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/corebin.xml</descriptor>
+ </descriptors>
+ <finalName>myfaces-core-${version}-bin</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>wagon-maven-plugin</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.6</version>
<configuration>
<id>myfaces-nightly-builds</id>
<url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/nightly</url>
@@ -143,7 +175,6 @@
<artifactId>myfaces-api</artifactId>
<version>${version}</version>
</dependency>
-
</dependencies>
Added: myfaces/core/trunk_1.2.x/assembly/src/main/assembly/corebin.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/assembly/src/main/assembly/corebin.xml?rev=650656&view=auto
==============================================================================
--- myfaces/core/trunk_1.2.x/assembly/src/main/assembly/corebin.xml (added)
+++ myfaces/core/trunk_1.2.x/assembly/src/main/assembly/corebin.xml Tue Apr 22 14:10:48 2008
@@ -0,0 +1,39 @@
+<assembly>
+ <id>corebin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>RELEASE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/javadoc</directory>
+ <outputDirectory>javadoc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/tlddoc</directory>
+ <outputDirectory>tlddoc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: myfaces/core/trunk_1.2.x/assembly/src/main/assembly/coresrc.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/assembly/src/main/assembly/coresrc.xml?rev=650656&view=auto
==============================================================================
--- myfaces/core/trunk_1.2.x/assembly/src/main/assembly/coresrc.xml (added)
+++ myfaces/core/trunk_1.2.x/assembly/src/main/assembly/coresrc.xml Tue Apr 22 14:10:48 2008
@@ -0,0 +1,27 @@
+<assembly>
+ <id>coresrc</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>RELEASE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/src</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
+