Skip to content

Commit 6cd5c90

Browse files
committed
fix
1 parent 80f153e commit 6cd5c90

File tree

3 files changed

+178
-7
lines changed

3 files changed

+178
-7
lines changed

tests/custom_maven_install/coursier_resolved_install.json

Lines changed: 91 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,95 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -1749225327,
4-
"__RESOLVED_ARTIFACTS_HASH": -821389950,
3+
"__INPUT_ARTIFACTS_HASH": {
4+
"com.google.auth:google-auth-library-oauth2-http": 991267597,
5+
"com.google.auto:auto-common": -832702775,
6+
"com.google.cloud:google-cloud-bigquery": 1661989687,
7+
"com.google.cloud:libraries-bom": 710163787,
8+
"repositories": -1949687017
9+
},
10+
"__RESOLVED_ARTIFACTS_HASH": {
11+
"com.fasterxml.jackson.core:jackson-annotations": -15199951,
12+
"com.fasterxml.jackson.core:jackson-core": -1299936085,
13+
"com.fasterxml.jackson.core:jackson-databind": 298815505,
14+
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": -2004052717,
15+
"com.google.android:annotations": 2096496032,
16+
"com.google.api-client:google-api-client": 301964358,
17+
"com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1": -1675930101,
18+
"com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1": -2051887160,
19+
"com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2": -825839132,
20+
"com.google.api.grpc:proto-google-cloud-bigquerystorage-v1": -948743162,
21+
"com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha": -1610858001,
22+
"com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1": 655246401,
23+
"com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2": 478419370,
24+
"com.google.api.grpc:proto-google-common-protos": 1013345642,
25+
"com.google.api.grpc:proto-google-iam-v1": 323680405,
26+
"com.google.api:api-common": 1897926401,
27+
"com.google.api:gax": -725014247,
28+
"com.google.api:gax-grpc": 830261426,
29+
"com.google.api:gax-httpjson": 460866920,
30+
"com.google.apis:google-api-services-bigquery": -707640637,
31+
"com.google.auth:google-auth-library-credentials": -38083388,
32+
"com.google.auth:google-auth-library-oauth2-http": -197000045,
33+
"com.google.auto.value:auto-value": 1110951021,
34+
"com.google.auto.value:auto-value-annotations": 641018093,
35+
"com.google.auto:auto-common": 1968662279,
36+
"com.google.cloud:google-cloud-bigquery": -181021345,
37+
"com.google.cloud:google-cloud-bigquerystorage": 501592626,
38+
"com.google.cloud:google-cloud-core": 533820805,
39+
"com.google.cloud:google-cloud-core-http": -327174643,
40+
"com.google.code.findbugs:jsr305": 870839855,
41+
"com.google.code.gson:gson": 1698094868,
42+
"com.google.errorprone:error_prone_annotations": 1014409728,
43+
"com.google.flatbuffers:flatbuffers-java": -1130203947,
44+
"com.google.guava:failureaccess": -718864417,
45+
"com.google.guava:guava": 1045124605,
46+
"com.google.guava:listenablefuture": 1079558157,
47+
"com.google.http-client:google-http-client": 2071394127,
48+
"com.google.http-client:google-http-client-apache-v2": -1368195375,
49+
"com.google.http-client:google-http-client-appengine": -1713434323,
50+
"com.google.http-client:google-http-client-gson": -480394556,
51+
"com.google.j2objc:j2objc-annotations": -404209759,
52+
"com.google.oauth-client:google-oauth-client": -1604056006,
53+
"com.google.protobuf:protobuf-java": -758252690,
54+
"com.google.protobuf:protobuf-java-util": -1866498432,
55+
"commons-codec:commons-codec": -28659539,
56+
"io.grpc:grpc-alts": 1043455852,
57+
"io.grpc:grpc-api": 32128397,
58+
"io.grpc:grpc-context": -1585690271,
59+
"io.grpc:grpc-core": -1280008493,
60+
"io.grpc:grpc-googleapis": -1179552585,
61+
"io.grpc:grpc-grpclb": 537861896,
62+
"io.grpc:grpc-inprocess": 574578431,
63+
"io.grpc:grpc-netty-shaded": -1629092124,
64+
"io.grpc:grpc-protobuf": -312725142,
65+
"io.grpc:grpc-protobuf-lite": -1374866882,
66+
"io.grpc:grpc-stub": -609312316,
67+
"io.grpc:grpc-util": 1021337938,
68+
"io.netty:netty-buffer": -501086272,
69+
"io.netty:netty-common": 1159007193,
70+
"io.opencensus:opencensus-api": -2128472383,
71+
"io.opencensus:opencensus-contrib-http-util": -1954738382,
72+
"io.opentelemetry:opentelemetry-api": -1533216960,
73+
"io.opentelemetry:opentelemetry-context": 11027445,
74+
"io.perfmark:perfmark-api": -1795841558,
75+
"javax.annotation:javax.annotation-api": -1009230154,
76+
"org.apache.arrow:arrow-format": -1324733457,
77+
"org.apache.arrow:arrow-memory-core": 648193187,
78+
"org.apache.arrow:arrow-memory-netty": 1706469998,
79+
"org.apache.arrow:arrow-vector": -1120707973,
80+
"org.apache.httpcomponents:httpclient": -930110091,
81+
"org.apache.httpcomponents:httpcore": 67453319,
82+
"org.checkerframework:checker-compat-qual": 2124515296,
83+
"org.checkerframework:checker-qual": -1482757721,
84+
"org.codehaus.mojo:animal-sniffer-annotations": -1619058809,
85+
"org.conscrypt:conscrypt-openjdk-uber": 742580967,
86+
"org.eclipse.collections:eclipse-collections": 515042027,
87+
"org.eclipse.collections:eclipse-collections-api": 516322101,
88+
"org.json:json": -1501897552,
89+
"org.slf4j:slf4j-api": -749495182,
90+
"org.threeten:threeten-extra": 322422590,
91+
"org.threeten:threetenbp": 1406815789
92+
},
593
"conflict_resolution": {
694
"com.google.auth:google-auth-library-oauth2-http": "com.google.auth:google-auth-library-oauth2-http:1.33.1",
795
"com.google.cloud:google-cloud-bigquery": "com.google.cloud:google-cloud-bigquery:2.49.0"
@@ -2407,5 +2495,5 @@
24072495
]
24082496
}
24092497
},
2410-
"version": "2"
2498+
"version": "3"
24112499
}

