Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B755117393 for ; Tue, 3 Mar 2015 12:01:51 +0000 (UTC) Received: (qmail 74554 invoked by uid 500); 3 Mar 2015 12:01:51 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 74505 invoked by uid 500); 3 Mar 2015 12:01:51 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 74496 invoked by uid 99); 3 Mar 2015 12:01:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 12:01:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 61E54E0FB7; Tue, 3 Mar 2015 12:01:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: martyntaylor@apache.org To: commits@activemq.apache.org Date: Tue, 03 Mar 2015 12:01:52 -0000 Message-Id: In-Reply-To: <62a4847a90904a0da9a9f735e0fc53ea@git.apache.org> References: <62a4847a90904a0da9a9f735e0fc53ea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq-6 git commit: Revert "[maven-release-plugin] prepare release 6.0.0" Revert "[maven-release-plugin] prepare release 6.0.0" This reverts commit f1f7a67111a5b3db50a19bf878d5a70902bbd727. Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/65453f3f Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/65453f3f Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/65453f3f Branch: refs/heads/master Commit: 65453f3fa6af72e00a05f0c00cb55d75e41d76b8 Parents: b5b90e5 Author: Martyn Taylor Authored: Tue Mar 3 11:48:06 2015 +0000 Committer: Martyn Taylor Committed: Tue Mar 3 11:48:06 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 | 13 ++++----- distribution/activemq/pom.xml | 7 ++--- 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 | 13 ++++----- 32 files changed, 119 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-bootstrap/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/pom.xml b/activemq-bootstrap/pom.xml index 7abb3a6..d220646 100644 --- a/activemq-bootstrap/pom.xml +++ b/activemq-bootstrap/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-bootstrap http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-commons/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml index b8f3725..4f15126 100644 --- a/activemq-commons/pom.xml +++ b/activemq-commons/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-commons http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-core-client/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml index 3eb31d5..5446c0e 100644 --- a/activemq-core-client/pom.xml +++ b/activemq-core-client/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-core-client http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-dto/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-dto/pom.xml b/activemq-dto/pom.xml index 93313e9..9f2325a 100644 --- a/activemq-dto/pom.xml +++ b/activemq-dto/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-dto @@ -65,19 +66,20 @@ generate-resources - - - - - - - - - - + + + + + + + + + + - + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-jms-client/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml index d7940bb..629b8ee 100644 --- a/activemq-jms-client/pom.xml +++ b/activemq-jms-client/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-jms-client http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-jms-server/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml index 1d73d48..ce7e53b 100644 --- a/activemq-jms-server/pom.xml +++ b/activemq-jms-server/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-jms-server http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-journal/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-journal/pom.xml b/activemq-journal/pom.xml index 377a324..9749f2a 100644 --- a/activemq-journal/pom.xml +++ b/activemq-journal/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-journal http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-maven-plugin/pom.xml b/activemq-maven-plugin/pom.xml index f06d920..eb7bb13 100644 --- a/activemq-maven-plugin/pom.xml +++ b/activemq-maven-plugin/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-maven-plugin http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-native/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-native/pom.xml b/activemq-native/pom.xml index 6d4c10f..48385ee 100644 --- a/activemq-native/pom.xml +++ b/activemq-native/pom.xml @@ -14,14 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. --> - + ActiveMQ6 Native POM 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-native http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/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..d5cbd4d 100644 --- a/activemq-protocols/activemq-amqp-protocol/pom.xml +++ b/activemq-protocols/activemq-amqp-protocol/pom.xml @@ -14,11 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + activemq-protocols org.apache.activemq - 6.0.0 + 6.0.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/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..e7e2afa 100644 --- a/activemq-protocols/activemq-openwire-protocol/pom.xml +++ b/activemq-protocols/activemq-openwire-protocol/pom.xml @@ -14,11 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + activemq-protocols org.apache.activemq - 6.0.0 + 6.0.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/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..9bea207 100644 --- a/activemq-protocols/activemq-proton-plug/pom.xml +++ b/activemq-protocols/activemq-proton-plug/pom.xml @@ -14,11 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + activemq-protocols org.apache.activemq - 6.0.0 + 6.0.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/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..eb9a244 100644 --- a/activemq-protocols/activemq-stomp-protocol/pom.xml +++ b/activemq-protocols/activemq-stomp-protocol/pom.xml @@ -14,11 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + activemq-protocols org.apache.activemq - 6.0.0 + 6.0.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-protocols/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/pom.xml b/activemq-protocols/pom.xml index fd225cc..2aac1fa 100644 --- a/activemq-protocols/pom.xml +++ b/activemq-protocols/pom.xml @@ -15,11 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + activemq-pom org.apache.activemq - 6.0.0 + 6.0.0-SNAPSHOT 4.0.0 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-ra/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index 17fea9a..eca7228 100644 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -14,14 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. --> - + ActiveMQ6 RAR POM 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-ra http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-rest/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml index 882e995..2ff1d9f 100644 --- a/activemq-rest/pom.xml +++ b/activemq-rest/pom.xml @@ -14,12 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT ActiveMQ6 REST Interface Implementation http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-selector/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-selector/pom.xml b/activemq-selector/pom.xml index f840716..a661396 100644 --- a/activemq-selector/pom.xml +++ b/activemq-selector/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-selector http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-server/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-server/pom.xml b/activemq-server/pom.xml index 5dc4313..a7c7c06 100644 --- a/activemq-server/pom.xml +++ b/activemq-server/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-server http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-service-extensions/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-service-extensions/pom.xml b/activemq-service-extensions/pom.xml index c06af2a..cc217d5 100644 --- a/activemq-service-extensions/pom.xml +++ b/activemq-service-extensions/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-service-extensions http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-tools/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-tools/pom.xml b/activemq-tools/pom.xml index 3b685cf..b637538 100644 --- a/activemq-tools/pom.xml +++ b/activemq-tools/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-tools http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-web/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml index a94e825..5121f99 100644 --- a/activemq-web/pom.xml +++ b/activemq-web/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-web http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/activemq-website/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-website/pom.xml b/activemq-website/pom.xml index 5ea70dc..9067756 100644 --- a/activemq-website/pom.xml +++ b/activemq-website/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-website @@ -120,12 +121,12 @@ - + executing gitbook - - - + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/distribution/activemq/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml index 3ead5e5..a58eeaf 100644 --- a/distribution/activemq/pom.xml +++ b/distribution/activemq/pom.xml @@ -15,14 +15,15 @@ ~ limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-distribution - 6.0.0 + 6.0.0-SNAPSHOT activemq @@ -176,7 +177,7 @@ org.apache.activemq activemq-website - 6.0.0 + 6.0.0-SNAPSHOT javadoc http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 7d967b0..bde3214 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -18,13 +18,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT activemq-distribution http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/examples/core/pom.xml ---------------------------------------------------------------------- diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 0146f93..2218e75 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,13 +18,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq.examples activemq-examples - 6.0.0 + 6.0.0-SNAPSHOT org.apache.activemq.examples.core http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/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..c025837 100644 --- a/examples/jms/activemq-jms-examples-common/pom.xml +++ b/examples/jms/activemq-jms-examples-common/pom.xml @@ -18,13 +18,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq.examples.jms jms-examples - 6.0.0 + 6.0.0-SNAPSHOT activemq-jms-examples-common http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/examples/jms/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pom.xml b/examples/jms/pom.xml index d9d3b02..0b68cce 100644 --- a/examples/jms/pom.xml +++ b/examples/jms/pom.xml @@ -18,13 +18,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq.examples activemq-examples - 6.0.0 + 6.0.0-SNAPSHOT org.apache.activemq.examples.jms http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 4d09eee..b34f7e7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,13 +18,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT org.apache.activemq.examples http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/integration/activemq-aerogear-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml index 4e19872..9ca9418 100644 --- a/integration/activemq-aerogear-integration/pom.xml +++ b/integration/activemq-aerogear-integration/pom.xml @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT ../../pom.xml http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/integration/activemq-spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml index f18ce86..bc991e5 100644 --- a/integration/activemq-spring-integration/pom.xml +++ b/integration/activemq-spring-integration/pom.xml @@ -15,13 +15,14 @@ ~ limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT ../../pom.xml http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/integration/activemq-vertx-integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml index afbbbe9..8c48e15 100644 --- a/integration/activemq-vertx-integration/pom.xml +++ b/integration/activemq-vertx-integration/pom.xml @@ -15,13 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom - 6.0.0 + 6.0.0-SNAPSHOT ../../pom.xml http://git-wip-us.apache.org/repos/asf/activemq-6/blob/65453f3f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8ea6390..fa955b4 100644 --- a/pom.xml +++ b/pom.xml @@ -14,12 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.activemq activemq-pom pom - 6.0.0 + 6.0.0-SNAPSHOT org.apache @@ -107,7 +108,7 @@ scm:git:http://git-wip-us.apache.org/repos/asf/activemq-6.git scm:git:https://git-wip-us.apache.org/repos/asf/activemq-6.git https://fisheye6.atlassian.com/browse/~br=master/activemq-6-git - 6.0.0 + HEAD @@ -732,7 +733,7 @@ org.codehaus.mojo cobertura-maven-plugin - + @@ -750,7 +751,7 @@ org.apache.activemq activemq-maven-plugin - 6.0.0 + 6.0.0-SNAPSHOT @@ -939,7 +940,7 @@ cobertura-maven-plugin 2.5.2 - + html xml