Skip to content

Commit

Permalink
Merge pull request apache#442 from apache/revert-441-NUTCH-2697
Browse files Browse the repository at this point in the history
Revert "NUTCH-2697: Upgrade Ivy to fix the issue of an unset packaging.type p…"
  • Loading branch information
sebastian-nagel authored Mar 2, 2019
2 parents 0b0fcea + 5fc56b6 commit 2ca3d89
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions ivy/ivysettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down

0 comments on commit 2ca3d89

Please sign in to comment.