NUTCH-2722 Fetch dependencies via https
- change repository URLs to https
- fix ant "restdocs" task not to download
dependencies via http://
- sync Maven template with master branch
- add Spring plugins repository required
for org.restlet dependencies
diff --git a/build.xml b/build.xml
index ef7a88b..5ffb804 100644
--- a/build.xml
+++ b/build.xml
@@ -340,6 +340,17 @@
<artifact:mvn>
<arg value="test"/>
<arg value="-e"/>
+ <arg value="-o"/>
+ <!-- run offline (-o): must not download dependencies as this is
+ done from http://repo1.maven.org/ hardwired in
+ maven-ant-tasks-2.1.3.jar, see NUTCH-2722.
+
+ Dependencies and plugins need to be resolved and cached locally beforehand
+ by running
+ `mvn dependency:resolve`
+ resp.
+ `mvn dependency:resolve-plugins`
+ after the pom.xml has been generated. -->
</artifact:mvn>
</target>
diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
index 3516a0a..4fef0b6 100644
--- a/ivy/ivysettings.xml
+++ b/ivy/ivysettings.xml
@@ -17,20 +17,11 @@
limitations under the License.
-->
- <!-- you can override this property to use mirrors
- http://repo1.maven.org/maven2/
- http://mirrors.dotsrc.org/maven2
- http://ftp.ggi-project.org/pub/packages/maven2
- http://mirrors.sunsite.dk/maven2
- http://public.planetmirror.com/pub/maven2
- http://ibiblio.lsu.edu/main/pub/packages/maven2
- http://www.ibiblio.net/pub/packages/maven2
- -->
<property name="oss.sonatype.org"
- value="http://oss.sonatype.org/content/repositories/releases/"
+ value="https://oss.sonatype.org/content/repositories/releases/"
override="false"/>
<property name="repo.maven.org"
- value="http://repo1.maven.org/maven2/"
+ value="https://repo1.maven.org/maven2/"
override="false"/>
<property name="repository.apache.org"
value="https://repository.apache.org/content/repositories/snapshots/"
@@ -61,8 +52,8 @@
changingPattern=".*-SNAPSHOT"
m2compatible="true"
/>
- <ibiblio name="restlet"
- root="http://maven.restlet.org"
+ <ibiblio name="spring-plugins"
+ root="https://repo.spring.io/plugins-release"
pattern="${maven2.pattern.ext}"
m2compatible="true"
/>
@@ -77,7 +68,7 @@
<resolver ref="maven2"/>
<resolver ref="sonatype"/>
<resolver ref="apache-snapshot"/>
- <resolver ref="restlet"/>
+ <resolver ref="spring-plugins"/>
</chain>
<chain name="internal">
<resolver ref="local"/>
@@ -91,9 +82,6 @@
<resolver ref="apache-snapshot"/>
<resolver ref="sonatype"/>
</chain>
- <chain name="restletchain">
- <resolver ref="restlet"/>
- </chain>
</resolvers>
<modules>
@@ -102,7 +90,5 @@
rather than look for them online.
-->
<module organisation="org.apache.nutch" name=".*" resolver="internal"/>
- <module organisation="org.restlet" name=".*" resolver="restletchain"/>
- <module organisation="org.restlet.jse" name=".*" resolver="restletchain"/>
</modules>
</ivysettings>
diff --git a/ivy/mvn.template b/ivy/mvn.template
index 1b4605f..84c7823 100644
--- a/ivy/mvn.template
+++ b/ivy/mvn.template
@@ -27,15 +27,16 @@
<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://github.com/apache/nutch.git</developerConnection>
+ <connection>scm:git:https://github.com/apache/nutch.git</connection>
+ <url>https://github.com/apache/nutch.git</url>
</scm>
<pluginRepositories>
@@ -47,57 +48,63 @@
</pluginRepositories>
<developers>
- <developer>
- <id>mattmann</id>
- <name>Chris A. Mattmann</name>
- <email>mattmann@apache.org</email>
- </developer>
- <developer>
- <id>jnioche</id>
- <name>Julien Nioche</name>
- <email>jnioche@apache.org</email>
- </developer>
- <developer>
- <id>lewismc</id>
- <name>Lewis John McGibbney</name>
- <email>lewismc@apache.org</email>
- </developer>
- <developer>
- <id>markus</id>
- <name>Markus Jelsma</name>
- <email>markus@apache.org</email>
- </developer>
- <developer>
- <id>fenglu</id>
- <name>Feng Lu</name>
- <email>fenglu@apache.org</email>
- </developer>
- <developer>
- <id>kamaci</id>
- <name>Furkan KAMACI</name>
- <email>kamaci@apache.org</email>
- </developer>
- <developer>
- <id>kiranch</id>
- <name>Kiran Chitturi</name>
- <email>kiranch@apache.org</email>
- </developer>
- <developer>
- <id>tejasp</id>
- <name>Tejas Patil</name>
- <email>tejasp@apache.org</email>
- </developer>
- <developer>
- <id>talat</id>
- <name>Talat Uyarer</name>
- <email>talat@apache.org</email>
- </developer>
- <developer>
- <id>snagel</id>
- <name>Sebastian Nagel</name>
- <email>snagel@apache.org</email>
- </developer>
- </developers>
+ <developer>
+ <id>mattmann</id>
+ <name>Chris A. Mattmann</name>
+ <email>mattmann@apache.org</email>
+ </developer>
+ <developer>
+ <id>jnioche</id>
+ <name>Julien Nioche</name>
+ <email>jnioche@apache.org</email>
+ </developer>
+ <developer>
+ <id>lewismc</id>
+ <name>Lewis John McGibbney</name>
+ <email>lewismc@apache.org</email>
+ </developer>
+ <developer>
+ <id>markus</id>
+ <name>Markus Jelsma</name>
+ <email>markus@apache.org</email>
+ </developer>
+ <developer>
+ <id>fenglu</id>
+ <name>Feng Lu</name>
+ <email>fenglu@apache.org</email>
+ </developer>
+ <developer>
+ <id>kamaci</id>
+ <name>Furkan KAMACI</name>
+ <email>kamaci@apache.org</email>
+ </developer>
+ <developer>
+ <id>kiranch</id>
+ <name>Kiran Chitturi</name>
+ <email>kiranch@apache.org</email>
+ </developer>
+ <developer>
+ <id>tejasp</id>
+ <name>Tejas Patil</name>
+ <email>tejasp@apache.org</email>
+ </developer>
+ <developer>
+ <id>talat</id>
+ <name>Talat Uyarer</name>
+ <email>talat@apache.org</email>
+ </developer>
+ <developer>
+ <id>snagel</id>
+ <name>Sebastian Nagel</name>
+ <email>snagel@apache.org</email>
+ </developer>
+ <developer>
+ <id>thammegowda</id>
+ <name>Thamme Gowda</name>
+ <email>thammegowda@apache.org</email>
+ </developer>
+ </developers>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
@@ -112,8 +119,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
@@ -122,7 +129,7 @@
<plugin>
<groupId>com.qmino</groupId>
<artifactId>miredot-plugin</artifactId>
- <version>2.0-RC2</version>
+ <version>2.0.1</version>
<executions>
<execution>
<goals>
@@ -131,7 +138,7 @@
</execution>
</executions>
<configuration>
- <organizationId>c579ca2e-c194-4a14-a7f0-f39ef4ec3c2d</organizationId>
+ <licence>cHJvamVjdHxvcmcuYXBhY2hlLm51dGNoLm51dGNofDIwMTktMTAtMzB8dHJ1ZXwtMSNNQ3dDRkJMb0FjM283ME1YRERRMkFJemY1QmxZUjAwK0FoUkJVMlJrVi81RlBQc25zMUZ2S2g0Q29weGFxZz09</licence>
<restModel>
<restFramework>
<name>jax-rs</name>
@@ -146,4 +153,3 @@
</plugins>
</build>
</project>
-
