Skip to content

Commit

Permalink
Bump the default ivy bootstrap jar to 2.4.0.
Browse files Browse the repository at this point in the history
This has been the stable release for almost a year and pantsbuild/pants
itself needs this version to properly handle the ANDROID_HOME env var
detection it uses in ivysetting.xml.

Previously, the bootstrap was 2.3.0 and the final used by
pantsbuild/pants was 2.4.0 + extras.  For any workspace with a cached
final, the ivysettings.xml would work, but for workspaces w/o an ivy
bootstrapped, the ivysettings.xml would fail.  This change gets
pantsbuild/pants ivysettings.xml working no matter the bootstrap phase.

Testing Done:
First noted the fact that the linux CI was green:
  https://travis-ci.org/pantsbuild/pants/builds/84007338
But the OSX CI was very red:
  https://travis-ci.org/pantsbuild-osx/pants/jobs/84014487

The 2 biggest differences being linux vs OS X and travis-ci cache vs
none respectively.

On my local machine, before the fix, I was able to reproduce the OS X
CI failure mode by deleting my ivy bootstrap cache:
`rm -rf ~/.cache/pants/tools/jvm/ivy/`

After the fix I was no longer able to reproduce, all ran smooth through
bootstrapping.

CI went green here:
  https://travis-ci.org/pantsbuild/pants/builds/84017782

Bugs closed: 2333

Reviewed at https://rbcommons.com/s/twitter/r/2938/
  • Loading branch information
jsirois committed Oct 7, 2015
1 parent 29c0e81 commit 1e40756
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/python/pants/ivy/ivy_subsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class IvySubsystem(Subsystem):
"""Common configuration items for ivy tasks."""
options_scope = 'ivy'

_DEFAULT_VERSION = '2.3.0'
_DEFAULT_VERSION = '2.4.0'
_DEFAULT_URL = ('https://repo1.maven.org/maven2/'
'org/apache/ivy/ivy/'
'{version}/ivy-{version}.jar'.format(version=_DEFAULT_VERSION))
Expand Down

0 comments on commit 1e40756

Please sign in to comment.