Repository: nifi Updated Branches: refs/heads/master 3cdd3f60f -> e9d585a78
NIFI-4870 Upgraded activemq-client and activemq-broker versions to 5.15.3. - Updated copyright dates in NOTICE files. - This closes #2469. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e9d585a7 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e9d585a7 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e9d585a7 Branch: refs/heads/master Commit: e9d585a785d6b1c802af4e3bb0126fe2ab5c6d46 Parents: 3cdd3f6 Author: Andy LoPresto <[email protected]> Authored: Tue Feb 13 12:09:15 2018 -0800 Committer: Matt Gilman <[email protected]> Committed: Fri Mar 9 13:59:13 2018 -0500 ---------------------------------------------------------------------- nifi-assembly/NOTICE | 2 +- .../nifi-standard-nar/src/main/resources/META-INF/NOTICE | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e9d585a7/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 3f2a24c..20078cc 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -844,7 +844,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache ActiveMQ The following NOTICE information applies: ActiveMQ :: Client - Copyright 2005-2015 The Apache Software Foundation + Copyright 2005-2017 The Apache Software Foundation (ASLv2) Apache Geronimo The following NOTICE information applies: http://git-wip-us.apache.org/repos/asf/nifi/blob/e9d585a7/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE index 3b1c1dc..e85f4d2 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE @@ -87,7 +87,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache ActiveMQ The following NOTICE information applies: ActiveMQ :: Client - Copyright 2005-2015 The Apache Software Foundation + Copyright 2005-2017 The Apache Software Foundation (ASLv2) Apache Geronimo The following NOTICE information applies: http://git-wip-us.apache.org/repos/asf/nifi/blob/e9d585a7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 044bf63..b1ff6da 100644 --- a/pom.xml +++ b/pom.xml @@ -613,12 +613,12 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>5.12.3</version> + <version>5.15.3</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-broker</artifactId> - <version>5.12.3</version> + <version>5.15.3</version> <scope>test</scope> </dependency> <dependency>
