This is an automated email from the ASF dual-hosted git repository.
lewismc 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 0b0fcea NUTCH-2697: Upgrade Ivy to fix the issue of an unset
packaging.type property. (#441)
0b0fcea is described below
commit 0b0fcea1720cbe0722a18a2a29977e4bfec685bb
Author: Chris Gavin <[email protected]>
AuthorDate: Sat Mar 2 03:48:27 2019 +0000
NUTCH-2697: Upgrade Ivy to fix the issue of an unset packaging.type
property. (#441)
---
default.properties | 2 +-
ivy/ivysettings.xml | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/default.properties b/default.properties
index bb987d9..1423025 100644
--- a/default.properties
+++ b/default.properties
@@ -63,7 +63,7 @@ runtime.dir=./runtime
runtime.deploy=${runtime.dir}/deploy
runtime.local=${runtime.dir}/local
-ivy.version=2.4.0
+ivy.version=2.5.0-rc1
ivy.dir=${basedir}/ivy
ivy.file=${ivy.dir}/ivy.xml
ivy.jar=${ivy.dir}/ivy-${ivy.version}.jar
diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
index a2dc700..d9b5044 100644
--- a/ivy/ivysettings.xml
+++ b/ivy/ivysettings.xml
@@ -38,14 +38,6 @@
value="[organisation]/[module]/[revision]/[module]-[revision](-[classifier])"/>
<property name="maven2.pattern.ext"
value="${maven2.pattern}.[ext]"/>
- <!-- define packaging.type=jar to work around the failing dependency
download of
- javax.ws.rs-api.jar
- required by Tika (1.19 and higher), cf.
- https://github.com/eclipse-ee4j/jaxrs-api/issues/572
- https://github.com/jax-rs/api/pull/576
- -->
- <property name="packaging.type"
- value="jar"/>
<!-- pull in the local repository -->
<include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
<settings defaultResolver="default"/>
