Repository: nutch Updated Branches: refs/heads/master 1604cab7f -> 7956daee8
Prepare for Nutch 1.12 RC#1 Project: http://git-wip-us.apache.org/repos/asf/nutch/repo Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/7956daee Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/7956daee Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/7956daee Branch: refs/heads/master Commit: 7956daee8ac91180070f92949ecf99deae9b5ef0 Parents: 1604cab Author: Lewis John McGibbney <[email protected]> Authored: Thu Jun 2 21:12:10 2016 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Thu Jun 2 21:12:10 2016 -0700 ---------------------------------------------------------------------- default.properties | 4 ++-- ivy/ivy.xml | 2 +- ivy/mvn.template | 33 ++++++++++++++++++++------------- 3 files changed, 23 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nutch/blob/7956daee/default.properties ---------------------------------------------------------------------- diff --git a/default.properties b/default.properties index 0fcce2b..32ae150 100644 --- a/default.properties +++ b/default.properties @@ -16,7 +16,7 @@ name=apache-nutch version=1.12 final.name=${name}-${version} -year=2015 +year=2016 basedir = ./ src.dir = ./src/java @@ -60,7 +60,7 @@ runtime.dir=./runtime runtime.deploy=${runtime.dir}/deploy runtime.local=${runtime.dir}/local -ivy.version=2.2.0 +ivy.version=2.4.0 ivy.dir=${basedir}/ivy ivy.file=${ivy.dir}/ivy.xml ivy.jar=${ivy.dir}/ivy-${ivy.version}.jar http://git-wip-us.apache.org/repos/asf/nutch/blob/7956daee/ivy/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy/ivy.xml b/ivy/ivy.xml index bc8d293..027f0c1 100644 --- a/ivy/ivy.xml +++ b/ivy/ivy.xml @@ -98,7 +98,7 @@ <!--artifacts needed for testing --> <dependency org="junit" name="junit" rev="4.11" conf="test->default" /> - <dependency org="org.apache.mrunit" name="mrunit" rev="1.1.0" conf="test->default"> + <dependency org="org.apache.mrunit" name="mrunit" rev="1.1.0" conf="test->default" maven:classifier="hadoop2"> <artifact name="mrunit" maven:classifier="hadoop2" /> <exclude org="log4j" module="log4j" /> </dependency> http://git-wip-us.apache.org/repos/asf/nutch/blob/7956daee/ivy/mvn.template ---------------------------------------------------------------------- diff --git a/ivy/mvn.template b/ivy/mvn.template index 95bef9b..3bda967 100644 --- a/ivy/mvn.template +++ b/ivy/mvn.template @@ -27,15 +27,17 @@ <description>${ivy.pom.description}</description> <url>${ivy.pom.url}</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> + <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> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/nutch.git</developerConnection> + <connection>scm:git:http://git-wip-us.apache.org/repos/asf/nutch.git</connection> + <url>https://git-wip-us.apache.org/repos/asf/nutch.git</url> </scm> <pluginRepositories> @@ -117,8 +119,8 @@ <plugins> <plugin> <groupId>com.qmino</groupId> - <artifactId>miredot-maven-plugin</artifactId> - <version>1.4</version> + <artifactId>miredot-plugin</artifactId> + <version>2.0-RC2</version> <executions> <execution> <goals> @@ -127,10 +129,15 @@ </execution> </executions> <configuration> - <licence> - <!-- Miredot license key valid until Oct 30th 2017. The key is valid for two years, after which we are free to request a new key. --> - cHJvamVjdHxvcmcuYXBhY2hlLm51dGNoLm51dGNofDIwMTctMTAtMzB8dHJ1ZXwtMSNNQ3dDRkh2N1BsSXZvbWMzTGYxTXBHd3RYcVhEUnZsR0FoUjh3UWVhbG44TkdMUWhzVnJjVnNvNlJEZFBHQT09 - </licence> + <organizationId>c579ca2e-c194-4a14-a7f0-f39ef4ec3c2d</organizationId> + <restModel> + <restFramework> + <name>jax-rs</name> + </restFramework> + </restModel> + <output> + <html></html> + </output> <!-- insert other configuration here (optional) --> </configuration> </plugin>
