summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Greig <rgreig@apache.org>2007-01-22 11:48:29 +0000
committerRobert Greig <rgreig@apache.org>2007-01-22 11:48:29 +0000
commit17d75aeca80e1721a7fac5787d1f2dcd51c84f6e (patch)
treed4335b21e4d4c4e999ab45496dffdabfb9a150f8
parent0420b0021e02254d161f027529b80991060d3cc8 (diff)
downloadqpid-python-17d75aeca80e1721a7fac5787d1f2dcd51c84f6e.tar.gz
(Patch submitted by Rupert Smith) Fix broken distribution by rolling back assembly plugin to version 2.1. 2.2-SNAPSHOT is used in the perftests pom only.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@498589 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/perftests/pom.xml2
-rw-r--r--qpid/java/pom.xml3
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml
index a37e3f0946..1799b30790 100644
--- a/qpid/java/perftests/pom.xml
+++ b/qpid/java/perftests/pom.xml
@@ -146,7 +146,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <!--<version>2.2-SNAPSHOT</version>-->
+ <version>2.2-SNAPSHOT</version>
<configuration>
<descriptors>
<descriptor>jar-with-dependencies.xml</descriptor>
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml
index 380b0b8cd1..d8b8d52b8f 100644
--- a/qpid/java/pom.xml
+++ b/qpid/java/pom.xml
@@ -99,7 +99,8 @@
<!--Versions for various plugins and features -->
<antrun.version>1.2-SNAPSHOT</antrun.version>
- <assembly.version>2.2-SNAPSHOT</assembly.version>
+ <!--<assembly.version>2.2-SNAPSHOT</assembly.version>-->
+ <assembly.version>2.1</assembly.version>
<cobertura.version>2.0</cobertura.version>
<compiler.version>2.0.1</compiler.version>
<dependency.plugin.version>1.0</dependency.plugin.version>