aboutsummaryrefslogtreecommitdiff
path: root/README.version
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-01-20 15:04:28 +0000
committerPaul Duffin <paulduffin@google.com>2017-02-09 15:12:38 +0000
commitc1dbb44e71e47410ad5685aba3ef3fccb095a2b4 (patch)
tree08f6e90ece87cf59e3c7c645a7519eaaf63c716e /README.version
parent21a7b5b68f0bdc465bf6270db8917b881cf04157 (diff)
downloadhamcrest-c1dbb44e71e47410ad5685aba3ef3fccb095a2b4.tar.gz
Upgrade to almost 2.0.0.0
See the README.android for the exact version used and an explanation as to why it was chosen. Bug: 30946317 Test: make checkbuild Change-Id: Icae106f5e4a62d2a34f4cf03506fd63676814c07
Diffstat (limited to 'README.version')
-rw-r--r--README.version14
1 files changed, 14 insertions, 0 deletions
diff --git a/README.version b/README.version
new file mode 100644
index 0000000..ac4f06f
--- /dev/null
+++ b/README.version
@@ -0,0 +1,14 @@
+URL: https://github.com/hamcrest/JavaHamcrest/archive/f540af9fd49f33cc07b3446a8895c7b51cbf0944.zip
+Version: f540af9fd49f33cc07b3446a8895c7b51cbf0944
+BugComponent: 40416
+
+Version f540af9fd49f33cc07b3446a8895c7b51cbf0944 was chosen because it is the
+point at which v2.0.0.0 and master diverge. There are only about 7 commits
+on v2.0.0.0 which are not on master but they do conflict with some changes in
+master. Those changes appear to be relatively minor and while it is not clear
+what the future holds for Hamcrest given that it has had no activity since June
+2016 it seems unnecessary to take those extra 7 commits given the potential for
+conflicts in future upgrades.
+
+Local Changes:
+ None