This is an automated email from the ASF dual-hosted git repository.
snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git
The following commit(s) were added to refs/heads/master by this push:
new fc6a274 NUTCH-2722 Fetch dependencies via https - change repository
URLs to https - fix ant "restdocs" task not to download dependencies via
http://
fc6a274 is described below
commit fc6a274221d88010666c84ca1ab49622326f592f
Author: Sebastian Nagel <[email protected]>
AuthorDate: Wed Jun 12 16:12:31 2019 +0200
NUTCH-2722 Fetch dependencies via https
- change repository URLs to https
- fix ant "restdocs" task not to download
dependencies via http://
---
build.xml | 11 +++++++++++
ivy/ivysettings.xml | 13 ++-----------
ivy/mvn.template | 2 +-
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/build.xml b/build.xml
index 5d883e3..f50395e 100644
--- a/build.xml
+++ b/build.xml
@@ -352,6 +352,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 a2dc700..7a3b949 100644
--- a/ivy/ivysettings.xml
+++ b/ivy/ivysettings.xml
@@ -16,20 +16,11 @@
See the License for the specific language governing permissions and
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/"
diff --git a/ivy/mvn.template b/ivy/mvn.template
index 3809fd0..6d22c84 100644
--- a/ivy/mvn.template
+++ b/ivy/mvn.template
@@ -36,7 +36,7 @@
<scm>
<developerConnection>scm:git:https://github.com/apache/nutch.git</developerConnection>
- <connection>scm:git:http://github.com/apache/nutch.git</connection>
+ <connection>scm:git:https://github.com/apache/nutch.git</connection>
<url>https://github.com/apache/nutch.git</url>
</scm>