lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1516264 - in /lucene/dev/trunk: dev-tools/maven/solr/core/src/java/pom.xml.template solr/CHANGES.txt solr/core/ivy.xml
Date Wed, 21 Aug 2013 19:12:43 GMT
Author: sarowe
Date: Wed Aug 21 19:12:42 2013
New Revision: 1516264

URL: http://svn.apache.org/r1516264
Log:
SOLR-5173: Solr-core's Maven configuration includes test-only Hadoop dependencies as indirect
compile-time dependencies

Modified:
    lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/ivy.xml

Modified: lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1516264&r1=1516263&r2=1516264&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template Wed Aug 21 19:12:42
2013
@@ -166,13 +166,21 @@
           <artifactId>servlet-api</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-math</artifactId>
         </exclusion>
         <exclusion>
           <groupId>xmlenc</groupId>
           <artifactId>xmlenc</artifactId>                                  
-        </exclusion>                                                          
+        </exclusion>
+        <exclusion>
+          <groupId>commons-configuration</groupId>
+          <artifactId>commons-configuration</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
@@ -194,6 +202,14 @@
           <artifactId>jersey-server</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty-util</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>tomcat</groupId>
           <artifactId>jasper-compiler</artifactId>
         </exclusion>
@@ -252,6 +268,10 @@
           <artifactId>servlet-api</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>com.sun.jersey</groupId>
           <artifactId>jersey-core</artifactId>
         </exclusion>
@@ -272,6 +292,14 @@
           <artifactId>jackson-mapper-asl</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty-util</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>tomcat</groupId>
           <artifactId>jasper-runtime</artifactId>
         </exclusion>
@@ -323,17 +351,6 @@
       <optional>true</optional> <!-- Only used for tests and one command-line
utility: JettySolrRunner -->
     </dependency>
     <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>stax</groupId>
-          <artifactId>stax-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <!-- SOLR-3263: Provided scope is required to avoid jar signing conflicts -->

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1516264&r1=1516263&r2=1516264&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Aug 21 19:12:42 2013
@@ -176,6 +176,9 @@ Other Changes
 * The routing parameter "shard.keys" is deprecated as part of SOLR-5017 .The new parameter
name is '_route_' .
   The old parameter should continue to work for another release  (Noble Paul)
 
+* SOLR-5173: Solr-core's Maven configuration includes test-only Hadoop
+  dependencies as indirect compile-time dependencies.
+  (Chris Collins, Steve Rowe)
 
 ==================  4.4.0 ==================
 

Modified: lucene/dev/trunk/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1516264&r1=1516263&r2=1516264&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/ivy.xml (original)
+++ lucene/dev/trunk/solr/core/ivy.xml Wed Aug 21 19:12:42 2013
@@ -25,9 +25,9 @@
   <configurations>
     <!-- artifacts in the "compile" and "compile.hadoop" configurations will go into solr/core/lib/
-->
     <conf name="compile" transitive="false"/>
-    <conf name="test" transitive="false"/>
     <conf name="compile.hadoop" transitive="false"/>
     <!-- artifacts in the "test" and "test.DfsMiniCluster" configuration will go into
solr/core/test-lib/ -->
+    <conf name="test" transitive="false"/>
     <conf name="test.DfsMiniCluster" transitive="false"/>
   </configurations>
 
@@ -49,6 +49,11 @@
     <dependency org="org.objenesis" name="objenesis" rev="1.2" conf="test->*"/>
 
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="&hadoop.version;"
conf="compile.hadoop->*"/>
+    <!--
+      hadoop-hdfs, hadoop-annotations and hadoop-auth are runtime dependencies,
+      so even though they are not compile-time dependencies, they are included
+      here as such so that they are included in the runtime distribution.
+     -->
     <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="&hadoop.version;"
conf="compile.hadoop->*"/>
     <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="&hadoop.version;"
conf="compile.hadoop->*"/>
     <dependency org="org.apache.hadoop" name="hadoop-auth" rev="&hadoop.version;"
conf="compile.hadoop->*"/>



Mime
View raw message