opendev/gerrit
Code Issues Proposed changes

Bump guice version to 4.2.0

Browse Source 
The new version provides better support for Java 9 and improves
performance. Multibindings artifact is now included in the guice
core artifact. The full release notes is here: [1].

[1] https://github.com/google/guice/wiki/Guice42

Change-Id: I208d53ce1cf9b99ed8f03ae34470e95c3b8f71ce
(cherry picked from commit 1fa7774d23)
This commit is contained in:
David Ostrovsky
2018-03-06 21:45:47 +01:00
committed by David Pursehouse
parent 13301df25c
commit c3536a0650
4 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
WORKSPACE
View File

@@ -70,30 +70,24 @@ maven_jar(
sha1 = "83cd2cd674a217ade95a4bb83a8a14f351f48bd0", sha1 = "83cd2cd674a217ade95a4bb83a8a14f351f48bd0",
) )
GUICE_VERS = "4.1.0" GUICE_VERS = "4.2.0"
maven_jar( maven_jar(
name = "guice-library", name = "guice-library",
artifact = "com.google.inject:guice:" + GUICE_VERS, artifact = "com.google.inject:guice:" + GUICE_VERS,
sha1 = "eeb69005da379a10071aa4948c48d89250febb07", sha1 = "25e1f4c1d528a1cffabcca0d432f634f3132f6c8",
) )
maven_jar( maven_jar(
name = "guice-assistedinject", name = "guice-assistedinject",
artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS, artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS,
sha1 = "af799dd7e23e6fe8c988da12314582072b07edcb", sha1 = "e7270305960ad7db56f7e30cb9df6be9ff1cfb45",
) )
maven_jar( maven_jar(
name = "guice-servlet", name = "guice-servlet",
artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS, artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS,
sha1 = "90ac2db772d9b85e2b05417b74f7464bcc061dcb", sha1 = "f57581625c36c148f088d9f52a568d5bdf12c61d",
)
maven_jar(
name = "multibindings",
artifact = "com.google.inject.extensions:guice-multibindings:" + GUICE_VERS,
sha1 = "3b27257997ac51b0f8d19676f1ea170427e86d51",
) )
maven_jar( maven_jar(

1
gerrit-plugin-api/BUILD
View File

@@ -27,7 +27,6 @@ EXPORTS = [
"//lib/guice:guice-assistedinject", "//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet", "//lib/guice:guice-servlet",
"//lib/guice:javax-inject", "//lib/guice:javax-inject",
"//lib/guice:multibindings",
"//lib/httpcomponents:httpclient", "//lib/httpcomponents:httpclient",
"//lib/httpcomponents:httpcore", "//lib/httpcomponents:httpcore",
"//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet", "//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",

1
lib/BUILD
View File

@@ -272,7 +272,6 @@ java_library(
"//lib/guice", "//lib/guice",
"//lib/guice:guice-assistedinject", "//lib/guice:guice-assistedinject",
"//lib/guice:javax-inject", "//lib/guice:javax-inject",
"//lib/guice:multibindings",
"//lib/ow2:ow2-asm", "//lib/ow2:ow2-asm",
"//lib/ow2:ow2-asm-analysis", "//lib/ow2:ow2-asm-analysis",
"//lib/ow2:ow2-asm-commons", "//lib/ow2:ow2-asm-commons",

8
lib/guice/BUILD
View File

@@ -5,7 +5,6 @@ java_library(
exports = [ exports = [
":guice-library", ":guice-library",
":javax-inject", ":javax-inject",
":multibindings",
], ],
) )
@@ -45,10 +44,3 @@ java_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
exports = ["@javax_inject//jar"], exports = ["@javax_inject//jar"],
) )
java_library(
name = "multibindings",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@multibindings//jar"],
)