flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject [1/2] flume git commit: FLUME-3131. Upgrade Spring Framework library dependencies
Date Thu, 24 Aug 2017 16:42:13 GMT
Repository: flume
Updated Branches:
  refs/heads/trunk a51ca18b7 -> 3cd1b3313


FLUME-3131. Upgrade Spring Framework library dependencies

The Spring Framework libraries are transitive depencencies through ActiveMQ
thus it's not possible to upgrade.
They are only used is tests so moved ActiveMQ to test scope.

This closes #153

Reviewers: Attila Simon, Denes Arvay

(Ferenc Szabo via Denes Arvay)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/aa1aea07
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/aa1aea07
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/aa1aea07

Branch: refs/heads/trunk
Commit: aa1aea07b7e2bd25e28efdc262239ec501fbf086
Parents: a51ca18
Author: Ferenc Szabo <fszabo@cloudera.com>
Authored: Tue Aug 15 09:30:24 2017 +0200
Committer: Denes Arvay <denes@apache.org>
Committed: Thu Aug 24 18:37:31 2017 +0200

----------------------------------------------------------------------
 flume-ng-sources/flume-jms-source/pom.xml | 7 ++++++-
 pom.xml                                   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/aa1aea07/flume-ng-sources/flume-jms-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-jms-source/pom.xml b/flume-ng-sources/flume-jms-source/pom.xml
index cbae702..74ac2b1 100644
--- a/flume-ng-sources/flume-jms-source/pom.xml
+++ b/flume-ng-sources/flume-jms-source/pom.xml
@@ -71,9 +71,14 @@ limitations under the License.
     </dependency>
 
     <dependency>
+      <groupId>javax.jms</groupId>
+      <artifactId>jms-api</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
 
   </dependencies>

http://git-wip-us.apache.org/repos/asf/flume/blob/aa1aea07/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ac09ab..80b2849 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@ limitations under the License.
     <httpclient-old.version>4.2.1</httpclient-old.version>
     <irclib.version>1.10</irclib.version>
     <jackson.version>1.9.3</jackson.version>
-    <javax-jms.version>1.1</javax-jms.version>
+    <javax-jms.version>1.1-rev-1</javax-jms.version>
     <jersey.version>1.8</jersey.version>
     <jetty.version>6.1.26</jetty.version>
     <joda-time.version>2.1</joda-time.version>
@@ -1140,7 +1140,7 @@ limitations under the License.
 
       <dependency>
         <groupId>javax.jms</groupId>
-        <artifactId>jms</artifactId>
+        <artifactId>jms-api</artifactId>
         <version>${javax-jms.version}</version>
       </dependency>
 


Mime
View raw message