[maven-release-plugin] copy for tag mercury-1.0.0-alpha-4
git-svn-id: https://svn.apache.org/repos/asf/maven/mercury/tags/mercury-1.0.0-alpha-4@739362 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/mercury-ant-tasks/pom.xml b/mercury-ant-tasks/pom.xml
index 65cc926..a7c97fc 100644
--- a/mercury-ant-tasks/pom.xml
+++ b/mercury-ant-tasks/pom.xml
@@ -27,7 +27,6 @@
<version>1.0.0-alpha-4-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-ant-tasks</artifactId>
<name>Mercury Ant Tasks</name>
<description>Maven Mercury Ant tasks code</description>
@@ -37,7 +36,18 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcpg-jdk15</artifactId>
+ <optional>true</optional>
</dependency>
<!-- Mercury deps -->
@@ -76,20 +86,40 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-sat</artifactId>
</dependency>
-
- <!-- Maven dependencies -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <classifier>assembly</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-sslengine</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util5</artifactId>
+ </dependency>
+
+ <!-- Maven dependencies -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>${maven.version}</version>
</dependency>
-
+
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-http</artifactId>
@@ -100,9 +130,16 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId>
- <version>1.7.1</version>
+ <version>${ant.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -120,9 +157,11 @@
<goal>shade</goal>
</goals>
<configuration>
- <finalName>${project.artifactId}-${project.version}-all</finalName>
+
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- <createDependencyReducedPom>true</createDependencyReducedPom>
+ <shadedArtifactAttached>false</shadedArtifactAttached>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+
<artifactSet>
<excludes>
<exclude>ant:ant</exclude>
diff --git a/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml b/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml
index b884112..2da8d3e 100644
--- a/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml
+++ b/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml
@@ -22,8 +22,11 @@
<!-- good old syntax -->
<taskdef name="dependencies" classname="org.apache.maven.mercury.ant.tasks.ResolveTask"/>
+ <taskdef name="resolve-dependencies" classname="org.apache.maven.mercury.ant.tasks.ResolveTask"/>
<typedef name="localRepository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
+ <typedef name="local-repository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
<typedef name="remoteRepository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
+ <typedef name="remote-repository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
</antlib>
diff --git a/mercury-artifact/pom.xml b/mercury-artifact/pom.xml
index 285439d..81d2b56 100644
--- a/mercury-artifact/pom.xml
+++ b/mercury-artifact/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-artifact</artifactId>
diff --git a/mercury-crypto/mercury-crypto-api/pom.xml b/mercury-crypto/mercury-crypto-api/pom.xml
index efd3afb..9566c9f 100644
--- a/mercury-crypto/mercury-crypto-api/pom.xml
+++ b/mercury-crypto/mercury-crypto-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-crypto-api</artifactId>
diff --git a/mercury-crypto/mercury-crypto-basic/pom.xml b/mercury-crypto/mercury-crypto-basic/pom.xml
index 7e62d52..734e1ed 100644
--- a/mercury-crypto/mercury-crypto-basic/pom.xml
+++ b/mercury-crypto/mercury-crypto-basic/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-crypto-basic</artifactId>
diff --git a/mercury-crypto/pom.xml b/mercury-crypto/pom.xml
index e17448a..4cfb3dc 100644
--- a/mercury-crypto/pom.xml
+++ b/mercury-crypto/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-crypto</artifactId>
diff --git a/mercury-event/pom.xml b/mercury-event/pom.xml
index 37a8e32..d0734de 100644
--- a/mercury-event/pom.xml
+++ b/mercury-event/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-event</artifactId>
diff --git a/mercury-external/pom.xml b/mercury-external/pom.xml
index f8d238b..cd80d25 100644
--- a/mercury-external/pom.xml
+++ b/mercury-external/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<groupId>org.apache.maven.mercury</groupId>
diff --git a/mercury-it/pom.xml b/mercury-it/pom.xml
index fb01c92..09c7dfe 100644
--- a/mercury-it/pom.xml
+++ b/mercury-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-it</artifactId>
diff --git a/mercury-logging/pom.xml b/mercury-logging/pom.xml
index 8c2ebcf..44b3719 100644
--- a/mercury-logging/pom.xml
+++ b/mercury-logging/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-logging</artifactId>
diff --git a/mercury-md/mercury-md-sat/pom.xml b/mercury-md/mercury-md-sat/pom.xml
index cd5d582..a5bdfab 100644
--- a/mercury-md/mercury-md-sat/pom.xml
+++ b/mercury-md/mercury-md-sat/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-md-sat</artifactId>
diff --git a/mercury-md/mercury-md-shared/pom.xml b/mercury-md/mercury-md-shared/pom.xml
index 9a58b67..32ae906 100644
--- a/mercury-md/mercury-md-shared/pom.xml
+++ b/mercury-md/mercury-md-shared/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<groupId>org.apache.maven.mercury</groupId>
diff --git a/mercury-md/pom.xml b/mercury-md/pom.xml
index 4f0ec85..ee71909 100644
--- a/mercury-md/pom.xml
+++ b/mercury-md/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-md</artifactId>
diff --git a/mercury-plexus/pom.xml b/mercury-plexus/pom.xml
index efbf62c..eb679be 100644
--- a/mercury-plexus/pom.xml
+++ b/mercury-plexus/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-plexus</artifactId>
diff --git a/mercury-repo/mercury-repo-api/pom.xml b/mercury-repo/mercury-repo-api/pom.xml
index d9f56cc..7aac72e 100644
--- a/mercury-repo/mercury-repo-api/pom.xml
+++ b/mercury-repo/mercury-repo-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<groupId>org.apache.maven.mercury</groupId>
diff --git a/mercury-repo/mercury-repo-cache-fs/pom.xml b/mercury-repo/mercury-repo-cache-fs/pom.xml
index dbc0152..dd7a3aa 100644
--- a/mercury-repo/mercury-repo-cache-fs/pom.xml
+++ b/mercury-repo/mercury-repo-cache-fs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<groupId>org.apache.maven.mercury</groupId>
diff --git a/mercury-repo/mercury-repo-local-flat/pom.xml b/mercury-repo/mercury-repo-local-flat/pom.xml
index 255add0..7bf61c3 100644
--- a/mercury-repo/mercury-repo-local-flat/pom.xml
+++ b/mercury-repo/mercury-repo-local-flat/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<groupId>org.apache.maven.mercury</groupId>
diff --git a/mercury-repo/mercury-repo-local-m2/pom.xml b/mercury-repo/mercury-repo-local-m2/pom.xml
index e552c9c..055dd2a 100644
--- a/mercury-repo/mercury-repo-local-m2/pom.xml
+++ b/mercury-repo/mercury-repo-local-m2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-repo-local-m2</artifactId>
diff --git a/mercury-repo/mercury-repo-local-map/pom.xml b/mercury-repo/mercury-repo-local-map/pom.xml
index 82b62e1..5699a7b 100644
--- a/mercury-repo/mercury-repo-local-map/pom.xml
+++ b/mercury-repo/mercury-repo-local-map/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-repo-local-map</artifactId>
diff --git a/mercury-repo/mercury-repo-remote-m2/pom.xml b/mercury-repo/mercury-repo-remote-m2/pom.xml
index c1a0f89..a4e2e56 100644
--- a/mercury-repo/mercury-repo-remote-m2/pom.xml
+++ b/mercury-repo/mercury-repo-remote-m2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-repo-remote-m2</artifactId>
diff --git a/mercury-repo/mercury-repo-virtual/pom.xml b/mercury-repo/mercury-repo-virtual/pom.xml
index e883a32..06e9faf 100644
--- a/mercury-repo/mercury-repo-virtual/pom.xml
+++ b/mercury-repo/mercury-repo-virtual/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-repo-virtual</artifactId>
diff --git a/mercury-repo/pom.xml b/mercury-repo/pom.xml
index 4723896..2162b79 100644
--- a/mercury-repo/pom.xml
+++ b/mercury-repo/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-repo</artifactId>
diff --git a/mercury-transport/mercury-transport-api/pom.xml b/mercury-transport/mercury-transport-api/pom.xml
index a1a37a4..4ef19b8 100644
--- a/mercury-transport/mercury-transport-api/pom.xml
+++ b/mercury-transport/mercury-transport-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-transport-api</artifactId>
diff --git a/mercury-transport/mercury-transport-file/pom.xml b/mercury-transport/mercury-transport-file/pom.xml
index 2f8ed44..7974635 100644
--- a/mercury-transport/mercury-transport-file/pom.xml
+++ b/mercury-transport/mercury-transport-file/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-transport-file</artifactId>
diff --git a/mercury-transport/mercury-transport-http/pom.xml b/mercury-transport/mercury-transport-http/pom.xml
index 9a144cc..8c53153 100644
--- a/mercury-transport/mercury-transport-http/pom.xml
+++ b/mercury-transport/mercury-transport-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-transport-http</artifactId>
diff --git a/mercury-transport/pom.xml b/mercury-transport/pom.xml
index 7f5208b..3e3ac40 100644
--- a/mercury-transport/pom.xml
+++ b/mercury-transport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-transport</artifactId>
diff --git a/mercury-util/pom.xml b/mercury-util/pom.xml
index b88889a..e60df1f 100644
--- a/mercury-util/pom.xml
+++ b/mercury-util/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-util</artifactId>
diff --git a/mercury-wagon/pom.xml b/mercury-wagon/pom.xml
index d2c81ab..7a32e0b 100644
--- a/mercury-wagon/pom.xml
+++ b/mercury-wagon/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
</parent>
<artifactId>mercury-wagon</artifactId>
diff --git a/pom.xml b/pom.xml
index c4a9a37..a2e7fbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-4-SNAPSHOT</version>
+ <version>1.0.0-alpha-4</version>
<packaging>pom</packaging>
<name>Mercury</name>
@@ -89,6 +89,10 @@
<bouncy.castle.version>140</bouncy.castle.version>
<sat4j.version>2.0.4</sat4j.version>
+ <ant.version>1.7.1</ant.version>
+
+ <!-- maven version: non-modules only !! Never use in Mercury modules!! -->
+ <maven.version>3.0-SNAPSHOT</maven.version>
<!-- mercury-wagon -->
<wagon.provider.api.version>1.0-beta-4</wagon.provider.api.version>
@@ -104,9 +108,9 @@
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/mercury/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/mercury/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/mercury/trunk/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/mercury/tags/mercury-1.0.0-alpha-4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/mercury/tags/mercury-1.0.0-alpha-4</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/mercury/tags/mercury-1.0.0-alpha-4</url>
</scm>
<issueManagement>
<system>jira</system>
@@ -156,6 +160,13 @@
<version>${bouncy.castle.version}</version>
</dependency>
+ <!-- Mercury ant-tasks dependency -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+
<!-- SAT solver used to calculate viable ranges when dependencies are expressed pseudo boolean form -->
<dependency>
<groupId>org.sat4j</groupId>