tests/custom_maven_install/maven_resolved_install.json

Lines changed: 86 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,90 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -1679232744,
4-
"__RESOLVED_ARTIFACTS_HASH": 1461783303,
3+
"__INPUT_ARTIFACTS_HASH": {
4+
"com.google.auto.value:auto-value-annotations": -1902273817,
5+
"net.sf.json-lib:json-lib": -697400091,
6+
"org.drools:drools-mvel": 1863360566,
7+
"org.optaplanner:optaplanner-core": 1504805403,
8+
"org.seleniumhq.selenium:selenium-bom": -457770816,
9+
"org.seleniumhq.selenium:selenium-java": -2123729016,
10+
"repositories": -315355421
11+
},
12+
"__RESOLVED_ARTIFACTS_HASH": {
13+
"com.github.javaparser:javaparser-core": 2065268403,
14+
"com.google.auto.service:auto-service-annotations": 262983930,
15+
"com.google.auto.value:auto-value-annotations": 413037104,
16+
"com.google.guava:guava": 734675670,
17+
"com.thoughtworks.xstream:xstream": 401427885,
18+
"commons-beanutils:commons-beanutils": -84415581,
19+
"commons-codec:commons-codec": -1543128303,
20+
"commons-collections:commons-collections": 334877720,
21+
"commons-lang:commons-lang": 849229148,
22+
"commons-logging:commons-logging": -2131529292,
23+
"dev.failsafe:failsafe": -253921025,
24+
"io.github.x-stream:mxparser": 110533211,
25+
"io.opentelemetry:opentelemetry-api": 2049998201,
26+
"io.opentelemetry:opentelemetry-api-events": -199493817,
27+
"io.opentelemetry:opentelemetry-context": 587344705,
28+
"io.opentelemetry:opentelemetry-exporter-logging": 899705141,
29+
"io.opentelemetry:opentelemetry-extension-incubator": 101924900,
30+
"io.opentelemetry:opentelemetry-sdk": -2085662267,
31+
"io.opentelemetry:opentelemetry-sdk-common": 769843140,
32+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure": -1510169109,
33+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi": -552370191,
34+
"io.opentelemetry:opentelemetry-sdk-logs": 1875683161,
35+
"io.opentelemetry:opentelemetry-sdk-metrics": 265012770,
36+
"io.opentelemetry:opentelemetry-sdk-trace": 1597368498,
37+
"io.opentelemetry:opentelemetry-semconv": 1007803274,
38+
"net.bytebuddy:byte-buddy": 1086524953,
39+
"net.sf.ezmorph:ezmorph": -1715621718,
40+
"net.sf.json-lib:json-lib:jar:jdk15": -636516130,
41+
"org.antlr:antlr-runtime": -1636816377,
42+
"org.apache.commons:commons-exec": 2113995192,
43+
"org.apache.commons:commons-lang3": 487207135,
44+
"org.apache.commons:commons-math3": 1401449619,
45+
"org.drools:drools-canonical-model": -1600079424,
46+
"org.drools:drools-compiler": 746362012,
47+
"org.drools:drools-core": 1048506213,
48+
"org.drools:drools-core-dynamic": 910052301,
49+
"org.drools:drools-core-reflective": -346158958,
50+
"org.drools:drools-ecj": 1388163007,
51+
"org.drools:drools-model-compiler": 1750679104,
52+
"org.drools:drools-mvel": -1367885592,
53+
"org.drools:drools-mvel-compiler": 1627731278,
54+
"org.drools:drools-mvel-parser": 1845480135,
55+
"org.javassist:javassist": 2023479029,
56+
"org.kie.soup:kie-soup-commons": 244991340,
57+
"org.kie.soup:kie-soup-maven-support": 765938465,
58+
"org.kie.soup:kie-soup-project-datamodel-api": -431304781,
59+
"org.kie.soup:kie-soup-project-datamodel-commons": -50440142,
60+
"org.kie.soup:kie-soup-xstream": 847410459,
61+
"org.kie:kie-api": 1205967300,
62+
"org.kie:kie-internal": -1026725853,
63+
"org.kie:kie-memory-compiler": 505077746,
64+
"org.mvel:mvel2": -531387633,
65+
"org.optaplanner:optaplanner-core": -130295809,
66+
"org.reflections:reflections": 613312211,
67+
"org.seleniumhq.selenium:selenium-api": 1626352587,
68+
"org.seleniumhq.selenium:selenium-chrome-driver": -1136374414,
69+
"org.seleniumhq.selenium:selenium-chromium-driver": -67459411,
70+
"org.seleniumhq.selenium:selenium-devtools-v116": 332351781,
71+
"org.seleniumhq.selenium:selenium-devtools-v117": 1737727710,
72+
"org.seleniumhq.selenium:selenium-devtools-v118": 876235604,
73+
"org.seleniumhq.selenium:selenium-devtools-v85": -974128897,
74+
"org.seleniumhq.selenium:selenium-edge-driver": -630326073,
75+
"org.seleniumhq.selenium:selenium-firefox-driver": 2079866542,
76+
"org.seleniumhq.selenium:selenium-http": 223670030,
77+
"org.seleniumhq.selenium:selenium-ie-driver": -705940065,
78+
"org.seleniumhq.selenium:selenium-java": 3398759,
79+
"org.seleniumhq.selenium:selenium-json": 1922704862,
80+
"org.seleniumhq.selenium:selenium-manager": 804615261,
81+
"org.seleniumhq.selenium:selenium-os": 848073579,
82+
"org.seleniumhq.selenium:selenium-remote-driver": -2024835808,
83+
"org.seleniumhq.selenium:selenium-safari-driver": -2108274429,
84+
"org.seleniumhq.selenium:selenium-support": 455725782,
85+
"org.slf4j:slf4j-api": -801231047,
86+
"xmlpull:xmlpull": -732624529
87+
},
588
"artifacts": {
689
"com.github.javaparser:javaparser-core": {
790
"shasums": {
@@ -2475,5 +2558,5 @@
24752558
}
24762559
},
24772560
"skipped": [],
2478-
"version": "2"
2561+
"version": "3"
24792562
}

tests/unit/coursier_test.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ def _calculate_inputs_hash_uses_excluded_artifacts_test(ctx):
614614

615615
asserts.false(env, hash1 == hash2)
616616
asserts.true(env, old_hashes1[0] == old_hashes2[0])
617-
asserts.true(env, old_hashes1[1] == old_hashes2[1])
617+
asserts.false(env, old_hashes1[1] == old_hashes2[1])
618618

619619
return unittest.end(env)
620620

0 commit comments

Comments
 (0)