Author: chirino
Date: Fri Apr 11 10:04:13 2008
New Revision: 647224
URL: http://svn.apache.org/viewvc?rev=647224&view=rev
Log:
Merged in djencks release changes from 4.1 branch
Modified:
activemq/trunk/assembly/pom.xml
activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
Modified: activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=647224&r1=647223&r2=647224&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Fri Apr 11 10:04:13 2008
@@ -355,35 +355,35 @@
<id>unix-bin</id>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>attached</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/descriptors/unix-bin.xml</descriptor>
</descriptors>
- <finalName>${pom.artifactId}-${pom.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+ <!--<finalName>${pom.artifactId}-${pom.version}</finalName>-->
+ <!--<appendAssemblyId>false</appendAssemblyId>-->
</configuration>
</execution>
<execution>
<id>windows-bin</id>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>attached</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/descriptors/windows-bin.xml</descriptor>
</descriptors>
- <finalName>${pom.artifactId}-${pom.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+ <!--<finalName>${pom.artifactId}-${pom.version}</finalName>-->
+ <!--<appendAssemblyId>false</appendAssemblyId>-->
</configuration>
</execution>
<execution>
<id>unix-src</id>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>attached</goal>
</goals>
<configuration>
<descriptors>
@@ -395,7 +395,7 @@
<id>windows-src</id>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>attached</goal>
</goals>
<configuration>
<descriptors>
Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=647224&r1=647223&r2=647224&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Apr 11
10:04:13 2008
@@ -16,7 +16,7 @@
limitations under the License.
-->
<assembly>
- <id>unix-bin</id>
+ <id>bin</id>
<formats>
<format>tar.gz</format>
</formats>
Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=647224&r1=647223&r2=647224&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Apr 11
10:04:13 2008
@@ -16,7 +16,7 @@
limitations under the License.
-->
<assembly>
- <id>windows-bin</id>
+ <id>bin</id>
<formats>
<format>zip</format>
</formats>
