You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2010/06/12 12:30:48 UTC
svn commit: r953981 - in /webservices/commons/trunk/modules/axiom: pom.xml
src/main/assembly/bin.xml
Author: veithen
Date: Sat Jun 12 10:30:48 2010
New Revision: 953981
URL: http://svn.apache.org/viewvc?rev=953981&view=rev
Log:
Bind the assembly plugin properly to the lifecycle. Don't attach the all-in-one JAR; it is included in the binary distribution, but is not intended to be a Maven artifact.
Modified:
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=953981&r1=953980&r2=953981&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Sat Jun 12 10:30:48 2010
@@ -391,18 +391,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/jar.xml</descriptor>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
</plugin>
@@ -553,6 +541,41 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <id>all-in-one-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/jar.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ <finalName>axiom</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<pluginRepositories>
Modified: webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml?rev=953981&r1=953980&r2=953981&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml Sat Jun 12 10:30:48 2010
@@ -60,7 +60,7 @@
<fileMode>0644</fileMode>
</file>
<file>
- <source>${project.build.directory}/axiom-${project.version}-jar.jar</source>
+ <source>${project.build.directory}/axiom.jar</source>
<outputDirectory>/</outputDirectory>
<destName>axiom.jar</destName>
</file>