Repository: sentry Updated Branches: refs/heads/master 35e9d48cd -> 4583c26ad
Revert "SENTRY-2079: Sentry HA leader monitor does not work due to a mix of curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar kalvagadda, Na Li)" This reverts commit 989cb7f3551ebd895fbda668665778104e4d6db9. Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/da879a0c Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/da879a0c Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/da879a0c Branch: refs/heads/master Commit: da879a0cc4a960636f02084f3ed1f0ae66b885da Parents: 35e9d48 Author: Sergio Pena <[email protected]> Authored: Fri Dec 1 09:42:49 2017 -0600 Committer: Sergio Pena <[email protected]> Committed: Fri Dec 1 09:42:49 2017 -0600 ---------------------------------------------------------------------- pom.xml | 39 +- sentry-binding/sentry-binding-solr/pom.xml | 6 - .../dependency-reduced-pom.xml | 624 ------------------- sentry-provider/sentry-provider-db/pom.xml | 37 -- sentry-tests/sentry-tests-solr/pom.xml | 1 - 5 files changed, 29 insertions(+), 678 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/da879a0c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 40d96e3..cdd76c2 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,6 @@ limitations under the License. <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version> <maven.eclipse.plugin.version>2.9</maven.eclipse.plugin.version> <maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version> - <maven.shade.plugin.version>2.4.3</maven.shade.plugin.version> <metrics.version>3.0.2</metrics.version> <mockito.version>1.8.5</mockito.version> <objenesis.version>1.2</objenesis.version> @@ -447,10 +446,6 @@ limitations under the License. <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> </exclusion> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -636,11 +631,6 @@ limitations under the License. <version>${curator.version}</version> </dependency> <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> - <version>${curator.version}</version> - </dependency> - <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> @@ -828,6 +818,35 @@ limitations under the License. </execution> </executions> </plugin> + +<!--- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>org.apache.thrift:libthrift</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>org.apache.thrift</pattern> + <shadedPattern>sentry.org.apache.thrift</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> +--> </plugins> <pluginManagement> http://git-wip-us.apache.org/repos/asf/sentry/blob/da879a0c/sentry-binding/sentry-binding-solr/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-solr/pom.xml b/sentry-binding/sentry-binding-solr/pom.xml index f086699..c0367f1 100644 --- a/sentry-binding/sentry-binding-solr/pom.xml +++ b/sentry-binding/sentry-binding-solr/pom.xml @@ -33,12 +33,6 @@ limitations under the License. <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> <version>${solr.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/sentry/blob/da879a0c/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml b/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml deleted file mode 100644 index f40ec32..0000000 --- a/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml +++ /dev/null @@ -1,624 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <parent> - <artifactId>sentry-provider</artifactId> - <groupId>org.apache.sentry</groupId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>sentry-provider-db</artifactId> - <name>Sentry Provider DB</name> - <build> - <sourceDirectory>${basedir}/src/main/java</sourceDirectory> - <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> - <resources> - <resource> - <directory>${basedir}/src/main/java/org/apache/sentry/provider/db/service/model</directory> - <includes> - <include>package.jdo</include> - </includes> - </resource> - <resource> - <directory>${basedir}/src/main</directory> - <includes> - <include>webapp/*</include> - <include>webapp/css/*</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>com.google.code.maven-replacer-plugin</groupId> - <artifactId>replacer</artifactId> - <version>1.5.2</version> - <executions> - <execution> - <id>replaceTokens</id> - <phase>clean</phase> - <goals> - <goal>replace</goal> - </goals> - </execution> - </executions> - <configuration> - <file>${basedir}/src/main/webapp/SentryService.html</file> - <replacements> - <replacement> - <token>%PROJECT_VERSION%</token> - <value>${project.version}</value> - </replacement> - </replacements> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/gen/thrift/gen-javabean</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-maven-plugin</artifactId> - <version>${datanucleus.maven.plugin.version}</version> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>enhance</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-core</artifactId> - <version>${datanucleus-core.version}</version> - </dependency> - </dependencies> - <configuration> - <api>JDO</api> - <metadataIncludes>**/*.jdo</metadataIncludes> - <verbose>true</verbose> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <reuseForks>false</reuseForks> - </configuration> - </plugin> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <version>2.3</version> - <executions> - <execution> - <id>curator-shade</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <includes> - <include>org.apache.curator:curator-recipes</include> - <include>org.apache.curator:curator-x-discovery</include> - <include>org.apache.curator:curator-framework</include> - <include>org.apache.curator:curator-client</include> - </includes> - </artifactSet> - <relocations> - <relocation> - <pattern>org.apache.curator</pattern> - <shadedPattern>sentry.org.apache.curator</shadedPattern> - </relocation> - </relocations> - <shadedArtifactAttached>false</shadedArtifactAttached> - </configuration> - </execution> - <execution> - <id>thrift-shade</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <includes> - <include>org.apache.thrift:libthrift</include> - <include>org.apache.sentry:sentry-core-common</include> - </includes> - </artifactSet> - <relocations> - <relocation> - <pattern>org.apache.thrift</pattern> - <shadedPattern>sentry.org.apache.thrift</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.sentry.core.common</pattern> - <shadedPattern>sentry.org.apache.sentry.core.common</shadedPattern> - </relocation> - </relocations> - <shadedArtifactAttached>true</shadedArtifactAttached> - <shadedClassifierName>sh</shadedClassifierName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>thriftif</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-thrift-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <taskdef /> - <property /> - <property /> - <delete /> - <mkdir /> - <for> - <path> - <fileset /> - </path> - <sequential> - <echo /> - <exec> - <arg /> - </exec> - </sequential> - </for> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-property</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireProperty> - <property>thrift.home</property> - </requireProperty> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.jolbox</groupId> - <artifactId>bonecp</artifactId> - <version>0.8.0.RELEASE</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>3.0.0-alpha3-cdh6.x-SNAPSHOT</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>curator-client</artifactId> - <groupId>org.apache.curator</groupId> - </exclusion> - <exclusion> - <artifactId>curator-framework</artifactId> - <groupId>org.apache.curator</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>3.0.0-alpha3-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>hamcrest-core</artifactId> - <groupId>org.hamcrest</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.13.1.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - <version>1.4.0</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>commons-beanutils</artifactId> - <groupId>commons-beanutils</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>14.0.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.25</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.7.25</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-core</artifactId> - <version>4.1.17</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-api-jdo</artifactId> - <version>4.2.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-rdbms</artifactId> - <version>4.1.17</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.datanucleus</groupId> - <artifactId>javax.jdo</artifactId> - <version>3.2.0-m3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-core-common</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-core-model-db</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-core-model-solr</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-core-model-kafka</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-provider-common</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-provider-file</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-policy-engine</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-binding-hive-conf</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-binding-hive-follower</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-hdfs-common</artifactId> - <version>2.0.0-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-shims</artifactId> - <version>2.1.1-cdh6.x-SNAPSHOT</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>apache-curator</artifactId> - <groupId>org.apache.curator</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-1.2-api</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-api</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-core</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-slf4j-impl</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-web</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>hive-shims-common</artifactId> - <groupId>org.apache.hive.shims</groupId> - </exclusion> - <exclusion> - <artifactId>hive-shims-0.23</artifactId> - <groupId>org.apache.hive.shims</groupId> - </exclusion> - <exclusion> - <artifactId>hive-shims-scheduler</artifactId> - <groupId>org.apache.hive.shims</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-beeline</artifactId> - <version>2.1.1-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>hive-metastore</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>hive-serde</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>hive-common</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>hive-serde</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>hive-shims</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-service</artifactId> - <version>2.1.1-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>jetty-all</artifactId> - <groupId>org.eclipse.jetty.aggregate</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-server-extensions</artifactId> - <version>2.1.1-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>0.9.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>ant-contrib</groupId> - <artifactId>ant-contrib</artifactId> - <version>1.0b3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minikdc</artifactId> - <version>3.0.0-alpha3-cdh6.x-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.codahale.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>3.0.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.codahale.metrics</groupId> - <artifactId>metrics-servlets</artifactId> - <version>3.0.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.codahale.metrics</groupId> - <artifactId>metrics-jvm</artifactId> - <version>3.0.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>9.3.20.v20170531</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>9.3.20.v20170531</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>9.3.20.v20170531</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>9.3.20.v20170531</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-test</artifactId> - <version>2.11.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-pool2</artifactId> - <version>2.4.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-common</artifactId> - <version>2.1.1-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>jetty-all</artifactId> - <groupId>org.eclipse.jetty.aggregate</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-1.2-api</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-api</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-core</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-slf4j-impl</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-web</artifactId> - <groupId>org.apache.logging.log4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> - <version>2.1.1-cdh6.x-SNAPSHOT</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>jdo-api</artifactId> - <groupId>javax.jdo</groupId> - </exclusion> - </exclusions> - </dependency> - </dependencies> -</project> - http://git-wip-us.apache.org/repos/asf/sentry/blob/da879a0c/sentry-provider/sentry-provider-db/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/pom.xml b/sentry-provider/sentry-provider-db/pom.xml index 192f8c8..c168cb2 100644 --- a/sentry-provider/sentry-provider-db/pom.xml +++ b/sentry-provider/sentry-provider-db/pom.xml @@ -226,10 +226,6 @@ limitations under the License. <artifactId>curator-test</artifactId> </dependency> <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-pool2</artifactId> </dependency> @@ -361,39 +357,6 @@ limitations under the License. <reuseForks>false</reuseForks> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${maven.shade.plugin.version}</version> - <executions> - <execution> - <id>curator-shade</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <includes> - <!-- This is needed to support projects running on different versions of curator --> - <include>org.apache.curator:curator-recipes</include> - <include>org.apache.curator:curator-x-discovery</include> - <include>org.apache.curator:curator-framework</include> - <include>org.apache.curator:curator-client</include> - </includes> - </artifactSet> - <relocations> - <!-- Adding prefix to the package to make it unique --> - <relocation> - <pattern>org.apache.curator</pattern> - <shadedPattern>sentry.org.apache.curator</shadedPattern> - </relocation> - </relocations> - <shadedArtifactAttached>false</shadedArtifactAttached> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> <profiles> http://git-wip-us.apache.org/repos/asf/sentry/blob/da879a0c/sentry-tests/sentry-tests-solr/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-solr/pom.xml b/sentry-tests/sentry-tests-solr/pom.xml index 5ef7a2b..3cdf76d 100644 --- a/sentry-tests/sentry-tests-solr/pom.xml +++ b/sentry-tests/sentry-tests-solr/pom.xml @@ -148,7 +148,6 @@ limitations under the License. <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-test-framework</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.solr</groupId>
