Remove powermock

Powermock was introduced in I5a38a5fd3, but is not used in any of the
core tests or core plugins' tests. It is however used by some non-core
plugins (for example its-base, its-phabricator, owners) and those will
need to be migrated away from powermock, as was already done for the
slack-integration plugin in change I7595a8359, or explicitly add it to
their external dependencies.

Also remove javassist which was added as a transitive dependency at the
same time powermock was added.

Feature: Issue 5057
Change-Id: Iafcc40d2fafa58b9262b318d0207cff99239bd15
This commit is contained in:
David Pursehouse
2019-05-31 19:42:39 +09:00
parent cdf4fd40b9
commit da3b9e1694
4 changed files with 1 additions and 126 deletions

View File

@@ -942,7 +942,6 @@ maven_jar(
sha1 = "7e060dd5b19431e6d198e91ff670644372f60fbd",
)
# When bumping the easymock version number, make sure to also move powermock to a compatible version
maven_jar(
name = "easymock",
artifact = "org.easymock:easymock:3.1",
@@ -955,50 +954,6 @@ maven_jar(
sha1 = "92bf48723d277d6efd1150b2f7e9e1e92cb56caf",
)
POWERM_VERS = "1.6.1"
maven_jar(
name = "powermock-module-junit4",
artifact = "org.powermock:powermock-module-junit4:" + POWERM_VERS,
sha1 = "ea8530b2848542624f110a393513af397b37b9cf",
)
maven_jar(
name = "powermock-module-junit4-common",
artifact = "org.powermock:powermock-module-junit4-common:" + POWERM_VERS,
sha1 = "7222ced54dabc310895d02e45c5428ca05193cda",
)
maven_jar(
name = "powermock-reflect",
artifact = "org.powermock:powermock-reflect:" + POWERM_VERS,
sha1 = "97d25eda8275c11161bcddda6ef8beabd534c878",
)
maven_jar(
name = "powermock-api-easymock",
artifact = "org.powermock:powermock-api-easymock:" + POWERM_VERS,
sha1 = "aa740ecf89a2f64d410b3d93ef8cd6833009ef00",
)
maven_jar(
name = "powermock-api-support",
artifact = "org.powermock:powermock-api-support:" + POWERM_VERS,
sha1 = "592ee6d929c324109d3469501222e0c76ccf0869",
)
maven_jar(
name = "powermock-core",
artifact = "org.powermock:powermock-core:" + POWERM_VERS,
sha1 = "5afc1efce8d44ed76b30af939657bd598e45d962",
)
maven_jar(
name = "javassist",
artifact = "org.javassist:javassist:3.22.0-GA",
sha1 = "3e83394258ae2089be7219b971ec21a8288528ad",
)
JETTY_VERS = "9.4.18.v20190429"
maven_jar(

View File

@@ -9,12 +9,8 @@ java_library(
),
visibility = ["//visibility:public"],
exports = [
"//lib:junit",
"//lib/easymock",
"//lib/powermock:powermock-api-easymock",
"//lib/powermock:powermock-api-support",
"//lib/powermock:powermock-core",
"//lib/powermock:powermock-module-junit4",
"//lib/powermock:powermock-module-junit4-common",
],
deps = [
"//java/com/google/gerrit/acceptance/testsuite/project",

View File

@@ -418,13 +418,6 @@ java_library(
exports = ["@hamcrest-core//jar"],
)
java_library(
name = "javassist",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = ["@javassist//jar"],
)
java_library(
name = "soy",
data = ["//lib:LICENSE-Apache2.0"],

View File

@@ -1,69 +0,0 @@
load("@rules_java//java:defs.bzl", "java_library")
java_library(
name = "powermock-module-junit4",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = [
":powermock-module-junit4-common",
"//lib:junit",
"@powermock-module-junit4//jar",
],
)
java_library(
name = "powermock-module-junit4-common",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = [
":powermock-reflect",
"//lib:junit",
"@powermock-module-junit4-common//jar",
],
)
java_library(
name = "powermock-reflect",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = [
"//lib:junit",
"//lib/easymock:objenesis",
"@powermock-reflect//jar",
],
)
java_library(
name = "powermock-api-easymock",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = [
":powermock-api-support",
"//lib/easymock",
"@powermock-api-easymock//jar",
],
)
java_library(
name = "powermock-api-support",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = [
":powermock-core",
":powermock-reflect",
"//lib:junit",
"@powermock-api-support//jar",
],
)
java_library(
name = "powermock-core",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = [
":powermock-reflect",
"//lib:javassist",
"//lib:junit",
"@powermock-core//jar",
],
)