RANGER-574: resubmitting the additional jar as the htrace lib should be bundled from org.apache.htrace and not from org.htrace
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/07ab4e8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/07ab4e8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/07ab4e8f Branch: refs/heads/tag-policy Commit: 07ab4e8f24406b46fb7a1d738c21487c2053ac79 Parents: bfe4ab2 Author: sneethiraj <[email protected]> Authored: Wed Jul 1 12:28:43 2015 -0400 Committer: sneethiraj <[email protected]> Committed: Wed Jul 1 12:28:43 2015 -0400 ---------------------------------------------------------------------- kms/pom.xml | 4 ++-- knox-agent/pom.xml | 2 +- pom.xml | 2 +- src/main/assembly/kms.xml | 6 +++--- src/main/assembly/knox-agent.xml | 2 +- src/main/assembly/storm-agent.xml | 2 +- storm-agent/pom.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/07ab4e8f/kms/pom.xml ---------------------------------------------------------------------- diff --git a/kms/pom.xml b/kms/pom.xml index 877ad95..b89837d 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -332,9 +332,9 @@ <version>${hadoop-auth.version}</version> </dependency> <dependency> - <groupId>org.htrace</groupId> + <groupId>org.apache.htrace</groupId> <artifactId>htrace-core</artifactId> - <version>3.0.4</version> + <version>${htrace-core.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/07ab4e8f/knox-agent/pom.xml ---------------------------------------------------------------------- diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index 85506df..9e85527 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -105,7 +105,7 @@ <version>${hadoop.version}</version> </dependency> <dependency> - <groupId>org.htrace</groupId> + <groupId>org.apache.htrace</groupId> <artifactId>htrace-core</artifactId> <version>${htrace-core.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/07ab4e8f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 99a23b2..2ae8d3d 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ <hadoop-common.version>2.7.0</hadoop-common.version> <hadoop-common-kms.version>2.7.0</hadoop-common-kms.version> <hadoop.version>2.7.0</hadoop.version> - <htrace-core.version>3.0.4</htrace-core.version> + <htrace-core.version>3.1.0-incubating</htrace-core.version> <hamcrest.all.version>1.3</hamcrest.all.version> <hbase.version>1.1.0</hbase.version> <hive.version>1.2.0</hive.version> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/07ab4e8f/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index 33da248..52ab5a0 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -81,7 +81,7 @@ <include>org.apache.curator:curator-recipes</include> <include>com.google.code.gson:gson</include> <include>org.apache.hadoop:hadoop-annotations</include> - <include>org.htrace:htrace-core</include> + <include>org.apache.htrace:htrace-core</include> <include>org.apache.httpcomponents:httpcore</include> <include>org.codehaus.jackson:jackson-core-asl</include> <include>org.codehaus.jackson:jackson-jaxrs</include> @@ -103,7 +103,7 @@ <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> - <include>org.htrace:htrace-core:jar:${htrace-core.version}</include> + <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include> </includes> </dependencySet> </dependencySets> @@ -139,7 +139,7 @@ <include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include> <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include> <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> - <include>org.htrace:htrace-core:jar:${htrace-core.version}</include> + <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include> </includes> <unpack>false</unpack> </dependencySet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/07ab4e8f/src/main/assembly/knox-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml index d21487a..7c08270 100644 --- a/src/main/assembly/knox-agent.xml +++ b/src/main/assembly/knox-agent.xml @@ -39,7 +39,7 @@ <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> - <include>org.htrace:htrace-core:jar:${htrace-core.version}</include> + <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include> </includes> <unpack>false</unpack> </dependencySet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/07ab4e8f/src/main/assembly/storm-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml index 8753e43..aacdb78 100644 --- a/src/main/assembly/storm-agent.xml +++ b/src/main/assembly/storm-agent.xml @@ -54,7 +54,7 @@ <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> - <include>org.htrace:htrace-core:jar:${htrace-core.version}</include> + <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include> <include>commons-cli:commons-cli:jar:${commons.cli.version}</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/07ab4e8f/storm-agent/pom.xml ---------------------------------------------------------------------- diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml index b59bd8c..5fd0aa3 100644 --- a/storm-agent/pom.xml +++ b/storm-agent/pom.xml @@ -63,7 +63,7 @@ <version>${commons.cli.version}</version> </dependency> <dependency> - <groupId>org.htrace</groupId> + <groupId>org.apache.htrace</groupId> <artifactId>htrace-core</artifactId> <version>${htrace-core.version}</version> </dependency>
