You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2016/04/18 19:37:02 UTC
incubator-ranger git commit: RANGER-932 - Fix assemblies after patch
for RANGER-839
Repository: incubator-ranger
Updated Branches:
refs/heads/master 27a593416 -> 259fad12b
RANGER-932 - Fix assemblies after patch for RANGER-839
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/259fad12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/259fad12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/259fad12
Branch: refs/heads/master
Commit: 259fad12bf86c93a8eef09dc4d1b134543211b48
Parents: 27a5934
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Apr 18 13:39:17 2016 +0100
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Apr 18 09:04:45 2016 -0700
----------------------------------------------------------------------
src/main/assembly/hbase-agent.xml | 6 +++---
src/main/assembly/hdfs-agent.xml | 2 +-
src/main/assembly/hive-agent.xml | 2 +-
src/main/assembly/kms.xml | 8 ++++----
src/main/assembly/knox-agent.xml | 2 +-
src/main/assembly/plugin-kafka.xml | 6 +++---
src/main/assembly/plugin-kms.xml | 6 +++---
src/main/assembly/plugin-yarn.xml | 2 +-
src/main/assembly/ranger-tools.xml | 6 +++---
src/main/assembly/storm-agent.xml | 6 +++---
10 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/hbase-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/hbase-agent.xml b/src/main/assembly/hbase-agent.xml
index 9e69ff2..3255907 100644
--- a/src/main/assembly/hbase-agent.xml
+++ b/src/main/assembly/hbase-agent.xml
@@ -50,9 +50,9 @@
<include>com.google.code.gson:gson*</include>
<include>org.eclipse.persistence:eclipselink</include>
<include>org.eclipse.persistence:javax.persistence</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
</includes>
<unpack>false</unpack>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/hdfs-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/hdfs-agent.xml b/src/main/assembly/hdfs-agent.xml
index c71bd67..742ef94 100644
--- a/src/main/assembly/hdfs-agent.xml
+++ b/src/main/assembly/hdfs-agent.xml
@@ -84,7 +84,7 @@
<include>com.google.code.gson:gson*</include>
<include>org.eclipse.persistence:javax.persistence</include>
<include>org.eclipse.persistence:eclipselink</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
</includes>
<unpack>false</unpack>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/hive-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml
index e1b9d7e..9e9df8c 100644
--- a/src/main/assembly/hive-agent.xml
+++ b/src/main/assembly/hive-agent.xml
@@ -51,7 +51,7 @@
<include>com.google.code.gson:gson*</include>
<include>org.eclipse.persistence:eclipselink</include>
<include>org.eclipse.persistence:javax.persistence</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
</includes>
<unpack>false</unpack>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/kms.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml
index 01f14b9..ec81ed7 100755
--- a/src/main/assembly/kms.xml
+++ b/src/main/assembly/kms.xml
@@ -99,7 +99,7 @@
<include>org.xerial.snappy:snappy-java</include>
<include>xmlenc:xmlenc</include>
<include>org.tukaani:xz</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
@@ -191,9 +191,9 @@
<include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>com.google.guava:guava:jar:${guava.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
</includes>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/knox-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml
index b6653f0..c036187 100644
--- a/src/main/assembly/knox-agent.xml
+++ b/src/main/assembly/knox-agent.xml
@@ -51,7 +51,7 @@
<includes>
<include>commons-configuration:commons-configuration</include>
<include>com.google.code.gson:gson*</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/plugin-kafka.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/plugin-kafka.xml b/src/main/assembly/plugin-kafka.xml
index 26d8100..1e33e7f 100644
--- a/src/main/assembly/plugin-kafka.xml
+++ b/src/main/assembly/plugin-kafka.xml
@@ -63,11 +63,11 @@
<include>commons-lang:commons-lang</include>
<include>commons-io:commons-io</include>
<include>com.google.guava:guava:jar:${google.guava.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}
</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}
</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}
</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/plugin-kms.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/plugin-kms.xml b/src/main/assembly/plugin-kms.xml
index d3e79b6..57ab8c3 100755
--- a/src/main/assembly/plugin-kms.xml
+++ b/src/main/assembly/plugin-kms.xml
@@ -43,9 +43,9 @@
<include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
<include>com.google.guava:guava:jar:${guava.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
</includes>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/plugin-yarn.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/plugin-yarn.xml b/src/main/assembly/plugin-yarn.xml
index 57a75ba..b286a49 100644
--- a/src/main/assembly/plugin-yarn.xml
+++ b/src/main/assembly/plugin-yarn.xml
@@ -51,7 +51,7 @@
<includes>
<include>org.eclipse.persistence:eclipselink</include>
<include>org.eclipse.persistence:javax.persistence</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
</includes>
</dependencySet>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/ranger-tools.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/ranger-tools.xml b/src/main/assembly/ranger-tools.xml
index ac639aa..0df339d 100644
--- a/src/main/assembly/ranger-tools.xml
+++ b/src/main/assembly/ranger-tools.xml
@@ -50,9 +50,9 @@
<include>com.sun.jersey:jersey-bundle</include>
<include>commons-io:commons-io</include>
<include>com.google.guava:guava:jar:${google.guava.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
<include>org.codehaus.jackson:jackson-jaxrs</include>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/259fad12/src/main/assembly/storm-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml
index 99a847b..2813f90 100644
--- a/src/main/assembly/storm-agent.xml
+++ b/src/main/assembly/storm-agent.xml
@@ -61,9 +61,9 @@
<include>org.codehaus.jackson:jackson-jaxrs:jar:${codehaus.jackson.version}</include>
<include>org.codehaus.jackson:jackson-core-asl:jar:${codehaus.jackson.storm.version}</include>
<include>org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.storm.version}</include>
- <include>org.apache.httpcomponents:httpclient:jar:${httpcomponent.httpclient.version}</include>
- <include>org.apache.httpcomponents:httpcore:jar:${httpcomponent.httpcore.version}</include>
- <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include>
+ <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
+ <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
+ <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
<include>org.noggit:noggit:jar:${noggit.version}</include>
<include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include>
<include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include>