You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2015/03/05 15:49:47 UTC
[1/4] activemq-6 git commit: Revert "[maven-release-plugin] prepare
for next development iteration"
Repository: activemq-6
Updated Branches:
refs/heads/master ba3d185ac -> 84504ba57
Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit ba3d185ac7747f05c73ffe3df21ecdf4f8641f03.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/a708c913
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/a708c913
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/a708c913
Branch: refs/heads/master
Commit: a708c9139abd9ff7c8eb14492f42411e59f425ab
Parents: ba3d185
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Mar 5 14:40:41 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Mar 5 14:40:41 2015 +0000
----------------------------------------------------------------------
activemq-bootstrap/pom.xml | 2 +-
activemq-commons/pom.xml | 2 +-
activemq-core-client/pom.xml | 2 +-
activemq-dto/pom.xml | 2 +-
activemq-jms-client/pom.xml | 2 +-
activemq-jms-server/pom.xml | 2 +-
activemq-journal/pom.xml | 2 +-
activemq-maven-plugin/pom.xml | 2 +-
activemq-native/pom.xml | 2 +-
activemq-protocols/activemq-amqp-protocol/pom.xml | 2 +-
activemq-protocols/activemq-openwire-protocol/pom.xml | 2 +-
activemq-protocols/activemq-proton-plug/pom.xml | 2 +-
activemq-protocols/activemq-stomp-protocol/pom.xml | 2 +-
activemq-protocols/pom.xml | 2 +-
activemq-ra/pom.xml | 2 +-
activemq-rest/pom.xml | 2 +-
activemq-selector/pom.xml | 2 +-
activemq-server/pom.xml | 2 +-
activemq-service-extensions/pom.xml | 2 +-
activemq-tools/pom.xml | 2 +-
activemq-web/pom.xml | 2 +-
activemq-website/pom.xml | 2 +-
distribution/activemq/pom.xml | 4 ++--
distribution/pom.xml | 2 +-
examples/core/pom.xml | 2 +-
examples/jms/activemq-jms-examples-common/pom.xml | 2 +-
examples/jms/pom.xml | 2 +-
examples/pom.xml | 2 +-
integration/activemq-aerogear-integration/pom.xml | 2 +-
integration/activemq-spring-integration/pom.xml | 2 +-
integration/activemq-vertx-integration/pom.xml | 2 +-
pom.xml | 4 ++--
32 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-bootstrap/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/pom.xml b/activemq-bootstrap/pom.xml
index 21ceb88..7abb3a6 100644
--- a/activemq-bootstrap/pom.xml
+++ b/activemq-bootstrap/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-bootstrap</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-commons/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml
index 2d1d754..b8f3725 100644
--- a/activemq-commons/pom.xml
+++ b/activemq-commons/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-commons</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml
index 3c200a2..3eb31d5 100644
--- a/activemq-core-client/pom.xml
+++ b/activemq-core-client/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-core-client</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-dto/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-dto/pom.xml b/activemq-dto/pom.xml
index 12a1d48..93313e9 100644
--- a/activemq-dto/pom.xml
+++ b/activemq-dto/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-dto</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-jms-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml
index 0720fb4..d7940bb 100644
--- a/activemq-jms-client/pom.xml
+++ b/activemq-jms-client/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-jms-client</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-jms-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml
index d47ecdd..1d73d48 100644
--- a/activemq-jms-server/pom.xml
+++ b/activemq-jms-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-jms-server</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-journal/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-journal/pom.xml b/activemq-journal/pom.xml
index 3a48c9f..377a324 100644
--- a/activemq-journal/pom.xml
+++ b/activemq-journal/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-journal</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/pom.xml b/activemq-maven-plugin/pom.xml
index 384f6eb..f06d920 100644
--- a/activemq-maven-plugin/pom.xml
+++ b/activemq-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-native/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-native/pom.xml b/activemq-native/pom.xml
index 55fdc7d..e097b96 100644
--- a/activemq-native/pom.xml
+++ b/activemq-native/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-native</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-protocols/activemq-amqp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml
index 6f6d68b..5fbeae4 100644
--- a/activemq-protocols/activemq-amqp-protocol/pom.xml
+++ b/activemq-protocols/activemq-amqp-protocol/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>activemq-protocols</artifactId>
<groupId>org.apache.activemq</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-protocols/activemq-openwire-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/activemq-protocols/activemq-openwire-protocol/pom.xml
index f51a7b7..8c1cc0b 100644
--- a/activemq-protocols/activemq-openwire-protocol/pom.xml
+++ b/activemq-protocols/activemq-openwire-protocol/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>activemq-protocols</artifactId>
<groupId>org.apache.activemq</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-protocols/activemq-proton-plug/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml
index e241126..65dd5a0 100644
--- a/activemq-protocols/activemq-proton-plug/pom.xml
+++ b/activemq-protocols/activemq-proton-plug/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>activemq-protocols</artifactId>
<groupId>org.apache.activemq</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-protocols/activemq-stomp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-stomp-protocol/pom.xml b/activemq-protocols/activemq-stomp-protocol/pom.xml
index 2ee12a4..5dbd0fc 100644
--- a/activemq-protocols/activemq-stomp-protocol/pom.xml
+++ b/activemq-protocols/activemq-stomp-protocol/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>activemq-protocols</artifactId>
<groupId>org.apache.activemq</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-protocols/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/pom.xml b/activemq-protocols/pom.xml
index ab0d927..fd225cc 100644
--- a/activemq-protocols/pom.xml
+++ b/activemq-protocols/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>activemq-pom</artifactId>
<groupId>org.apache.activemq</groupId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-ra/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index b3ac13b..17fea9a 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-ra</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-rest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index e567267..882e995 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<name>ActiveMQ6 REST Interface Implementation</name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-selector/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-selector/pom.xml b/activemq-selector/pom.xml
index ed00644..f840716 100644
--- a/activemq-selector/pom.xml
+++ b/activemq-selector/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-selector</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-server/pom.xml b/activemq-server/pom.xml
index a6c6c71..5dc4313 100644
--- a/activemq-server/pom.xml
+++ b/activemq-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-server</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-service-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/pom.xml b/activemq-service-extensions/pom.xml
index 8fd86d0..c06af2a 100644
--- a/activemq-service-extensions/pom.xml
+++ b/activemq-service-extensions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-service-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-tools/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-tools/pom.xml b/activemq-tools/pom.xml
index 11bfd13..3b685cf 100644
--- a/activemq-tools/pom.xml
+++ b/activemq-tools/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-web/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 9b99cf9..a94e825 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-web</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/activemq-website/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-website/pom.xml b/activemq-website/pom.xml
index d2e042f..7e2a3e3 100644
--- a/activemq-website/pom.xml
+++ b/activemq-website/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-website</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/distribution/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index b83860d..d629806 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-distribution</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>apache-activemq</artifactId>
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-website</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
<classifier>javadoc</classifier>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 95c6904..7d967b0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-distribution</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/examples/core/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 024fd70..0146f93 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples</groupId>
<artifactId>activemq-examples</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<groupId>org.apache.activemq.examples.core</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/examples/jms/activemq-jms-examples-common/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-jms-examples-common/pom.xml b/examples/jms/activemq-jms-examples-common/pom.xml
index d611433..74c2b74 100644
--- a/examples/jms/activemq-jms-examples-common/pom.xml
+++ b/examples/jms/activemq-jms-examples-common/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples.jms</groupId>
<artifactId>jms-examples</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<artifactId>activemq-jms-examples-common</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/examples/jms/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pom.xml b/examples/jms/pom.xml
index 27171bb..d9d3b02 100644
--- a/examples/jms/pom.xml
+++ b/examples/jms/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples</groupId>
<artifactId>activemq-examples</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<groupId>org.apache.activemq.examples.jms</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 5514d41..4d09eee 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</parent>
<groupId>org.apache.activemq.examples</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/integration/activemq-aerogear-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml
index 8f6a20a..4e19872 100644
--- a/integration/activemq-aerogear-integration/pom.xml
+++ b/integration/activemq-aerogear-integration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/integration/activemq-spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index 576e477..f18ce86 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/integration/activemq-vertx-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml
index 2d64717..afbbbe9 100644
--- a/integration/activemq-vertx-integration/pom.xml
+++ b/integration/activemq-vertx-integration/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a708c913/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b4211d..d8f6df9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
<packaging>pom</packaging>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
<parent>
<groupId>org.apache</groupId>
@@ -753,7 +753,7 @@
<plugin>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-maven-plugin</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
</plugin>
</plugins>
</pluginManagement>
[2/4] activemq-6 git commit: Revert "[maven-release-plugin] prepare
release 6.0.0"
Posted by an...@apache.org.
Revert "[maven-release-plugin] prepare release 6.0.0"
This reverts commit 807c4e3075c64c99982ed0284dacb78f69094b57.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/526135d1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/526135d1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/526135d1
Branch: refs/heads/master
Commit: 526135d1fb79fe5324bb0dd778469706fab747bb
Parents: a708c91
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Mar 5 14:41:02 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Mar 5 14:41:02 2015 +0000
----------------------------------------------------------------------
activemq-bootstrap/pom.xml | 3 ++-
activemq-commons/pom.xml | 3 ++-
activemq-core-client/pom.xml | 3 ++-
activemq-dto/pom.xml | 26 +++++++++++---------
activemq-jms-client/pom.xml | 3 ++-
activemq-jms-server/pom.xml | 3 ++-
activemq-journal/pom.xml | 3 ++-
activemq-maven-plugin/pom.xml | 3 ++-
activemq-native/pom.xml | 3 ++-
.../activemq-amqp-protocol/pom.xml | 3 ++-
.../activemq-openwire-protocol/pom.xml | 3 ++-
activemq-protocols/activemq-proton-plug/pom.xml | 3 ++-
.../activemq-stomp-protocol/pom.xml | 3 ++-
activemq-protocols/pom.xml | 4 ++-
activemq-ra/pom.xml | 3 ++-
activemq-rest/pom.xml | 4 ++-
activemq-selector/pom.xml | 3 ++-
activemq-server/pom.xml | 3 ++-
activemq-service-extensions/pom.xml | 3 ++-
activemq-tools/pom.xml | 3 ++-
activemq-web/pom.xml | 3 ++-
activemq-website/pom.xml | 5 ++--
distribution/activemq/pom.xml | 3 ++-
distribution/pom.xml | 3 ++-
examples/core/pom.xml | 3 ++-
.../jms/activemq-jms-examples-common/pom.xml | 3 ++-
examples/jms/pom.xml | 3 ++-
examples/pom.xml | 3 ++-
.../activemq-aerogear-integration/pom.xml | 3 ++-
integration/activemq-spring-integration/pom.xml | 3 ++-
integration/activemq-vertx-integration/pom.xml | 3 ++-
pom.xml | 7 +++---
32 files changed, 81 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-bootstrap/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/pom.xml b/activemq-bootstrap/pom.xml
index 7abb3a6..827674f 100644
--- a/activemq-bootstrap/pom.xml
+++ b/activemq-bootstrap/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-commons/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml
index b8f3725..5d6bd80 100644
--- a/activemq-commons/pom.xml
+++ b/activemq-commons/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml
index 3eb31d5..d9f17e0 100644
--- a/activemq-core-client/pom.xml
+++ b/activemq-core-client/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-dto/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-dto/pom.xml b/activemq-dto/pom.xml
index 93313e9..cac658e 100644
--- a/activemq-dto/pom.xml
+++ b/activemq-dto/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -65,19 +66,20 @@
<phase>generate-resources</phase>
<configuration>
<tasks>
- <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" />
- <mkdir dir="${project.build.directory}/schema/org.apache.activemq/dto" />
- <echo message="Generating XSD to: ${project.build.directory}/schema/org.apache.activemq/dto" />
- <schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org.apache.activemq/dto" includeantruntime="false">
- <schema namespace="http://activemq.org/schema" file="activemq.xsd" />
- <classpath refid="maven.compile.classpath" />
- <include name="**/package-info.java" />
- <include name="**/*DTO.java" />
- <exclude name="**/.git/**" />
- <exclude name="**/.svn/**" />
+ <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask"/>
+ <mkdir dir="${project.build.directory}/schema/org.apache.activemq/dto"/>
+ <echo message="Generating XSD to: ${project.build.directory}/schema/org.apache.activemq/dto"/>
+ <schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org.apache.activemq/dto"
+ includeantruntime="false">
+ <schema namespace="http://activemq.org/schema" file="activemq.xsd"/>
+ <classpath refid="maven.compile.classpath"/>
+ <include name="**/package-info.java"/>
+ <include name="**/*DTO.java"/>
+ <exclude name="**/.git/**"/>
+ <exclude name="**/.svn/**"/>
</schemagen>
<copy todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/schema" />
+ <fileset dir="${project.build.directory}/schema"/>
</copy>
</tasks>
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-jms-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml
index d7940bb..e22aa2b 100644
--- a/activemq-jms-client/pom.xml
+++ b/activemq-jms-client/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-jms-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml
index 1d73d48..b1a6df0 100644
--- a/activemq-jms-server/pom.xml
+++ b/activemq-jms-server/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-journal/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-journal/pom.xml b/activemq-journal/pom.xml
index 377a324..04fa914 100644
--- a/activemq-journal/pom.xml
+++ b/activemq-journal/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/pom.xml b/activemq-maven-plugin/pom.xml
index f06d920..fcfaf76 100644
--- a/activemq-maven-plugin/pom.xml
+++ b/activemq-maven-plugin/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-native/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-native/pom.xml b/activemq-native/pom.xml
index e097b96..9f06d1d 100644
--- a/activemq-native/pom.xml
+++ b/activemq-native/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<name>ActiveMQ6 Native POM</name>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-protocols/activemq-amqp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml
index 5fbeae4..4df0f8b 100644
--- a/activemq-protocols/activemq-amqp-protocol/pom.xml
+++ b/activemq-protocols/activemq-amqp-protocol/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>activemq-protocols</artifactId>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-protocols/activemq-openwire-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/activemq-protocols/activemq-openwire-protocol/pom.xml
index 8c1cc0b..dda250d 100644
--- a/activemq-protocols/activemq-openwire-protocol/pom.xml
+++ b/activemq-protocols/activemq-openwire-protocol/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>activemq-protocols</artifactId>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-protocols/activemq-proton-plug/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml
index 65dd5a0..79485d3 100644
--- a/activemq-protocols/activemq-proton-plug/pom.xml
+++ b/activemq-protocols/activemq-proton-plug/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>activemq-protocols</artifactId>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-protocols/activemq-stomp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-stomp-protocol/pom.xml b/activemq-protocols/activemq-stomp-protocol/pom.xml
index 5dbd0fc..ea21859 100644
--- a/activemq-protocols/activemq-stomp-protocol/pom.xml
+++ b/activemq-protocols/activemq-stomp-protocol/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>activemq-protocols</artifactId>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-protocols/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/pom.xml b/activemq-protocols/pom.xml
index fd225cc..8b22f08 100644
--- a/activemq-protocols/pom.xml
+++ b/activemq-protocols/pom.xml
@@ -15,7 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>activemq-pom</artifactId>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-ra/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 17fea9a..a43cc8e 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<name>ActiveMQ6 RAR POM</name>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-rest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index 882e995..5a604c9 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -14,7 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-selector/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-selector/pom.xml b/activemq-selector/pom.xml
index f840716..64ca2e2 100644
--- a/activemq-selector/pom.xml
+++ b/activemq-selector/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-server/pom.xml b/activemq-server/pom.xml
index 5dc4313..54470e3 100644
--- a/activemq-server/pom.xml
+++ b/activemq-server/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-service-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/pom.xml b/activemq-service-extensions/pom.xml
index c06af2a..30ef761 100644
--- a/activemq-service-extensions/pom.xml
+++ b/activemq-service-extensions/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-tools/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-tools/pom.xml b/activemq-tools/pom.xml
index 3b685cf..cd3580a 100644
--- a/activemq-tools/pom.xml
+++ b/activemq-tools/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-web/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index a94e825..9c0d91e 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/activemq-website/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-website/pom.xml b/activemq-website/pom.xml
index 7e2a3e3..3f95fe0 100644
--- a/activemq-website/pom.xml
+++ b/activemq-website/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -120,7 +121,7 @@
<configuration>
<target>
<condition property="gitbook.cmd" value="gitbook.cmd" else="gitbook">
- <os family="windows" />
+ <os family="windows"/>
</condition>
<!-- lets generate the gitbook -->
<mkdir dir="${webapp-outdir}/gitbook" />
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/distribution/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index d629806..5bc30e7 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -15,7 +15,8 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 7d967b0..c3f95b5 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -18,7 +18,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/examples/core/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 0146f93..b6ebca3 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/examples/jms/activemq-jms-examples-common/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-jms-examples-common/pom.xml b/examples/jms/activemq-jms-examples-common/pom.xml
index 74c2b74..a3f0902 100644
--- a/examples/jms/activemq-jms-examples-common/pom.xml
+++ b/examples/jms/activemq-jms-examples-common/pom.xml
@@ -18,7 +18,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/examples/jms/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pom.xml b/examples/jms/pom.xml
index d9d3b02..0294e31 100644
--- a/examples/jms/pom.xml
+++ b/examples/jms/pom.xml
@@ -18,7 +18,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 4d09eee..1710cfe 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/integration/activemq-aerogear-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml
index 4e19872..6d0a201 100644
--- a/integration/activemq-aerogear-integration/pom.xml
+++ b/integration/activemq-aerogear-integration/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/integration/activemq-spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index f18ce86..844532d 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -15,7 +15,8 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/integration/activemq-vertx-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml
index afbbbe9..731e02d 100644
--- a/integration/activemq-vertx-integration/pom.xml
+++ b/integration/activemq-vertx-integration/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/526135d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d8f6df9..018055f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-pom</artifactId>
@@ -735,7 +736,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <configuration />
+ <configuration/>
<executions>
<execution>
<goals>
@@ -942,7 +943,7 @@
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>
<configuration>
- <check />
+ <check/>
<formats>
<format>html</format>
<format>xml</format>
[3/4] activemq-6 git commit: Build bin/source distro together
Posted by an...@apache.org.
Build bin/source distro together
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/a4f5d747
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/a4f5d747
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/a4f5d747
Branch: refs/heads/master
Commit: a4f5d747ef1e276dade54a6114f1257bc15c1755
Parents: 526135d
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Mar 5 14:44:02 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Mar 5 14:44:02 2015 +0000
----------------------------------------------------------------------
distribution/activemq/pom.xml | 52 ++++++++++++--------------------------
1 file changed, 16 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a4f5d747/distribution/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index 5bc30e7..a6a9e75 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -184,38 +184,6 @@
<build>
</build>
</profile>
- <profile>
- <id>source-release</id>
- <activation>
- <property>
- <name>apache-release</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <descriptor>src/main/assembly/source-assembly.xml</descriptor>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>
@@ -233,12 +201,24 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
- <configuration>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
<executions>
<execution>
+ <id>source</id>
+ <configuration>
+ <descriptor>src/main/assembly/source-assembly.xml</descriptor>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>bin</id>
+ <configuration>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
<phase>package</phase>
<goals>
<goal>single</goal>
[4/4] activemq-6 git commit: merge #150 - Revert release source
changes
Posted by an...@apache.org.
merge #150 - Revert release source changes
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/84504ba5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/84504ba5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/84504ba5
Branch: refs/heads/master
Commit: 84504ba57341ca5f2b76482026f8708c7887077f
Parents: ba3d185 a4f5d74
Author: Andy Taylor <an...@gmail.com>
Authored: Thu Mar 5 14:49:02 2015 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Thu Mar 5 14:49:02 2015 +0000
----------------------------------------------------------------------
activemq-bootstrap/pom.xml | 5 +-
activemq-commons/pom.xml | 5 +-
activemq-core-client/pom.xml | 5 +-
activemq-dto/pom.xml | 28 +++++-----
activemq-jms-client/pom.xml | 5 +-
activemq-jms-server/pom.xml | 5 +-
activemq-journal/pom.xml | 5 +-
activemq-maven-plugin/pom.xml | 5 +-
activemq-native/pom.xml | 5 +-
.../activemq-amqp-protocol/pom.xml | 5 +-
.../activemq-openwire-protocol/pom.xml | 5 +-
activemq-protocols/activemq-proton-plug/pom.xml | 5 +-
.../activemq-stomp-protocol/pom.xml | 5 +-
activemq-protocols/pom.xml | 6 +-
activemq-ra/pom.xml | 5 +-
activemq-rest/pom.xml | 6 +-
activemq-selector/pom.xml | 5 +-
activemq-server/pom.xml | 5 +-
activemq-service-extensions/pom.xml | 5 +-
activemq-tools/pom.xml | 5 +-
activemq-web/pom.xml | 5 +-
activemq-website/pom.xml | 7 ++-
distribution/activemq/pom.xml | 59 +++++++-------------
distribution/pom.xml | 5 +-
examples/core/pom.xml | 5 +-
.../jms/activemq-jms-examples-common/pom.xml | 5 +-
examples/jms/pom.xml | 5 +-
examples/pom.xml | 5 +-
.../activemq-aerogear-integration/pom.xml | 5 +-
integration/activemq-spring-integration/pom.xml | 5 +-
integration/activemq-vertx-integration/pom.xml | 5 +-
pom.xml | 11 ++--
32 files changed, 131 insertions(+), 116 deletions(-)
----------------------------------------------------------------------