Merge changes I95b95a0c,I584af100 into stable-2.15
* changes:
WORKSPACE: Update testcontainers to version 1.10.7
ElasticContainer: Update the 6.6 version to latest
diff --git a/WORKSPACE b/WORKSPACE
index c59a49ce..ebaf9a5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -892,7 +892,7 @@
sha1 = "76716d529710fc03d1d429b43e3cedd4419f78d4",
)
-# When upgrading elasticsearch-rest-client, also upgrade http-niocore
+# When upgrading elasticsearch-rest-client, also upgrade httpcore-nio
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml
index 82f767b..3e9f72e 100644
--- a/gerrit-acceptance-framework/pom.xml
+++ b/gerrit-acceptance-framework/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-acceptance-framework</artifactId>
- <version>2.15.12-SNAPSHOT</version>
+ <version>2.15.13-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Gerrit Code Review - Acceptance Test Framework</name>
<description>Framework for Gerrit's acceptance tests</description>
diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml
index 056010a0..70cdbbe 100644
--- a/gerrit-extension-api/pom.xml
+++ b/gerrit-extension-api/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-extension-api</artifactId>
- <version>2.15.12-SNAPSHOT</version>
+ <version>2.15.13-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Gerrit Code Review - Extension API</name>
<description>API for Gerrit Extensions</description>
diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml
index 008aab8..e9e71e0 100644
--- a/gerrit-plugin-api/pom.xml
+++ b/gerrit-plugin-api/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-plugin-api</artifactId>
- <version>2.15.12-SNAPSHOT</version>
+ <version>2.15.13-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Gerrit Code Review - Plugin API</name>
<description>API for Gerrit Plugins</description>
diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml
index 3f12651..1ac6f4d 100644
--- a/gerrit-plugin-gwtui/pom.xml
+++ b/gerrit-plugin-gwtui/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-plugin-gwtui</artifactId>
- <version>2.15.12-SNAPSHOT</version>
+ <version>2.15.13-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Gerrit Code Review - Plugin GWT UI</name>
<description>Common Classes for Gerrit GWT UI Plugins</description>
diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml
index 2f9fa52..48460d8 100644
--- a/gerrit-war/pom.xml
+++ b/gerrit-war/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-war</artifactId>
- <version>2.15.12-SNAPSHOT</version>
+ <version>2.15.13-SNAPSHOT</version>
<packaging>war</packaging>
<name>Gerrit Code Review - WAR</name>
<description>Gerrit WAR</description>
diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl
index ad44013..d957db6 100644
--- a/lib/jgit/jgit.bzl
+++ b/lib/jgit/jgit.bzl
@@ -1,6 +1,6 @@
load("//tools/bzl:maven_jar.bzl", "MAVEN_CENTRAL", "maven_jar")
-_JGIT_VERS = "4.9.8.201812241815-r"
+_JGIT_VERS = "4.9.9.201903122025-r"
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
@@ -35,28 +35,28 @@
name = "jgit-lib",
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
repository = _JGIT_REPO,
- sha1 = "dedb5d05a952551dc465611ebde3819d86bb22fc",
- src_sha1 = "dbbc82bb6b1f7733a3d03a5af67eb5b8cf30e2d4",
+ sha1 = "52193ccd43992cfa262d72db9da1b7512e0858da",
+ src_sha1 = "fb5f9b0630d8016061a05666d9adee8b1f1f4b16",
unsign = True,
)
maven_jar(
name = "jgit-servlet",
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
repository = _JGIT_REPO,
- sha1 = "76fc4dab1d3b0c05768d7d5424e003e4dbfa5222",
+ sha1 = "37e45177c96a2a936e783dd3b850edf1676fa1fa",
unsign = True,
)
maven_jar(
name = "jgit-archive",
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
repository = _JGIT_REPO,
- sha1 = "dfebb3889afcd4f335e9becf4bb58a06bb84b72f",
+ sha1 = "57be131434f94b5e3446ba00a11a99cab806eaaa",
)
maven_jar(
name = "jgit-junit",
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
repository = _JGIT_REPO,
- sha1 = "3e34e327979c8c263765be63abc89dda1b4b4d94",
+ sha1 = "80e5eb69c35bafec0e74285ca2058e5212d43266",
unsign = True,
)
diff --git a/version.bzl b/version.bzl
index a651bfa..d587af3 100644
--- a/version.bzl
+++ b/version.bzl
@@ -2,4 +2,4 @@
# Used by :api_install and :api_deploy targets
# when talking to the destination repository.
#
-GERRIT_VERSION = "2.15.12-SNAPSHOT"
+GERRIT_VERSION = "2.15.13-SNAPSHOT"
