svn commit: r1305681 - in /lucene/dev/branches/branch_3x/dev-tools/maven: pom.xml.template solr/core/pom.xml.template solr/solrj/pom.xml.template

[sa...@apache.org]

Author: sarowe
Date: Mon Mar 26 23:50:16 2012
New Revision: 1305681

URL: http://svn.apache.org/viewvc?rev=1305681&view=rev
Log:
SOLR-2020: Maven configuration:
* Switched the scope from runtime to compile for the two httpcomponents dependencies in the solrj POM - compilation fails unless these are on the classpath.
* Removed commons-httpclient dependency from the solr-core POM. It gets this dependency transitively through solrj.
* Added the two httpcomponents dependencies with test scope to the POM for solr-core (under which all Solr tests are run in the Maven build, including those of solrj); otherwise tests fail, because these are optional dependencies of solrj, and are not transitively included on the test classpath.
* Added a httpcomponents.version property to the Lucene/Solr grandparent POM, and used it in the <dependencyManagement> declarations for the two httpcomponents dependencies.

Modified:
    lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
    lucene/dev/branches/branch_3x/dev-tools/maven/solr/core/pom.xml.template
    lucene/dev/branches/branch_3x/dev-tools/maven/solr/solrj/pom.xml.template

Modified: lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template?rev=1305681&r1=1305680&r2=1305681&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template Mon Mar 26 23:50:16 2012
@@ -45,6 +45,7 @@
     <patched.jetty.version>6.1.26-patched-JETTY-1340</patched.jetty.version>
     <slf4j.version>1.6.1</slf4j.version>
     <tika.version>1.0</tika.version>
+    <httpcomponents.version>4.1.3</httpcomponents.version>
   </properties>
   <issueManagement>
     <system>JIRA</system>
@@ -157,12 +158,12 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>4.1.3</version>
+        <version>${httpcomponents.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpmime</artifactId>
-        <version>4.1.3</version>
+        <version>${httpcomponents.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>

Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/core/pom.xml.template?rev=1305681&r1=1305680&r2=1305681&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/core/pom.xml.template Mon Mar 26 23:50:16 2012
@@ -124,16 +124,6 @@
       <artifactId>commons-fileupload</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
@@ -174,6 +164,24 @@
       <artifactId>easymock</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <!-- This is a test scope dependency because solrj declares it as an optional dependency -->
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- This is a test scope dependency because solrj declares it as an optional dependency -->
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <directory>${build-directory}</directory>

Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/solrj/pom.xml.template?rev=1305681&r1=1305680&r2=1305681&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/solrj/pom.xml.template Mon Mar 26 23:50:16 2012
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <scope>runtime</scope>
+      <!-- HttpSolrServer requires this dependency. -->
       <optional>true</optional>
       <exclusions>
         <exclusion>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
-      <scope>runtime</scope>
+      <!-- HttpSolrServer requires this dependency. -->
       <optional>true</optional>
     </dependency>
     <!-- Technically, this is optional in SolrJ; but it's fast. SOLR-2852 -->