Repository: falcon Updated Branches: refs/heads/master be95c5fc6 -> 8062ce4b6
FALCON-1491 Update ActiveMQ version to 5.12. Contributed by Peeyush Bishnoi. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/8062ce4b Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/8062ce4b Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/8062ce4b Branch: refs/heads/master Commit: 8062ce4b66727046e46138fe7de10dba8e24e6ac Parents: be95c5f Author: Sowmya Ramesh <[email protected]> Authored: Tue Oct 6 15:10:11 2015 -0700 Committer: Sowmya Ramesh <[email protected]> Committed: Tue Oct 6 15:10:11 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 + addons/hivedr/pom.xml | 2 +- common/src/main/resources/startup.properties | 2 +- messaging/pom.xml | 61 +++++++++++++++++- .../messaging/JMSMessageConsumerTest.java | 2 +- pom.xml | 60 ++++++++++++++++-- rerun/pom.xml | 61 +++++++++++++++++- src/conf/startup.properties | 2 +- test-tools/hadoop-webapp/pom.xml | 65 +++++++++++++++++++- unit/src/main/resources/startup.properties | 2 +- webapp/pom.xml | 4 +- 11 files changed, 249 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b3d5f0d..d39b3dc 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -49,6 +49,8 @@ Trunk (Unreleased) FALCON-1403 Revisit IT cleanup and teardown(Narayan Periwal via Pallavi Rao) BUG FIXES + FALCON-1491 Update ActiveMQ version to 5.12 + FALCON-1487 In secure cluster setup Hcat process/feed scheduling or replication fails(Sowmya Ramesh) FALCON-1339 List feed entities shows scheduled Feed entities as submitted(Balu Vellanki via Sowmya Ramesh) http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/addons/hivedr/pom.xml ---------------------------------------------------------------------- diff --git a/addons/hivedr/pom.xml b/addons/hivedr/pom.xml index fc04f20..a1be288 100644 --- a/addons/hivedr/pom.xml +++ b/addons/hivedr/pom.xml @@ -91,7 +91,7 @@ </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> + <artifactId>activemq-all</artifactId> <scope>test</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/common/src/main/resources/startup.properties ---------------------------------------------------------------------- diff --git a/common/src/main/resources/startup.properties b/common/src/main/resources/startup.properties index 1da7d23..cc5212a 100644 --- a/common/src/main/resources/startup.properties +++ b/common/src/main/resources/startup.properties @@ -60,7 +60,7 @@ *.broker.impl.class=org.apache.activemq.ActiveMQConnectionFactory ##### List of shared libraries for Falcon workflows ##### -*.shared.libs=activemq-core,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3 +*.shared.libs=activemq-all,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3 ##### Workflow Job Execution Completion listeners ##### *.workflow.execution.listeners= http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/messaging/pom.xml ---------------------------------------------------------------------- diff --git a/messaging/pom.xml b/messaging/pom.xml index 6528278..918de63 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -93,7 +93,66 @@ <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> + <artifactId>activemq-all</artifactId> + <version>${activemq.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pool</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-legacy</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-camel</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jaas</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-console</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-shiro</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-spring</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-pool</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-amqp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-mqtt</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-stomp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-leveldb-store</artifactId> + </exclusion> + <exclusion> + <groupId>org.fusesource.hawtbuf</groupId> + <artifactId>hawtbuf</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java ---------------------------------------------------------------------- diff --git a/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java b/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java index 5bbcc87..7356ee3 100644 --- a/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java +++ b/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java @@ -147,7 +147,7 @@ public class JMSMessageConsumerTest { sendMessages(SECONDARY_TOPIC_NAME); - Assert.assertEquals(adminView.getTotalEnqueueCount(), 20); + Assert.assertEquals(adminView.getTotalEnqueueCount(), 18); Assert.assertEquals(adminView.getTotalDequeueCount(), 0); Assert.assertEquals(adminView.getTotalConsumerCount(), 3); http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9cdfc87..54e6cd1 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ <oozie.version>4.1.0</oozie.version> <oozie.buildversion>${oozie.version}-falcon</oozie.buildversion> <oozie.forcebuild>false</oozie.forcebuild> - <activemq.version>5.4.3</activemq.version> + <activemq.version>5.12.0</activemq.version> <hive.version>0.13.1</hive.version> <jetty.version>6.1.26</jetty.version> <jersey.version>1.9</jersey.version> @@ -730,12 +730,64 @@ <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> + <artifactId>activemq-all</artifactId> <version>${activemq.version}</version> <exclusions> <exclusion> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pool</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-legacy</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-camel</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jaas</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-console</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-shiro</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-spring</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-pool</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-amqp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-mqtt</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-stomp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-leveldb-store</artifactId> + </exclusion> + <exclusion> + <groupId>org.fusesource.hawtbuf</groupId> + <artifactId>hawtbuf</artifactId> </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/rerun/pom.xml ---------------------------------------------------------------------- diff --git a/rerun/pom.xml b/rerun/pom.xml index b07e4e9..e0c9a9c 100644 --- a/rerun/pom.xml +++ b/rerun/pom.xml @@ -89,7 +89,66 @@ <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> + <artifactId>activemq-all</artifactId> + <version>${activemq.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pool</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-legacy</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-camel</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jaas</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-console</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-shiro</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-spring</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-pool</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-amqp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-mqtt</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-stomp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-leveldb-store</artifactId> + </exclusion> + <exclusion> + <groupId>org.fusesource.hawtbuf</groupId> + <artifactId>hawtbuf</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/src/conf/startup.properties ---------------------------------------------------------------------- diff --git a/src/conf/startup.properties b/src/conf/startup.properties index ee1f141..dc9e393 100644 --- a/src/conf/startup.properties +++ b/src/conf/startup.properties @@ -75,7 +75,7 @@ prism.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\ *.broker.impl.class=org.apache.activemq.ActiveMQConnectionFactory ##### List of shared libraries for Falcon workflows ##### -*.shared.libs=activemq-core,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3 +*.shared.libs=activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3 ##### Workflow Job Execution Completion listeners ##### *.workflow.execution.listeners= http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/test-tools/hadoop-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/test-tools/hadoop-webapp/pom.xml b/test-tools/hadoop-webapp/pom.xml index eea00dc..c3e2ac2 100644 --- a/test-tools/hadoop-webapp/pom.xml +++ b/test-tools/hadoop-webapp/pom.xml @@ -189,7 +189,70 @@ <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> + <artifactId>activemq-all</artifactId> + <version>${activemq.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pool</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-legacy</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-camel</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jaas</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-console</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-shiro</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-spring</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-pool</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-amqp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-mqtt</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-stomp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-leveldb-store</artifactId> + </exclusion> + <exclusion> + <groupId>org.fusesource.hawtbuf</groupId> + <artifactId>hawtbuf</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/unit/src/main/resources/startup.properties ---------------------------------------------------------------------- diff --git a/unit/src/main/resources/startup.properties b/unit/src/main/resources/startup.properties index 4207ab9..fe6f430 100644 --- a/unit/src/main/resources/startup.properties +++ b/unit/src/main/resources/startup.properties @@ -78,7 +78,7 @@ debug.libext.process.paths=${falcon.libext} ##### List of shared libraries for Falcon workflows ##### -*.shared.libs=activemq-core,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3 +*.shared.libs=activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3 ######### Authentication Properties ######### http://git-wip-us.apache.org/repos/asf/falcon/blob/8062ce4b/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index a4d5a8d..7577062 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -339,8 +339,8 @@ <!-- this is only used in integration-tests against external clusters --> <artifactItem> <groupId>org.apache.activemq</groupId> - <artifactId>kahadb</artifactId> - <version>5.4.3</version> + <artifactId>activemq-kahadb-store</artifactId> + <version>5.12.0</version> <type>jar</type> <overWrite>false</overWrite> <outputDirectory>${project.build.directory}/libext</outputDirectory>
