AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Replace EasyMock dependency with Mockito and re-pin Bazel deps

Browse Source
This commit is contained in:
Adam Cozzette 2022-03-02 19:17:27 +00:00
parent 23b2fe6e39
commit f7232f2aa3
9 changed files with 88 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/core/BUILD
View File

@ -281,7 +281,7 @@ junit_tests(
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:junit_junit",
"@maven//:org_easymock_easymock",
"@maven//:org_mockito_mockito_core",
],
)
@ -408,6 +408,6 @@ junit_tests(
":test_util_lite",
"@maven//:com_google_truth_truth",
"@maven//:junit_junit",
"@maven//:org_easymock_easymock",
"@maven//:org_mockito_mockito_core",
],
)

4
java/core/pom.xml
View File

@ -23,8 +23,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>

4
java/kotlin-lite/pom.xml
View File

@ -31,8 +31,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>

4
java/kotlin/pom.xml
View File

@ -30,8 +30,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>

4
java/lite/pom.xml
View File

@ -23,8 +23,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>

6
java/pom.xml
View File

@ -79,9 +79,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.2</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>
<dependency>

4
java/util/pom.xml
View File

@ -52,8 +52,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>

130
maven_install.json
View File

@ -1,25 +1,13 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": 1634601905,
"__RESOLVED_ARTIFACTS_HASH": -143733866,
"__INPUT_ARTIFACTS_HASH": -1867950668,
"__RESOLVED_ARTIFACTS_HASH": 1254982283,
"conflict_resolution": {
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.5.1",
"junit:junit:4.12": "junit:junit:4.13.2"
},
"dependencies": [
{
"coord": "cglib:cglib-nodep:2.2.2",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar",
"https://repo.maven.apache.org/maven2/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"
],
"sha256": "e78c7792e59554ed8a23d18a12e3a0d2f7a244217ecf89621477f63aec074f15",
"url": "https://repo1.maven.org/maven2/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"
},
{
"coord": "com.google.auto.value:auto-value-annotations:1.7.4",
"dependencies": [],
@ -83,21 +71,21 @@
{
"coord": "com.google.guava:guava-testlib:30.1.1-jre",
"dependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.5.1",
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:guava:30.1.1-jre",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
"com.google.j2objc:j2objc-annotations:1.3",
"com.google.code.findbugs:jsr305:3.0.2",
"org.hamcrest:hamcrest-core:1.3",
"com.google.guava:guava:30.1.1-jre",
"com.google.guava:failureaccess:1.0.1",
"com.google.errorprone:error_prone_annotations:2.5.1",
"junit:junit:4.13.2",
"org.checkerframework:checker-qual:3.9.1"
"org.checkerframework:checker-qual:3.9.1",
"org.hamcrest:hamcrest-core:1.3"
],
"directDependencies": [
"com.google.j2objc:j2objc-annotations:1.3",
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.guava:guava:30.1.1-jre",
"com.google.errorprone:error_prone_annotations:2.5.1",
"com.google.guava:guava:30.1.1-jre",
"com.google.j2objc:j2objc-annotations:1.3",
"junit:junit:4.13.2",
"org.checkerframework:checker-qual:3.9.1"
],
@ -112,19 +100,19 @@
{
"coord": "com.google.guava:guava:30.1.1-jre",
"dependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.5.1",
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
"com.google.j2objc:j2objc-annotations:1.3",
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.guava:failureaccess:1.0.1",
"com.google.errorprone:error_prone_annotations:2.5.1",
"org.checkerframework:checker-qual:3.9.1"
],
"directDependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.5.1",
"com.google.guava:failureaccess:1.0.1",
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
"com.google.j2objc:j2objc-annotations:1.3",
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.guava:failureaccess:1.0.1",
"com.google.errorprone:error_prone_annotations:2.5.1",
"org.checkerframework:checker-qual:3.9.1"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/30.1.1-jre/guava-30.1.1-jre.jar",
@ -162,20 +150,20 @@
{
"coord": "com.google.truth:truth:1.1.2",
"dependencies": [
"org.ow2.asm:asm:9.0",
"com.google.auto.value:auto-value-annotations:1.7.4",
"com.google.guava:guava:30.1.1-jre",
"com.google.errorprone:error_prone_annotations:2.5.1",
"com.google.guava:guava:30.1.1-jre",
"junit:junit:4.13.2",
"org.checkerframework:checker-qual:3.9.1"
"org.checkerframework:checker-qual:3.9.1",
"org.ow2.asm:asm:9.0"
],
"directDependencies": [
"org.ow2.asm:asm:9.0",
"com.google.auto.value:auto-value-annotations:1.7.4",
"com.google.guava:guava:30.1.1-jre",
"com.google.errorprone:error_prone_annotations:2.5.1",
"com.google.guava:guava:30.1.1-jre",
"junit:junit:4.13.2",
"org.checkerframework:checker-qual:3.9.1"
"org.checkerframework:checker-qual:3.9.1",
"org.ow2.asm:asm:9.0"
],
"file": "v1/https/repo1.maven.org/maven2/com/google/truth/truth/1.1.2/truth-1.1.2.jar",
"mirror_urls": [
@ -201,6 +189,30 @@
"sha256": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3",
"url": "https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar"
},
{
"coord": "net.bytebuddy:byte-buddy-agent:1.12.7",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.7/byte-buddy-agent-1.12.7.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.7/byte-buddy-agent-1.12.7.jar",
"https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.7/byte-buddy-agent-1.12.7.jar"
],
"sha256": "73d84bb6e8e8980e674d796a29063f510ceb527c6f8c912a08a13e236be05c71",
"url": "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.7/byte-buddy-agent-1.12.7.jar"
},
{
"coord": "net.bytebuddy:byte-buddy:1.12.7",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.7/byte-buddy-1.12.7.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.7/byte-buddy-1.12.7.jar",
"https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.12.7/byte-buddy-1.12.7.jar"
],
"sha256": "d2e46555699e70361b5471a7e142f9c67855bba6907a285177ebd8ad973775d8",
"url": "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.7/byte-buddy-1.12.7.jar"
},
{
"coord": "org.checkerframework:checker-qual:3.9.1",
"dependencies": [],
@ -213,24 +225,6 @@
"sha256": "ab0468b1ba35bb2ae45f61a60dc4960bd887660ab8f05113a662a7e675eae776",
"url": "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.9.1/checker-qual-3.9.1.jar"
},
{
"coord": "org.easymock:easymock:3.2",
"dependencies": [
"cglib:cglib-nodep:2.2.2",
"org.objenesis:objenesis:1.3"
],
"directDependencies": [
"cglib:cglib-nodep:2.2.2",
"org.objenesis:objenesis:1.3"
],
"file": "v1/https/repo1.maven.org/maven2/org/easymock/easymock/3.2/easymock-3.2.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/easymock/easymock/3.2/easymock-3.2.jar",
"https://repo.maven.apache.org/maven2/org/easymock/easymock/3.2/easymock-3.2.jar"
],
"sha256": "b3dd1cf5019f942d8cc2afad0aa6aef4b21532446fe90a6b68d567e3389763dd",
"url": "https://repo1.maven.org/maven2/org/easymock/easymock/3.2/easymock-3.2.jar"
},
{
"coord": "org.hamcrest:hamcrest-core:1.3",
"dependencies": [],
@ -244,16 +238,36 @@
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
},
{
"coord": "org.objenesis:objenesis:1.3",
"coord": "org.mockito:mockito-core:4.3.1",
"dependencies": [
"net.bytebuddy:byte-buddy-agent:1.12.7",
"net.bytebuddy:byte-buddy:1.12.7",
"org.objenesis:objenesis:3.2"
],
"directDependencies": [
"net.bytebuddy:byte-buddy-agent:1.12.7",
"net.bytebuddy:byte-buddy:1.12.7",
"org.objenesis:objenesis:3.2"
],
"file": "v1/https/repo1.maven.org/maven2/org/mockito/mockito-core/4.3.1/mockito-core-4.3.1.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/mockito/mockito-core/4.3.1/mockito-core-4.3.1.jar",
"https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.3.1/mockito-core-4.3.1.jar"
],
"sha256": "148de2c6928365db29443ca12d35c930d9f481172b934fdd801d1cb1409ea83a",
"url": "https://repo1.maven.org/maven2/org/mockito/mockito-core/4.3.1/mockito-core-4.3.1.jar"
},
{
"coord": "org.objenesis:objenesis:3.2",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar",
"file": "v1/https/repo1.maven.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar",
"https://repo.maven.apache.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar"
"https://repo1.maven.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.jar",
"https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.jar"
],
"sha256": "dd4ef3d3091063a4fec578cbb2bbe6c1f921c00091ba2993dcd9afd25ff9444a",
"url": "https://repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar"
"sha256": "03d960bd5aef03c653eb000413ada15eb77cdd2b8e4448886edf5692805e35f3",
"url": "https://repo1.maven.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.jar"
},
{
"coord": "org.ow2.asm:asm:9.0",

2
protobuf_deps.bzl
View File

@ -11,7 +11,7 @@ PROTOBUF_MAVEN_ARTIFACTS = [
"com.google.guava:guava-testlib:30.1.1-jre",
"com.google.truth:truth:1.1.2",
"junit:junit:4.12",
"org.easymock:easymock:3.2",
"org.mockito:mockito-core:4.3.1",
]
def protobuf_deps():