Bazel: Expedite the LC process
Move dependencies not used by Google to tools/nongoogle.bzl. Upgrading the versions in tools/nongoogle.bzl file does not require LC-Vote. Change-Id: Ib0dd147bd2611ac9ba282cfcaed5c412ab38e464
This commit is contained in:
David Ostrovsky
parent
59ad415af2
commit
eba485b530
177
WORKSPACE
177
WORKSPACE
@ -292,12 +292,6 @@ maven_jar(
|
||||
sha1 = GUAVA_BIN_SHA1,
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "j2objc",
|
||||
artifact = "com.google.j2objc:j2objc-annotations:1.1",
|
||||
sha1 = "ed28ded51a8b1c6b112568def5f4b455e6809019",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jsch",
|
||||
artifact = "com.jcraft:jsch:0.1.54",
|
||||
@ -774,12 +768,6 @@ maven_jar(
|
||||
sha1 = "198ea005f41219f038f4291f0b0e9f3259730e92",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "dropwizard-core",
|
||||
artifact = "io.dropwizard.metrics:metrics-core:4.0.5",
|
||||
sha1 = "b81ef162970cdb9f4512ee2da09715a856ff4c4c",
|
||||
)
|
||||
|
||||
# When updating Bouncy Castle, also update it in bazlets.
|
||||
BC_VERS = "1.60"
|
||||
|
||||
@ -801,30 +789,6 @@ maven_jar(
|
||||
sha1 = "d0c46320fbc07be3a24eb13a56cee4e3d38e0c75",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "sshd",
|
||||
artifact = "org.apache.sshd:sshd-core:2.0.0",
|
||||
sha1 = "f4275079a2463cfd2bf1548a80e1683288a8e86b",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "eddsa",
|
||||
artifact = "net.i2p.crypto:eddsa:0.2.0",
|
||||
sha1 = "0856a92559c4daf744cb27c93cd8b7eb1f8c4780",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "mina-core",
|
||||
artifact = "org.apache.mina:mina-core:2.0.17",
|
||||
sha1 = "7e10ec974760436d931f3e58be507d1957bcc8db",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "sshd-mina",
|
||||
artifact = "org.apache.sshd:sshd-mina:2.0.0",
|
||||
sha1 = "50f2669312494f6c1996d8bd0d266c1fca7be6f6",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "h2",
|
||||
artifact = "com.h2database:h2:1.3.176",
|
||||
@ -854,20 +818,6 @@ maven_jar(
|
||||
sha1 = "f5aa318bda4c6c8d688c9d00b90681dcd82ce636",
|
||||
)
|
||||
|
||||
# elasticsearch-rest-client explicitly depends on this version
|
||||
maven_jar(
|
||||
name = "httpasyncclient",
|
||||
artifact = "org.apache.httpcomponents:httpasyncclient:4.1.4",
|
||||
sha1 = "f3a3240681faae3fa46b573a4c7e50cec9db0d86",
|
||||
)
|
||||
|
||||
# elasticsearch-rest-client explicitly depends on this version
|
||||
maven_jar(
|
||||
name = "httpcore-nio",
|
||||
artifact = "org.apache.httpcomponents:httpcore-nio:4.4.11",
|
||||
sha1 = "7d0a97d01d39cff9aa3e6db81f21fddb2435f4e6",
|
||||
)
|
||||
|
||||
# Test-only dependencies below.
|
||||
|
||||
maven_jar(
|
||||
@ -927,62 +877,6 @@ maven_jar(
|
||||
sha1 = "3e127311a86fc2e8f550ef8ee4abe094bbcf7e7e",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "cglib-3_2",
|
||||
artifact = "cglib:cglib-nodep:3.2.6",
|
||||
sha1 = "92bf48723d277d6efd1150b2f7e9e1e92cb56caf",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "objenesis",
|
||||
artifact = "org.objenesis:objenesis:1.3",
|
||||
sha1 = "dc13ae4faca6df981fc7aeb5a522d9db446d5d50",
|
||||
)
|
||||
|
||||
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",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "derby",
|
||||
artifact = "org.apache.derby:derby:10.12.1.1",
|
||||
@ -1046,25 +940,6 @@ maven_jar(
|
||||
sha1 = "5bb3d7a38f7ea54138336591d89dd5867b806c02",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "openid-consumer",
|
||||
artifact = "org.openid4java:openid4java:1.0.0",
|
||||
sha1 = "541091bb49f2c0d583544c5bb1e6df7612d31e3e",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "nekohtml",
|
||||
artifact = "net.sourceforge.nekohtml:nekohtml:1.9.10",
|
||||
sha1 = "14052461031a7054aa094f5573792feb6686d3de",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "xerces",
|
||||
artifact = "xerces:xercesImpl:2.8.1",
|
||||
attach_source = False,
|
||||
sha1 = "25101e37ec0c907db6f0612cbf106ee519c1aef1",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "postgresql",
|
||||
artifact = "org.postgresql:postgresql:42.2.5",
|
||||
@ -1102,58 +977,6 @@ maven_jar(
|
||||
sha1 = "8e8c1d8fc6144405700dd8df3b177f2801ac5987",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jruby",
|
||||
artifact = "org.jruby:jruby-complete:9.1.17.0",
|
||||
sha1 = "76716d529710fc03d1d429b43e3cedd4419f78d4",
|
||||
)
|
||||
|
||||
# When upgrading elasticsearch-rest-client, also upgrade httpcore-nio
|
||||
# and httpasyncclient as necessary.
|
||||
maven_jar(
|
||||
name = "elasticsearch-rest-client",
|
||||
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.2",
|
||||
sha1 = "f48725523c0b3402f869214433602f8d3f4c737c",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jackson-core",
|
||||
artifact = "com.fasterxml.jackson.core:jackson-core:2.10.1",
|
||||
sha1 = "2c8b5e26ba40e5f91eb37a24075a2028b402c5f9",
|
||||
)
|
||||
|
||||
TESTCONTAINERS_VERSION = "1.12.3"
|
||||
|
||||
maven_jar(
|
||||
name = "testcontainers",
|
||||
artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
|
||||
sha1 = "e424a4549640e120acceac641ac909fcda58bf62",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "testcontainers-elasticsearch",
|
||||
artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
|
||||
sha1 = "c0796de5032070b8768ce78c78949b48f13c30db",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "duct-tape",
|
||||
artifact = "org.rnorth.duct-tape:duct-tape:1.0.7",
|
||||
sha1 = "a26b5d90d88c91321dc7a3734ea72d2fc019ebb6",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "visible-assertions",
|
||||
artifact = "org.rnorth.visible-assertions:visible-assertions:2.1.2",
|
||||
sha1 = "20d31a578030ec8e941888537267d3123c2ad1c1",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jna",
|
||||
artifact = "net.java.dev.jna:jna:5.2.0",
|
||||
sha1 = "ed8b772eb077a9cb50e44e90899c66a9a6c00e67",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "javax-activation",
|
||||
artifact = "javax.activation:activation:1.1.1",
|
||||
|
||||
@ -11,7 +11,35 @@ TMP=$(mktemp -d || mktemp -d -t /tmp/tmp.XXXXXX)
|
||||
grep 'name = "[^"]*"' ${bzl} | sed 's|^[^"]*"||g;s|".*$||g' | sort > $TMP/names
|
||||
|
||||
cat << EOF > $TMP/want
|
||||
cglib-3_2
|
||||
dropwizard-core
|
||||
duct-tape
|
||||
eddsa
|
||||
elasticsearch-rest-client
|
||||
httpasyncclient
|
||||
httpcore-nio
|
||||
j2objc
|
||||
jackson-core
|
||||
javassist
|
||||
jna
|
||||
jruby
|
||||
mina-core
|
||||
nekohtml
|
||||
objenesis
|
||||
openid-consumer
|
||||
powermock-api-easymock
|
||||
powermock-api-support
|
||||
powermock-core
|
||||
powermock-module-junit4
|
||||
powermock-module-junit4-common
|
||||
powermock-reflect
|
||||
sshd
|
||||
sshd-mina
|
||||
testcontainers
|
||||
testcontainers-elasticsearch
|
||||
tukaani-xz
|
||||
visible-assertions
|
||||
xerces
|
||||
EOF
|
||||
|
||||
diff -u $TMP/names $TMP/want
|
||||
|
||||
@ -8,9 +8,188 @@ def declare_nongoogle_deps():
|
||||
enforced by //lib:nongoogle_test.
|
||||
"""
|
||||
|
||||
maven_jar(
|
||||
name = "j2objc",
|
||||
artifact = "com.google.j2objc:j2objc-annotations:1.1",
|
||||
sha1 = "ed28ded51a8b1c6b112568def5f4b455e6809019",
|
||||
)
|
||||
|
||||
# Transitive dependency of commons-compress
|
||||
maven_jar(
|
||||
name = "tukaani-xz",
|
||||
artifact = "org.tukaani:xz:1.6",
|
||||
sha1 = "05b6f921f1810bdf90e25471968f741f87168b64",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "dropwizard-core",
|
||||
artifact = "io.dropwizard.metrics:metrics-core:4.0.5",
|
||||
sha1 = "b81ef162970cdb9f4512ee2da09715a856ff4c4c",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "sshd",
|
||||
artifact = "org.apache.sshd:sshd-core:2.0.0",
|
||||
sha1 = "f4275079a2463cfd2bf1548a80e1683288a8e86b",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "eddsa",
|
||||
artifact = "net.i2p.crypto:eddsa:0.2.0",
|
||||
sha1 = "0856a92559c4daf744cb27c93cd8b7eb1f8c4780",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "mina-core",
|
||||
artifact = "org.apache.mina:mina-core:2.0.17",
|
||||
sha1 = "7e10ec974760436d931f3e58be507d1957bcc8db",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "sshd-mina",
|
||||
artifact = "org.apache.sshd:sshd-mina:2.0.0",
|
||||
sha1 = "50f2669312494f6c1996d8bd0d266c1fca7be6f6",
|
||||
)
|
||||
|
||||
# elasticsearch-rest-client explicitly depends on this version
|
||||
maven_jar(
|
||||
name = "httpasyncclient",
|
||||
artifact = "org.apache.httpcomponents:httpasyncclient:4.1.4",
|
||||
sha1 = "f3a3240681faae3fa46b573a4c7e50cec9db0d86",
|
||||
)
|
||||
|
||||
# elasticsearch-rest-client explicitly depends on this version
|
||||
maven_jar(
|
||||
name = "httpcore-nio",
|
||||
artifact = "org.apache.httpcomponents:httpcore-nio:4.4.11",
|
||||
sha1 = "7d0a97d01d39cff9aa3e6db81f21fddb2435f4e6",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "openid-consumer",
|
||||
artifact = "org.openid4java:openid4java:1.0.0",
|
||||
sha1 = "541091bb49f2c0d583544c5bb1e6df7612d31e3e",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "nekohtml",
|
||||
artifact = "net.sourceforge.nekohtml:nekohtml:1.9.10",
|
||||
sha1 = "14052461031a7054aa094f5573792feb6686d3de",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "xerces",
|
||||
artifact = "xerces:xercesImpl:2.8.1",
|
||||
attach_source = False,
|
||||
sha1 = "25101e37ec0c907db6f0612cbf106ee519c1aef1",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jruby",
|
||||
artifact = "org.jruby:jruby-complete:9.1.17.0",
|
||||
sha1 = "76716d529710fc03d1d429b43e3cedd4419f78d4",
|
||||
)
|
||||
|
||||
# When upgrading elasticsearch-rest-client, also upgrade httpcore-nio
|
||||
# and httpasyncclient as necessary.
|
||||
maven_jar(
|
||||
name = "elasticsearch-rest-client",
|
||||
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.2",
|
||||
sha1 = "f48725523c0b3402f869214433602f8d3f4c737c",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jackson-core",
|
||||
artifact = "com.fasterxml.jackson.core:jackson-core:2.10.1",
|
||||
sha1 = "2c8b5e26ba40e5f91eb37a24075a2028b402c5f9",
|
||||
)
|
||||
|
||||
# Test-only dependencies below.
|
||||
|
||||
maven_jar(
|
||||
name = "cglib-3_2",
|
||||
artifact = "cglib:cglib-nodep:3.2.6",
|
||||
sha1 = "92bf48723d277d6efd1150b2f7e9e1e92cb56caf",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "objenesis",
|
||||
artifact = "org.objenesis:objenesis:1.3",
|
||||
sha1 = "dc13ae4faca6df981fc7aeb5a522d9db446d5d50",
|
||||
)
|
||||
|
||||
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",
|
||||
)
|
||||
|
||||
TESTCONTAINERS_VERSION = "1.12.3"
|
||||
|
||||
maven_jar(
|
||||
name = "testcontainers",
|
||||
artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
|
||||
sha1 = "e424a4549640e120acceac641ac909fcda58bf62",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "testcontainers-elasticsearch",
|
||||
artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
|
||||
sha1 = "c0796de5032070b8768ce78c78949b48f13c30db",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "duct-tape",
|
||||
artifact = "org.rnorth.duct-tape:duct-tape:1.0.7",
|
||||
sha1 = "a26b5d90d88c91321dc7a3734ea72d2fc019ebb6",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "visible-assertions",
|
||||
artifact = "org.rnorth.visible-assertions:visible-assertions:2.1.2",
|
||||
sha1 = "20d31a578030ec8e941888537267d3123c2ad1c1",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "jna",
|
||||
artifact = "net.java.dev.jna:jna:5.2.0",
|
||||
sha1 = "ed8b772eb077a9cb50e44e90899c66a9a6c00e67",
|
||||
)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user