Skip to content

Commit bdc86aa

Browse files
titusfortnertitusfortner
committed
[build] remove variables from maven deps file
allow script to do automatic updates
1 parent ab18234 commit bdc86aa

File tree

2 files changed

+31
-41
lines changed

2 files changed

+31
-41
lines changed

‎java/maven_deps.bzl‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,11 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
22
load("@rules_jvm_external//:specs.bzl", "maven")
33

44
def selenium_java_deps():
5-
netty_version = "4.1.100.Final"
6-
opentelemetry_version = "1.28.0"
7-
junit_jupiter_version = "5.10.0"
8-
junit_platform_version = "1.10.0"
9-
105
maven_install(
116
artifacts = [
127
"com.beust:jcommander:1.82",
138
"com.github.javaparser:javaparser-core:3.25.4",
14-
maven.artifact(
15-
group = "com.github.spotbugs",
16-
artifact = "spotbugs",
17-
version = "4.7.3",
18-
exclusions = [
19-
"org.slf4j:slf4j-api",
20-
],
21-
),
9+
"com.github.spotbugs:spotbugs:4.7.3",
2210
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
2311
"com.google.code.gson:gson:2.10.1",
2412
"com.google.guava:guava:32.1.2-jre",
@@ -31,23 +19,23 @@ def selenium_java_deps():
3119
"dev.failsafe:failsafe:3.3.2",
3220
"io.grpc:grpc-context:1.57.1",
3321
"io.lettuce:lettuce-core:6.2.5.RELEASE",
34-
"io.netty:netty-buffer:%s" % netty_version,
35-
"io.netty:netty-codec-http:%s" % netty_version,
36-
"io.netty:netty-codec-http2:%s" % netty_version,
37-
"io.netty:netty-common:%s" % netty_version,
38-
"io.netty:netty-handler:%s" % netty_version,
39-
"io.netty:netty-handler-proxy:%s" % netty_version,
40-
"io.netty:netty-transport:%s" % netty_version,
41-
"io.opentelemetry:opentelemetry-api:%s" % opentelemetry_version,
42-
"io.opentelemetry:opentelemetry-context:%s" % opentelemetry_version,
43-
"io.opentelemetry:opentelemetry-exporter-logging:%s" % opentelemetry_version,
44-
"io.opentelemetry:opentelemetry-semconv:%s" % opentelemetry_version + "-alpha",
45-
"io.opentelemetry:opentelemetry-sdk:%s" % opentelemetry_version,
46-
"io.opentelemetry:opentelemetry-sdk-common:%s" % opentelemetry_version,
47-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:%s" % opentelemetry_version,
48-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:%s" % opentelemetry_version,
49-
"io.opentelemetry:opentelemetry-sdk-testing:%s" % opentelemetry_version,
50-
"io.opentelemetry:opentelemetry-sdk-trace:%s" % opentelemetry_version,
22+
"io.netty:netty-buffer:4.1.100.Final",
23+
"io.netty:netty-codec-http:4.1.100.Final",
24+
"io.netty:netty-codec-http2:4.1.100.Final",
25+
"io.netty:netty-common:4.1.100.Final",
26+
"io.netty:netty-handler:4.1.100.Final",
27+
"io.netty:netty-handler-proxy:4.1.100.Final",
28+
"io.netty:netty-transport:4.1.100.Final",
29+
"io.opentelemetry:opentelemetry-api:1.28.0",
30+
"io.opentelemetry:opentelemetry-context:1.28.0",
31+
"io.opentelemetry:opentelemetry-exporter-logging:1.28.0",
32+
"io.opentelemetry:opentelemetry-semconv:1.28.0-alpha",
33+
"io.opentelemetry:opentelemetry-sdk:1.28.0",
34+
"io.opentelemetry:opentelemetry-sdk-common:1.28.0",
35+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.28.0",
36+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.28.0",
37+
"io.opentelemetry:opentelemetry-sdk-testing:1.28.0",
38+
"io.opentelemetry:opentelemetry-sdk-trace:1.28.0",
5139
"io.ous:jtoml:2.0.0",
5240
"it.ozimov:embedded-redis:0.7.3",
5341
"net.bytebuddy:byte-buddy:1.14.5",
@@ -58,13 +46,13 @@ def selenium_java_deps():
5846
"org.bouncycastle:bcpkix-jdk18on:1.76",
5947
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
6048
"org.hsqldb:hsqldb:2.7.2",
61-
"org.junit.jupiter:junit-jupiter-api:%s" % junit_jupiter_version,
62-
"org.junit.jupiter:junit-jupiter-engine:%s" % junit_jupiter_version,
63-
"org.junit.jupiter:junit-jupiter-params:%s" % junit_jupiter_version,
64-
"org.junit.platform:junit-platform-launcher:%s" % junit_platform_version,
65-
"org.junit.platform:junit-platform-reporting:%s" % junit_platform_version,
66-
"org.junit.platform:junit-platform-commons:%s" % junit_platform_version,
67-
"org.junit.platform:junit-platform-engine:%s" % junit_platform_version,
49+
"org.junit.jupiter:junit-jupiter-api:5.10.0",
50+
"org.junit.jupiter:junit-jupiter-engine:5.10.0",
51+
"org.junit.jupiter:junit-jupiter-params:5.10.0",
52+
"org.junit.platform:junit-platform-launcher:1.10.0",
53+
"org.junit.platform:junit-platform-reporting:1.10.0",
54+
"org.junit.platform:junit-platform-commons:1.10.0",
55+
"org.junit.platform:junit-platform-engine:1.10.0",
6856
"org.mockito:mockito-core:4.11.0",
6957
"org.mockito:mockito-inline:4.11.0",
7058
"org.redisson:redisson:3.23.2",

‎java/maven_install.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 1056130395,
4-
"__RESOLVED_ARTIFACTS_HASH": 254042711,
3+
"__INPUT_ARTIFACTS_HASH": -1572494469,
4+
"__RESOLVED_ARTIFACTS_HASH": -1741278859,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -861,7 +861,8 @@
861861
"org.ow2.asm:asm-analysis",
862862
"org.ow2.asm:asm-commons",
863863
"org.ow2.asm:asm-tree",
864-
"org.ow2.asm:asm-util"
864+
"org.ow2.asm:asm-util",
865+
"org.slf4j:slf4j-api"
865866
],
866867
"com.github.spotbugs:spotbugs-annotations": [
867868
"com.google.code.findbugs:jsr305"
@@ -1055,7 +1056,8 @@
10551056
"org.apache.httpcomponents.client5:httpclient5": [
10561057
"commons-codec:commons-codec",
10571058
"org.apache.httpcomponents.core5:httpcore5",
1058-
"org.apache.httpcomponents.core5:httpcore5-h2"
1059+
"org.apache.httpcomponents.core5:httpcore5-h2",
1060+
"org.slf4j:slf4j-api"
10591061
],
10601062
"org.apache.httpcomponents.core5:httpcore5-h2": [
10611063
"org.apache.httpcomponents.core5:httpcore5"

0 commit comments

Comments
 (0)