Repository: flume Updated Branches: refs/heads/trunk b359f32e3 -> 8b3fad52b
Changing javax.jms to geronimo jms spec javax.jms has GNU GPL licence which is not compatible with Apache This closes #172 Reviewers: Miklos Csanady, 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/8b3fad52 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/8b3fad52 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/8b3fad52 Branch: refs/heads/trunk Commit: 8b3fad52b2da1510fa066ded2816b9cfc35f22e1 Parents: b359f32 Author: Ferenc Szabo <[email protected]> Authored: Wed Sep 13 17:24:27 2017 +0200 Committer: Denes Arvay <[email protected]> Committed: Wed Sep 13 17:31:36 2017 +0200 ---------------------------------------------------------------------- flume-ng-sources/flume-jms-source/pom.xml | 4 ++-- pom.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/8b3fad52/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 74ac2b1..fb03e24 100644 --- a/flume-ng-sources/flume-jms-source/pom.xml +++ b/flume-ng-sources/flume-jms-source/pom.xml @@ -71,8 +71,8 @@ limitations under the License. </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms-api</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/8b3fad52/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4f498a0..466a434 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,7 @@ limitations under the License. <elasticsearch.version>0.90.1</elasticsearch.version> <fasterxml.jackson.version>2.8.9</fasterxml.jackson.version> <fest-reflect.version>1.4</fest-reflect.version> + <geronimo-jms.version>1.1.1</geronimo-jms.version> <gson.version>2.2.2</gson.version> <guava.version>18.0</guava.version> <guava-old.version>11.0.2</guava-old.version> @@ -72,7 +73,6 @@ limitations under the License. <httpclient.version>4.3.5</httpclient.version> <httpclient-old.version>4.2.1</httpclient-old.version> <irclib.version>1.10</irclib.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.9.9</joda-time.version> @@ -1229,9 +1229,9 @@ limitations under the License. </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms-api</artifactId> - <version>${javax-jms.version}</version> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + <version>${geronimo-jms.version}</version> </dependency> <dependency>
