incubator-droids-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1348877 - in /incubator/droids/trunk: droids-core/pom.xml droids-core/src/main/java/org/apache/droids/parse/html/LinkExtractor.java droids-norobots/pom.xml droids-solr/pom.xml droids-spring/pom.xml droids-tika/pom.xml pom.xml
Date Mon, 11 Jun 2012 14:48:06 GMT
Author: tobr
Date: Mon Jun 11 14:48:06 2012
New Revision: 1348877

URL: http://svn.apache.org/viewvc?rev=1348877&view=rev
Log:
cleaned up maven poms, removed unused dependencies

Modified:
    incubator/droids/trunk/droids-core/pom.xml
    incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/LinkExtractor.java
    incubator/droids/trunk/droids-norobots/pom.xml
    incubator/droids/trunk/droids-solr/pom.xml
    incubator/droids/trunk/droids-spring/pom.xml
    incubator/droids/trunk/droids-tika/pom.xml
    incubator/droids/trunk/pom.xml

Modified: incubator/droids/trunk/droids-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/pom.xml?rev=1348877&r1=1348876&r2=1348877&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/pom.xml (original)
+++ incubator/droids/trunk/droids-core/pom.xml Mon Jun 11 14:48:06 2012
@@ -65,16 +65,26 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
+      <version>${httpclient.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.nekohtml</groupId>
       <artifactId>nekohtml</artifactId>
+      <version>${nekohtml.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -84,12 +94,18 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
     </dependency>
-    
+    <dependency>
+	    <groupId>org.slf4j</groupId>
+	    <artifactId>jcl-over-slf4j</artifactId>
+	    <version>${slf4j.version}</version>
+    </dependency>    
     <!-- TEST -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/LinkExtractor.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/LinkExtractor.java?rev=1348877&r1=1348876&r2=1348877&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/LinkExtractor.java
(original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/LinkExtractor.java
Mon Jun 11 14:48:06 2012
@@ -25,8 +25,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.droids.LinkTask;
 import org.apache.droids.api.Link;
 import org.slf4j.Logger;

Modified: incubator/droids/trunk/droids-norobots/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-norobots/pom.xml?rev=1348877&r1=1348876&r2=1348877&view=diff
==============================================================================
--- incubator/droids/trunk/droids-norobots/pom.xml (original)
+++ incubator/droids/trunk/droids-norobots/pom.xml Mon Jun 11 14:48:06 2012
@@ -45,6 +45,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/droids/trunk/droids-solr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-solr/pom.xml?rev=1348877&r1=1348876&r2=1348877&view=diff
==============================================================================
--- incubator/droids/trunk/droids-solr/pom.xml (original)
+++ incubator/droids/trunk/droids-solr/pom.xml Mon Jun 11 14:48:06 2012
@@ -27,11 +27,13 @@
   <artifactId>droids-solr</artifactId>
   <name>Apache Droids Solr</name>
   <inceptionYear>2007</inceptionYear>
-  <description>
-   Apache Droids Solr Integration
-  </description>
+  <description>Apache Droids Solr Integration</description>
   <packaging>jar</packaging>  
 
+  <properties>
+    <solr-release-version>3.6.0</solr-release-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.droids</groupId>
@@ -42,6 +44,19 @@
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
       <version>${solr-release-version}</version>
+      <exclusions>
+      	<exclusion>
+      		<artifactId>commons-logging</artifactId>
+      		<groupId>commons-logging</groupId>
+      	</exclusion>
+      </exclusions>
+    </dependency>
+    <!-- FOR TESTING -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
@@ -55,19 +70,11 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-<!-- FOR TESTING -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.6.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-    	<groupId>net.sourceforge.nekohtml</groupId>
-    	<artifactId>nekohtml</artifactId>
-    </dependency>
   </dependencies>
-
-  <properties>
-    <solr-release-version>3.6.0</solr-release-version>
-  </properties>
 </project>

Modified: incubator/droids/trunk/droids-spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-spring/pom.xml?rev=1348877&r1=1348876&r2=1348877&view=diff
==============================================================================
--- incubator/droids/trunk/droids-spring/pom.xml (original)
+++ incubator/droids/trunk/droids-spring/pom.xml Mon Jun 11 14:48:06 2012
@@ -27,10 +27,31 @@
   <artifactId>droids-spring</artifactId>
   <name>Apache Droids Spring</name>
   <inceptionYear>2007</inceptionYear>
-  <description>
-   Apache Droids Spring Integration
-  </description>
+  <description>Apache Droids Spring Integration</description>
   <packaging>jar</packaging>  
+  
+  <properties>
+    <cocoon-spring-configurator.version>2.1.0</cocoon-spring-configurator.version>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>appassembler-maven-plugin</artifactId>
+        <version>1.1.1</version>
+        <configuration>
+          <repositoryLayout>flat</repositoryLayout>
+          <programs>
+            <program>
+              <mainClass>org.apache.droids.dynamic.Cli</mainClass>
+              <name>cli</name>
+            </program>
+          </programs>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
   <dependencies>
     <dependency>
@@ -39,16 +60,15 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
+      <version>${cocoon-spring-configurator.version}</version>
     </dependency>
+    <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -58,24 +78,12 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.6.4</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>appassembler-maven-plugin</artifactId>
-        <version>1.1.1</version>
-        <configuration>
-          <repositoryLayout>flat</repositoryLayout>
-          <programs>
-            <program>
-              <mainClass>org.apache.droids.dynamic.Cli</mainClass>
-              <name>cli</name>
-            </program>
-          </programs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   
 </project>

Modified: incubator/droids/trunk/droids-tika/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-tika/pom.xml?rev=1348877&r1=1348876&r2=1348877&view=diff
==============================================================================
--- incubator/droids/trunk/droids-tika/pom.xml (original)
+++ incubator/droids/trunk/droids-tika/pom.xml Mon Jun 11 14:48:06 2012
@@ -27,18 +27,15 @@
   <artifactId>droids-tika</artifactId>
   <name>Apache Droids Tika</name>
   <inceptionYear>2007</inceptionYear>
-  <description>
-   Apache Droids Tika Parser
-  </description>
+  <description>Apache Droids Tika Parser</description>
   <packaging>jar</packaging>  
 
+  <properties>
+    <tika-release-version>1.1</tika-release-version>
+  </properties>
+
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.droids</groupId>
       <artifactId>droids-core</artifactId>
       <version>${project.version}</version>
@@ -52,9 +49,19 @@
     	<groupId>org.apache.tika</groupId>
     	<artifactId>tika-parsers</artifactId>
     	<version>${tika-release-version}</version>
+    	<exclusions>
+    		<exclusion>
+    			<artifactId>commons-logging</artifactId>
+    			<groupId>commons-logging</groupId>
+    		</exclusion>
+    	</exclusions>
+    </dependency>
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
-  <properties>
-    <tika-release-version>1.1</tika-release-version>
-  </properties>
 </project>

Modified: incubator/droids/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/pom.xml?rev=1348877&r1=1348876&r2=1348877&view=diff
==============================================================================
--- incubator/droids/trunk/pom.xml (original)
+++ incubator/droids/trunk/pom.xml Mon Jun 11 14:48:06 2012
@@ -180,70 +180,13 @@
     <maven.compile.target>1.6</maven.compile.target>
     <maven.compile.optimize>true</maven.compile.optimize>
     <maven.compile.deprecation>true</maven.compile.deprecation>
-    <commons-logging.version>1.1.1</commons-logging.version>
     <commons-io.version>2.1</commons-io.version>
-    <httpclient.version>4.0.1</httpclient.version>
+    <httpclient.version>4.2</httpclient.version>
     <nekohtml.version>1.9.15</nekohtml.version>
-    <log4j.version>1.2.16</log4j.version>
-    <spring-conf.version>2.1.0</spring-conf.version>
+    <slf4j.version>1.6.4</slf4j.version>
     <junit.version>4.10</junit.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons-logging.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commons-io.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>${httpclient.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>net.sourceforge.nekohtml</groupId>
-        <artifactId>nekohtml</artifactId>
-        <version>${nekohtml.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.6.4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-spring-configurator</artifactId>
-        <version>${spring-conf.version}</version>
-      </dependency>
-
-      <!-- TESTING -->
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-
   <build>
     <plugins>
       <plugin>



Mime
View raw message