[nutch] 09/14: NUTCH-2651 Upgrade to Tika 1.19.1 (from 1.18) - modified work-around to fix downloading of dependency javax.ws.rs-api-*.jar: define property packaging.type in ivysettings.xml

[sn...@apache.org]

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

commit 31a1ec4bab4a702fa8876926d54b212cc40acbce
Author: Sebastian Nagel <sn...@apache.org>
AuthorDate: Sun Oct 21 20:49:51 2018 +0200

    NUTCH-2651 Upgrade to Tika 1.19.1 (from 1.18)
    - modified work-around to fix downloading of dependency javax.ws.rs-api-*.jar:
      define property packaging.type in ivysettings.xml
---
 default.properties  | 8 --------
 ivy/ivysettings.xml | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/default.properties b/default.properties
index e6b3f4e..bb987d9 100644
--- a/default.properties
+++ b/default.properties
@@ -77,14 +77,6 @@ ivy.shared.default.root=${ivy.default.ivy.user.dir}/shared
 ivy.shared.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext]
 ivy.shared.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext]
 
-# work-around to fix failing dependency download of
-#  javax.ws.rs-api.jar
-# required by Tika (1.19 and higher)
-# cf. (also affects ant/ivy)
-#  https://github.com/eclipse-ee4j/jaxrs-api/issues/572
-#  https://github.com/gradle/gradle/issues/3065
-packaging.type=jar
-
 #
 # Plugins API
 #
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"/>