You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2015/09/07 10:41:40 UTC
[1/2] activemq-artemis git commit: fixing version and adding missing
projects on release profile
Repository: activemq-artemis
Updated Branches:
refs/heads/master a2aa18c12 -> 8458f8576
fixing version and adding missing projects on release profile
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/79a7ee5a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/79a7ee5a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/79a7ee5a
Branch: refs/heads/master
Commit: 79a7ee5a3f80f498e7227e350ff2397dfbdea182
Parents: a2aa18c
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Sep 4 23:41:23 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 4 23:41:23 2015 -0400
----------------------------------------------------------------------
docs/user-manual/en/maven-plugin.md | 2 +-
.../features/clustered/client-side-load-balancing/pom.xml | 2 +-
examples/features/clustered/pom.xml | 1 +
examples/protocols/openwire/chat/pom.xml | 2 +-
examples/protocols/openwire/message-listener/pom.xml | 2 +-
examples/protocols/openwire/message-recovery/pom.xml | 2 +-
examples/protocols/openwire/pom.xml | 2 +-
examples/protocols/openwire/queue/pom.xml | 2 +-
examples/protocols/pom.xml | 1 +
tests/activemq5-unit-tests/pom.xml | 6 +++---
tests/extra-tests/pom.xml | 2 +-
tests/pom.xml | 9 +++++++++
12 files changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/docs/user-manual/en/maven-plugin.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/maven-plugin.md b/docs/user-manual/en/maven-plugin.md
index 7d8b93a..19bda2f 100644
--- a/docs/user-manual/en/maven-plugin.md
+++ b/docs/user-manual/en/maven-plugin.md
@@ -136,7 +136,7 @@ The following example is a copy of the /examples/features/standard/queue example
<parent>
<groupId>org.apache.activemq.examples.broker</groupId>
<artifactId>jms-examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<artifactId>queue</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/examples/features/clustered/client-side-load-balancing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/clustered/client-side-load-balancing/pom.xml b/examples/features/clustered/client-side-load-balancing/pom.xml
index a9b092c..210dd3e 100644
--- a/examples/features/clustered/client-side-load-balancing/pom.xml
+++ b/examples/features/clustered/client-side-load-balancing/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples.clustered</groupId>
<artifactId>broker-clustered</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>client-side-load-balancing</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/examples/features/clustered/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/clustered/pom.xml b/examples/features/clustered/pom.xml
index accb042..228afc5 100644
--- a/examples/features/clustered/pom.xml
+++ b/examples/features/clustered/pom.xml
@@ -62,6 +62,7 @@ under the License.
<profile>
<id>release</id>
<modules>
+ <module>client-side-load-balancing</module>
<module>clustered-durable-subscription</module>
<module>clustered-grouping</module>
<module>clustered-jgroups</module>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/examples/protocols/openwire/chat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/chat/pom.xml b/examples/protocols/openwire/chat/pom.xml
index 58dcaa2..4e9666c 100644
--- a/examples/protocols/openwire/chat/pom.xml
+++ b/examples/protocols/openwire/chat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples.openwire</groupId>
<artifactId>openwire-examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>chat-example</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/examples/protocols/openwire/message-listener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/message-listener/pom.xml b/examples/protocols/openwire/message-listener/pom.xml
index f54c549..0b8d418 100644
--- a/examples/protocols/openwire/message-listener/pom.xml
+++ b/examples/protocols/openwire/message-listener/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples.openwire</groupId>
<artifactId>openwire-examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>message-listener</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/examples/protocols/openwire/message-recovery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/message-recovery/pom.xml b/examples/protocols/openwire/message-recovery/pom.xml
index 5caa161..0853355 100644
--- a/examples/protocols/openwire/message-recovery/pom.xml
+++ b/examples/protocols/openwire/message-recovery/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples.openwire</groupId>
<artifactId>openwire-examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>message-recovery</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/examples/protocols/openwire/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/pom.xml b/examples/protocols/openwire/pom.xml
index cc5eb76..7127cfb 100644
--- a/examples/protocols/openwire/pom.xml
+++ b/examples/protocols/openwire/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples.protocols</groupId>
<artifactId>protocols</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.activemq.examples.openwire</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/examples/protocols/openwire/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/openwire/queue/pom.xml b/examples/protocols/openwire/queue/pom.xml
index 204b67a..299c908 100644
--- a/examples/protocols/openwire/queue/pom.xml
+++ b/examples/protocols/openwire/queue/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.activemq.examples.openwire</groupId>
<artifactId>openwire-examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>queue-openwire</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/examples/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/pom.xml b/examples/protocols/pom.xml
index d0982e4..f33b259 100644
--- a/examples/protocols/pom.xml
+++ b/examples/protocols/pom.xml
@@ -58,6 +58,7 @@ under the License.
<module>amqp</module>
<module>mqtt</module>
<module>stomp</module>
+ <module>openwire</module>
</modules>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/tests/activemq5-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index c046bcf..8ee1050 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq.tests</groupId>
<artifactId>artemis-tests-pom</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>activemq5-unit-tests</artifactId>
@@ -44,7 +44,7 @@
<jasypt-version>1.9.2</jasypt-version>
<directory-version>2.0.0-M6</directory-version>
<activeio-core-version>3.1.4</activeio-core-version>
-
+
</properties>
<dependencies>
@@ -408,7 +408,7 @@
</excludes>
</configuration>
</plugin>
-
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 96fad8c..6c20a38 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.activemq.tests</groupId>
<artifactId>artemis-tests-pom</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>extra-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/79a7ee5a/tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/pom.xml b/tests/pom.xml
index 766a025..87faffa 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -92,6 +92,15 @@
<skipActiveMQ5Tests>false</skipActiveMQ5Tests>
</properties>
</profile>
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>activemq5-unit-tests</module>
+ </modules>
+ <properties>
+ <skipActiveMQ5Tests>true</skipActiveMQ5Tests>
+ </properties>
+ </profile>
</profiles>
<modules>
[2/2] activemq-artemis git commit: Merge PR #157
Posted by ma...@apache.org.
Merge PR #157
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8458f857
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8458f857
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8458f857
Branch: refs/heads/master
Commit: 8458f85762d80b7a40feb0abeb921127255062a4
Parents: a2aa18c 79a7ee5
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Sep 7 09:36:37 2015 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Mon Sep 7 09:36:37 2015 +0100
----------------------------------------------------------------------
docs/user-manual/en/maven-plugin.md | 2 +-
.../features/clustered/client-side-load-balancing/pom.xml | 2 +-
examples/features/clustered/pom.xml | 1 +
examples/protocols/openwire/chat/pom.xml | 2 +-
examples/protocols/openwire/message-listener/pom.xml | 2 +-
examples/protocols/openwire/message-recovery/pom.xml | 2 +-
examples/protocols/openwire/pom.xml | 2 +-
examples/protocols/openwire/queue/pom.xml | 2 +-
examples/protocols/pom.xml | 1 +
tests/activemq5-unit-tests/pom.xml | 6 +++---
tests/extra-tests/pom.xml | 2 +-
tests/pom.xml | 9 +++++++++
12 files changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------