lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1461830 - in /lucene/dev/trunk/dev-tools/maven: pom.xml.template solr/core/src/java/pom.xml.template solr/pom.xml.template solr/solrj/src/java/pom.xml.template solr/webapp/pom.xml.template
Date Wed, 27 Mar 2013 20:01:17 GMT
Author: sarowe
Date: Wed Mar 27 20:01:17 2013
New Revision: 1461830

URL: http://svn.apache.org/r1461830
Log:
SOLR-3706: Maven configuration: sync with Ant build

Modified:
    lucene/dev/trunk/dev-tools/maven/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/core/src/java/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template

Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1461830&r1=1461829&r2=1461830&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Wed Mar 27 20:01:17 2013
@@ -45,7 +45,8 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
     <java.compat.version>1.7</java.compat.version>
     <jetty.version>8.1.8.v20121106</jetty.version>
-    <slf4j.version>1.6.4</slf4j.version>
+    <slf4j.version>1.6.6</slf4j.version>
+    <log4j.version>1.2.16</log4j.version>
     <tika.version>1.3</tika.version>
     <httpcomponents.version>4.2.3</httpcomponents.version>
     <commons-io.version>2.1</commons-io.version>
@@ -413,20 +414,25 @@
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <artifactId>jul-to-slf4j</artifactId>
         <version>${slf4j.version}</version>
-      </dependency> 
+      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-jdk14</artifactId>
+        <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
-      </dependency> 
+      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
+        <artifactId>slf4j-log4j12</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
       <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>javax.servlet</artifactId>
         <version>3.0.0.v201112011016</version>

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=1461830&r1=1461829&r2=1461830&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 Mar 27 20:01:17
2013
@@ -71,6 +71,7 @@
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers-morfologik</artifactId>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
@@ -146,14 +147,6 @@
       <version>${restlet.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>

Modified: lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template?rev=1461830&r1=1461829&r2=1461830&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template Wed Mar 27 20:01:17 2013
@@ -86,12 +86,28 @@
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <scope>test</scope>
+      <artifactId>slf4j-log4j12</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <optional>true</optional>
     </dependency>
   </dependencies>
   <build>

Modified: lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template?rev=1461830&r1=1461829&r2=1461830&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/solrj/src/java/pom.xml.template Wed Mar 27 20:01:17
2013
@@ -77,11 +77,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>

Modified: lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template?rev=1461830&r1=1461829&r2=1461830&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/webapp/pom.xml.template Wed Mar 27 20:01:17 2013
@@ -57,15 +57,6 @@
       <artifactId>javax.servlet</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <directory>${build-directory}</directory>



Mime
View raw message