Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "NUTCH-2697: Upgrade Ivy to fix the issue of an unset packaging.type p…" #442

Merged
merged 1 commit into from Mar 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion default.properties
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
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