summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-java-1.4/distribution/manifest/pom.xml4
-rw-r--r--branches/sca-java-1.4/distribution/pom.xml4
-rw-r--r--branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE4
-rw-r--r--branches/sca-java-1.4/itest/jms-format/pom.xml2
-rw-r--r--branches/sca-java-1.4/itest/jms/pom.xml2
-rw-r--r--branches/sca-java-1.4/itest/policy-security-basicauth/pom.xml2
-rw-r--r--branches/sca-java-1.4/itest/policy-security-token/pom.xml2
-rw-r--r--branches/sca-java-1.4/itest/transaction/pom.xml4
-rw-r--r--branches/sca-java-1.4/modules/runtime/pom.xml2
-rw-r--r--branches/sca-java-1.4/samples/helloworld-reference-jms/pom.xml4
-rw-r--r--branches/sca-java-1.4/samples/helloworld-service-jms/pom.xml4
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-jms/pom.xml4
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-service-jms/pom.xml2
13 files changed, 20 insertions, 20 deletions
diff --git a/branches/sca-java-1.4/distribution/manifest/pom.xml b/branches/sca-java-1.4/distribution/manifest/pom.xml
index 447b72a89a..c736930fdb 100644
--- a/branches/sca-java-1.4/distribution/manifest/pom.xml
+++ b/branches/sca-java-1.4/distribution/manifest/pom.xml
@@ -87,8 +87,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
- <version>4.1.1</version>
+ <artifactId>activemq-all</artifactId>
+ <version>5.2.0</version>
<exclusions>
<exclusion>
<groupId>commons-httpclient</groupId>
diff --git a/branches/sca-java-1.4/distribution/pom.xml b/branches/sca-java-1.4/distribution/pom.xml
index df4947c57c..027f2cec0b 100644
--- a/branches/sca-java-1.4/distribution/pom.xml
+++ b/branches/sca-java-1.4/distribution/pom.xml
@@ -140,8 +140,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
- <version>4.1.1</version>
+ <artifactId>activemq-all</artifactId>
+ <version>5.2.0</version>
<exclusions>
<!-- TUSCANY-2168 -->
<exclusion>
diff --git a/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE
index 982d546a28..84c914edaa 100644
--- a/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE
+++ b/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE
@@ -231,8 +231,8 @@ The following components come under Apache Software License 2.0
activeio-2.0-r118.jar
activeio-core-3.0.0-incubator.jar
activeio-core-3.1.0-tests.jar
- activemq-core-5.1.0.jar
- apache-activemq-4.1.1.jar
+ activemq-all-5.2.0.jar
+ activemq-core-5.2.0.jar
addressing-1.3.mar
annogen-0.1.0.jar
aopalliance-1.0.jar
diff --git a/branches/sca-java-1.4/itest/jms-format/pom.xml b/branches/sca-java-1.4/itest/jms-format/pom.xml
index 5e8362638b..2f3f4c3816 100644
--- a/branches/sca-java-1.4/itest/jms-format/pom.xml
+++ b/branches/sca-java-1.4/itest/jms-format/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
+ <version>5.2.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/branches/sca-java-1.4/itest/jms/pom.xml b/branches/sca-java-1.4/itest/jms/pom.xml
index 34c580f707..3d44fe1b7a 100644
--- a/branches/sca-java-1.4/itest/jms/pom.xml
+++ b/branches/sca-java-1.4/itest/jms/pom.xml
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
+ <version>5.2.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/branches/sca-java-1.4/itest/policy-security-basicauth/pom.xml b/branches/sca-java-1.4/itest/policy-security-basicauth/pom.xml
index 7af85a010a..9be093e6c1 100644
--- a/branches/sca-java-1.4/itest/policy-security-basicauth/pom.xml
+++ b/branches/sca-java-1.4/itest/policy-security-basicauth/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
+ <version>5.2.0</version>
<scope>runtime</scope>
</dependency>
diff --git a/branches/sca-java-1.4/itest/policy-security-token/pom.xml b/branches/sca-java-1.4/itest/policy-security-token/pom.xml
index 49bb4dd7a2..8dbdf26a6b 100644
--- a/branches/sca-java-1.4/itest/policy-security-token/pom.xml
+++ b/branches/sca-java-1.4/itest/policy-security-token/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
+ <version>5.2.0</version>
<scope>runtime</scope>
</dependency>
diff --git a/branches/sca-java-1.4/itest/transaction/pom.xml b/branches/sca-java-1.4/itest/transaction/pom.xml
index 0d4284ba9b..949ba863ee 100644
--- a/branches/sca-java-1.4/itest/transaction/pom.xml
+++ b/branches/sca-java-1.4/itest/transaction/pom.xml
@@ -52,12 +52,12 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
+ <version>5.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
- <version>4.1.1</version>
+ <version>5.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/branches/sca-java-1.4/modules/runtime/pom.xml b/branches/sca-java-1.4/modules/runtime/pom.xml
index 970190d420..0bb6208a2c 100644
--- a/branches/sca-java-1.4/modules/runtime/pom.xml
+++ b/branches/sca-java-1.4/modules/runtime/pom.xml
@@ -349,7 +349,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
+ <version>5.2.0</version>
</dependency>
</dependencies>
diff --git a/branches/sca-java-1.4/samples/helloworld-reference-jms/pom.xml b/branches/sca-java-1.4/samples/helloworld-reference-jms/pom.xml
index 3fe462b58e..a0ac1d6682 100644
--- a/branches/sca-java-1.4/samples/helloworld-reference-jms/pom.xml
+++ b/branches/sca-java-1.4/samples/helloworld-reference-jms/pom.xml
@@ -72,8 +72,8 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
- <version>4.1.1</version>
+ <artifactId>activemq-all</artifactId>
+ <version>5.2.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/branches/sca-java-1.4/samples/helloworld-service-jms/pom.xml b/branches/sca-java-1.4/samples/helloworld-service-jms/pom.xml
index d8fd33aac3..38ef2a7d47 100644
--- a/branches/sca-java-1.4/samples/helloworld-service-jms/pom.xml
+++ b/branches/sca-java-1.4/samples/helloworld-service-jms/pom.xml
@@ -66,8 +66,8 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
- <version>4.1.1</version>
+ <artifactId>activemq-all</artifactId>
+ <version>5.2.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.activemq</groupId>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-jms/pom.xml b/branches/sca-java-1.4/samples/helloworld-ws-reference-jms/pom.xml
index 2ad845004f..e8ccccede3 100644
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-jms/pom.xml
+++ b/branches/sca-java-1.4/samples/helloworld-ws-reference-jms/pom.xml
@@ -72,8 +72,8 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
- <version>4.1.1</version>
+ <artifactId>activemq-all</artifactId>
+ <version>5.2.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-service-jms/pom.xml b/branches/sca-java-1.4/samples/helloworld-ws-service-jms/pom.xml
index 554b2bf94c..3cb7c055f5 100644
--- a/branches/sca-java-1.4/samples/helloworld-ws-service-jms/pom.xml
+++ b/branches/sca-java-1.4/samples/helloworld-ws-service-jms/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
+ <version>5.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>