diff options
author | Luca Milanesio <luca.milanesio@gmail.com> | 2019-01-10 22:48:14 +0000 |
---|---|---|
committer | Luca Milanesio <luca.milanesio@gmail.com> | 2019-01-10 22:54:04 +0000 |
commit | f8c86b63e9671491b8efc3c2f75c55b5e7b1f7de (patch) | |
tree | db2062793155340fd2fa0b0d98cc9a4499ef9db6 | |
parent | 17abd7f316b037583ab6489ca89f766879486d7e (diff) | |
parent | 08dd052d75161a1e3d5a4eff39e0334ab46f148a (diff) |
Merge branch 'stable-2.12' into stable-2.13
* stable-2.12:
Upgrade JGit to 4.5.5.201812240535-r
Change-Id: Ie163ef97fa2c3b12eef720774e7cf333e02e3a49
-rw-r--r-- | lib/JGIT_VERSION | 4 | ||||
-rw-r--r-- | lib/jgit/org.eclipse.jgit.archive/BUCK | 2 | ||||
-rw-r--r-- | lib/jgit/org.eclipse.jgit.http.server/BUCK | 2 | ||||
-rw-r--r-- | lib/jgit/org.eclipse.jgit.junit/BUCK | 2 | ||||
-rw-r--r-- | lib/jgit/org.eclipse.jgit/BUCK | 4 | ||||
-rw-r--r-- | lib/maven.defs | 1 | ||||
-rw-r--r-- | tools/util.py | 1 |
7 files changed, 9 insertions, 7 deletions
diff --git a/lib/JGIT_VERSION b/lib/JGIT_VERSION index 1ef558b555..12e3cfb16f 100644 --- a/lib/JGIT_VERSION +++ b/lib/JGIT_VERSION @@ -1,6 +1,6 @@ include_defs('//lib/maven.defs') -REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL. -VERS = '4.5.4.201711221230-r' +REPO = ECLIPSE # Leave here even if set to MAVEN_CENTRAL. +VERS = '4.5.5.201812240535-r' DOC_VERS = VERS # Set to VERS unless using a snapshot JGIT_DOC_URL="http://download.eclipse.org/jgit/site/" + DOC_VERS + "/apidocs" diff --git a/lib/jgit/org.eclipse.jgit.archive/BUCK b/lib/jgit/org.eclipse.jgit.archive/BUCK index 3accb33d7b..54f7e53891 100644 --- a/lib/jgit/org.eclipse.jgit.archive/BUCK +++ b/lib/jgit/org.eclipse.jgit.archive/BUCK @@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION') maven_jar( name = 'jgit-archive', id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS, - sha1 = '6b0b919ee42bf8276193c3c03581634bc3aa7e18', + sha1 = 'd64327d788ae43d79eb4e42d2432646c7b485789', license = 'jgit', repository = REPO, deps = ['//lib/jgit/org.eclipse.jgit:jgit'], diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUCK b/lib/jgit/org.eclipse.jgit.http.server/BUCK index 7c7287c78b..3ca44b899d 100644 --- a/lib/jgit/org.eclipse.jgit.http.server/BUCK +++ b/lib/jgit/org.eclipse.jgit.http.server/BUCK @@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION') maven_jar( name = 'jgit-servlet', id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS, - sha1 = '264fac29b6007146127156113ed3d4e0aa922b39', + sha1 = '6498fa4f4bd5db11d3069952540b68a9aef024c2', license = 'jgit', repository = REPO, deps = ['//lib/jgit/org.eclipse.jgit:jgit'], diff --git a/lib/jgit/org.eclipse.jgit.junit/BUCK b/lib/jgit/org.eclipse.jgit.junit/BUCK index 3c6ee80efc..5ca7f0dcbf 100644 --- a/lib/jgit/org.eclipse.jgit.junit/BUCK +++ b/lib/jgit/org.eclipse.jgit.junit/BUCK @@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION') maven_jar( name = 'junit', id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS, - sha1 = '58ca0a0fba72f2db6e6b27bd464dc44a946a617c', + sha1 = '50c36e367e7df961c1acc9308b7d52ea21a73d91', license = 'DO_NOT_DISTRIBUTE', repository = REPO, unsign = True, diff --git a/lib/jgit/org.eclipse.jgit/BUCK b/lib/jgit/org.eclipse.jgit/BUCK index 281fb6b04c..6d4a2e7a86 100644 --- a/lib/jgit/org.eclipse.jgit/BUCK +++ b/lib/jgit/org.eclipse.jgit/BUCK @@ -4,8 +4,8 @@ include_defs('//lib/JGIT_VERSION') maven_jar( name = 'jgit', id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS, - bin_sha1 = 'b30f322c7d441260f4fa454ce5de65cf7e961274', - src_sha1 = '459f648f8bbf10e1aa0b122d4f9919e1779922e9', + bin_sha1 = '1dac8dd7deb4ec72939fe30cd6fd57c22fd4a403', + src_sha1 = '6c5fe5a2bd6b12571d15984916463f2f28223a93', license = 'jgit', repository = REPO, unsign = True, diff --git a/lib/maven.defs b/lib/maven.defs index 913be35946..fa249989c0 100644 --- a/lib/maven.defs +++ b/lib/maven.defs @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +ECLIPSE = 'ECLIPSE:' GERRIT = 'GERRIT:' GERRIT_API = 'GERRIT_API:' MAVEN_CENTRAL = 'MAVEN_CENTRAL:' diff --git a/tools/util.py b/tools/util.py index 08a803f959..573651d47d 100644 --- a/tools/util.py +++ b/tools/util.py @@ -16,6 +16,7 @@ import os from os import path REPO_ROOTS = { + 'ECLIPSE': 'https://repo.eclipse.org/content/groups/releases', 'GERRIT': 'http://gerrit-maven.storage.googleapis.com', 'GERRIT_API': 'https://gerrit-api.commondatastorage.googleapis.com/release', 'MAVEN_CENTRAL': 'http://repo1.maven.org/maven2', |