RANGER-178 Enable building of Solr Authorization plugin

yzhou2001 · Jun 5, 2015 · d085099 · d085099
1 parent 5a743e0
commit d085099
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/plugin-solr/pom.xml b/plugin-solr/pom.xml
@@ -45,11 +45,7 @@
 		<dependency>
 			<groupId>org.apache.solr</groupId>
 			<artifactId>solr-core</artifactId>
-			<version>6.0</version>
-			<scope>system</scope>
-			<systemPath>/Users/bdurai/svn/solr/trunk/solr/build/solr-core/solr-core-6.0.0-SNAPSHOT.jar</systemPath>
+			<version>${solr.version}</version>
 		</dependency>
-		<!-- <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> 
-			<version>${solr.version}</version> </dependency> -->
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -90,6 +90,7 @@
   <module>plugin-yarn</module>
   <module>ranger_solrj</module>
   <module>security-admin</module>
+  <module>plugin-solr</module>
   <module>ugsync</module>
   <module>unixauthclient</module>
   <module>unixauthservice</module>
@@ -147,6 +148,7 @@
 		<jersey-client.version>2.6</jersey-client.version>
 		<junit.version>4.11</junit.version>
 		<kafka.version>0.8.2.0</kafka.version>
+		<!--<kafka.version>0.8.2.2.3.0.0-2208</kafka.version>-->
 		<mockito.version>1.8.4</mockito.version>
 		<hamcrest-version>1.3</hamcrest-version>
 		<knox.gateway.version>0.6.0</knox.gateway.version>
@@ -158,7 +160,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<security-agent-install-dir>hadoop-security/plugins</security-agent-install-dir>
 		<slf4j-api.version>1.7.5</slf4j-api.version>
-		<solr.version>5.1.0</solr.version>
+		<solr.version>5.2.0</solr.version>
 		<ranger.solrj.version>${project.version}</ranger.solrj.version>
 		<springframework.spring.version>2.5.6</springframework.spring.version>
 		<!--
@@ -216,12 +218,14 @@
             <module>unixauthnative</module>
           </modules>
       </profile>
+<!--
       <profile>
           <id>solr-security</id>
          <modules>
         	 <module>plugin-solr</module>         
          </modules>
       </profile>
+-->
       <profile>
           <id>kafka-security</id>
          <modules>
@@ -256,6 +260,31 @@
                 <enabled>false</enabled>
             </snapshots>
           </repository>
+	  <repository>
+            <id>apache.solr.rc</id>
+            <name>Apache Solr RC builds</name>
+            <url>https://dist.apache.org/repos/dist/dev/lucene/lucene-solr-5.2.0-RC4-rev1683206/solr/maven</url>
+            <releases>
+            	<enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+          </repository>
+	  <repository>
+            <id>apache.lucene.rc</id>
+            <name>Apache Lucene RC builds</name>
+            <url>https://dist.apache.org/repos/dist/dev/lucene/lucene-solr-5.2.0-RC4-rev1683206/lucene/maven</url>
+            <releases>
+            	<enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+          </repository>
+
+
+
   </repositories>
 	<dependencyManagement>
 		<dependencies>