nutch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sna...@apache.org
Subject [nutch] 01/01: Revert "NUTCH-2697: Upgrade Ivy to fix the issue of an unset packaging.type property. (#441)"
Date Sat, 02 Mar 2019 14:35:45 GMT
This is an automated email from the ASF dual-hosted git repository.

snagel pushed a commit to branch revert-441-NUTCH-2697
in repository https://gitbox.apache.org/repos/asf/nutch.git

commit 5fc56b62d866af00befcae022718c9e9f879eec3
Author: Sebastian Nagel <snagel@apache.org>
AuthorDate: Sat Mar 2 15:35:38 2019 +0100

    Revert "NUTCH-2697: Upgrade Ivy to fix the issue of an unset packaging.type property.
(#441)"
    
    This reverts commit 0b0fcea1720cbe0722a18a2a29977e4bfec685bb.
---
 default.properties  | 2 +-
 ivy/ivysettings.xml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/default.properties b/default.properties
index 1423025..bb987d9 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.5.0-rc1
+ivy.version=2.4.0
 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 d9b5044..a2dc700 100644
--- a/ivy/ivysettings.xml
+++ b/ivy/ivysettings.xml
@@ -38,6 +38,14 @@
     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"/>


Mime
View raw message