Author: mattmann
Date: Sat Jun 4 18:18:40 2011
New Revision: 1131458
URL: http://svn.apache.org/viewvc?rev=1131458&view=rev
Log:
Apply finishing touches from NUTCh-955: Generate POM file using the Ivy makepom
task
Modified:
nutch/branches/branch-1.3/build.xml
nutch/branches/branch-1.3/default.properties
nutch/branches/branch-1.3/ivy/ivy.xml
nutch/branches/branch-1.3/pom.xml
Modified: nutch/branches/branch-1.3/build.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/build.xml?rev=1131458&r1=1131457&r2=1131458&view=diff
==============================================================================
--- nutch/branches/branch-1.3/build.xml (original)
+++ nutch/branches/branch-1.3/build.xml Sat Jun 4 18:18:40 2011
@@ -205,6 +205,13 @@
<!-- -->
<!-- ================================================================== -->
<target name="deploy" depends="release" description="deploy to Apache Nexus">
+
+ <!-- generate a pom file -->
+ <ivy:makepom ivyfile="${ivy.file}" pomfile="${basedir}/pom.xml"
templatefile="ivy/mvn.template">
+ <mapping conf="default" scope="compile"/>
+ <mapping conf="runtime" scope="runtime"/>
+ </ivy:makepom>
+
<!-- sign and deploy the main artifact -->
<artifact:mvn>
<arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
Modified: nutch/branches/branch-1.3/default.properties
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/default.properties?rev=1131458&r1=1131457&r2=1131458&view=diff
==============================================================================
--- nutch/branches/branch-1.3/default.properties (original)
+++ nutch/branches/branch-1.3/default.properties Sat Jun 4 18:18:40 2011
@@ -1,4 +1,3 @@
-Name=Nutch
name=nutch
version=1.3
final.name=${name}-${version}
@@ -44,7 +43,7 @@ runtime.dir=./runtime
runtime.deploy=${runtime.dir}/deploy
runtime.local=${runtime.dir}/local
-ivy.version=2.1.0
+ivy.version=2.2.0
ivy.dir=${basedir}/ivy
ivy.file=${ivy.dir}/ivy.xml
ivy.jar=${ivy.dir}/ivy-${ivy.version}.jar
Modified: nutch/branches/branch-1.3/ivy/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/ivy/ivy.xml?rev=1131458&r1=1131457&r2=1131458&view=diff
==============================================================================
--- nutch/branches/branch-1.3/ivy/ivy.xml (original)
+++ nutch/branches/branch-1.3/ivy/ivy.xml Sat Jun 4 18:18:40 2011
@@ -12,12 +12,12 @@
language governing permissions and limitations under the License. -->
<ivy-module version="1.0">
- <info organisation="org.apache.nutch" module="${ant.project.name}">
- <license name="Apache 2.0" />
+ <info organisation="org.apache.nutch" module="nutch">
+ <license name="Apache 2.0"
url="http://www.apache.org/licenses/LICENSE-2.0.txt/"/>
<ivyauthor name="Apache Nutch Team"
url="http://nutch.apache.org"; />
- <description>
- Apache Nutch
- </description>
+ <description homepage="http://nutch.apache.org";>Nutch is an
open source web-search software. It builds on
+ Hadoop, Tika and Solr, adding web-specifics, such as a crawler,
a link-graph database etc.
+ </description>
</info>
<configurations>
Modified: nutch/branches/branch-1.3/pom.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/pom.xml?rev=1131458&r1=1131457&r2=1131458&view=diff
==============================================================================
--- nutch/branches/branch-1.3/pom.xml (original)
+++ nutch/branches/branch-1.3/pom.xml Sat Jun 4 18:18:40 2011
@@ -15,33 +15,28 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.nutch</groupId>
- <artifactId>nutch</artifactId>
- <packaging>jar</packaging>
- <name>Apache Nutch</name>
- <version>1.3</version>
- <description>Nutch is open source web-search software. It builds on
- Lucene and Solr, adding web-specifics, such as a crawler, a link-graph
- database, parsers for HTML and other document formats, etc.
- </description>
- <url>http://maven.apache.org</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt
- </url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <url>http://svn.apache.org/viewvc/nutch
- </url>
- <connection>http://svn.apache.org/viewvc/nutch
- </connection>
- </scm>
- <developers>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.nutch</groupId>
+ <artifactId>nutch</artifactId>
+ <packaging>jar</packaging>
+ <version>1.3</version>
+ <name>Apache Nutch</name>
+ <url>http://nutch.apache.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://svn.apache.org/viewvc/nutch</url>
+ <connection>http://svn.apache.org/viewvc/nutch</connection>
+ </scm>
+ <developers>
<developer>
<id>ab</id>
<name>Andrzej Bialecki</name>
@@ -59,7 +54,7 @@
</developer>
<developer>
<id>dogacan</id>
- <name>Dogacan Güney</name>
+ <name>Dogacan Gâºney</name>
<email>[email protected]</email>
</developer>
<developer>
@@ -69,7 +64,7 @@
</developer>
<developer>
<id>otis</id>
- <name>Otis GospodnetiÄ</name>
+ <name>Otis GospodnetiÆá</name>
<email>[email protected]</email>
</developer>
<developer>
@@ -88,217 +83,136 @@
<email>[email protected]</email>
</developer>
</developers>
- <dependencies>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.11</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>0.20.2</version>
- <exclusions>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.kosmosfs</groupId>
- <artifactId>kfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-misc</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- <version>0.9</version>
- <exclusions>
- <exclusion>
- <groupId>org.sun.jdmk</groupId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <exclusions>
- <exclusion>
- <groupId>org.sun.jdmk</groupId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>com.healthmarketscience.sqlbuilder</groupId>
- <artifactId>sqlbuilder</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.22</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>0.20.2</version>
- <exclusions>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.kosmosfs</groupId>
- <artifactId>kfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.22</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.22</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>6.1.22</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.gora</groupId>
- <artifactId>gora-sql</artifactId>
- <version>0.1-incubating</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>src/testresources</directory>
+ </testResource>
+ </testResources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>3.1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.5</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>0.20.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>4.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>0.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>6.1.22</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.6.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>0.20.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.22</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.22</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
</project>
+
