Skip to content

Commit 153eb29

Browse files
authored
Google Cloud BOM 0.167.0 and other related dependencies (#2281)
* Google Cloud BOM 0.167.0 and other related dependencies * Debugging * cause may be null when printing * Added exclusion rule * Excluding com.oracle.objectfile
1 parent 092d0ae commit 153eb29

File tree

4 files changed

+54
-21
lines changed

4 files changed

+54
-21
lines changed

boms/cloud-oss-bom/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@
4848
<properties>
4949
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5050
<guava.version>31.0.1-jre</guava.version>
51-
<google.cloud.bom.version>0.166.0</google.cloud.bom.version>
52-
<google.cloud.core.version>2.3.5</google.cloud.core.version>
53-
<io.grpc.version>1.43.2</io.grpc.version>
54-
<http.version>1.41.0</http.version>
55-
<protobuf.version>3.19.2</protobuf.version>
51+
<google.cloud.bom.version>0.167.0</google.cloud.bom.version>
52+
<google.cloud.core.version>2.4.0</google.cloud.core.version>
53+
<io.grpc.version>1.44.0</io.grpc.version>
54+
<http.version>1.41.2</http.version>
55+
<protobuf.version>3.19.3</protobuf.version>
5656
<!-- We don't use gax-bom because it includes the artifacts with 'testlib' classifier.
5757
When updating gax.version, update gax.httpjson.version too. -->
58-
<gax.version>2.8.1</gax.version>
59-
<gax.httpjson.version>0.93.1</gax.httpjson.version>
60-
<auth.version>1.3.0</auth.version>
61-
<api-common.version>2.1.2</api-common.version>
62-
<common.protos.version>2.7.1</common.protos.version>
63-
<iam.protos.version>1.2.0</iam.protos.version>
58+
<gax.version>2.11.0</gax.version>
59+
<gax.httpjson.version>0.96.0</gax.httpjson.version>
60+
<auth.version>1.4.0</auth.version>
61+
<api-common.version>2.1.3</api-common.version>
62+
<common.protos.version>2.7.2</common.protos.version>
63+
<iam.protos.version>1.2.1</iam.protos.version>
6464
</properties>
6565

6666
<distributionManagement>

boms/integration-tests/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<!-- To avoid ForkedBooter loading issue -->
4040
<useSystemClassLoader>false</useSystemClassLoader>
4141
<argLine>-Xms128m -Xmx2048m</argLine>
42+
<trimStackTrace>false</trimStackTrace>
4243
</configuration>
4344
</plugin>
4445
</plugins>

dependencies/src/main/java/com/google/cloud/tools/opensource/classpath/LinkageProblem.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,12 @@ public static String formatLinkageProblems(
218218

219219
for (AbstractMethodProblem abstractMethodProblem : abstractMethodProblems.build()) {
220220
output.append(abstractMethodProblem + "\n");
221-
output.append(" Cause:\n");
222221
LinkageProblemCause cause = abstractMethodProblem.getCause();
223-
String causeWithIndent = cause.toString().replaceAll("\n", "\n ");
224-
output.append(" " + causeWithIndent + "\n");
222+
if (cause != null) {
223+
output.append(" Cause:\n");
224+
String causeWithIndent = cause.toString().replaceAll("\n", "\n ");
225+
output.append(" " + causeWithIndent + "\n");
226+
}
225227
}
226228

227229
if (classPathResult != null) {

dependencies/src/main/resources/linkage-checker-exclusion-default.xml

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,17 @@
1010
https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/816
1111
</Reason>
1212
</LinkageError>
13-
13+
<LinkageError>
14+
<Source>
15+
<Package name="com.oracle.objectfile" />
16+
</Source>
17+
<Reason>
18+
GraalVM-related libraries depend on Java Compiler Interface (JVMCI) that
19+
only exists in special JDK. These missing classes are false positives, because
20+
the code is only invoked when running in a GraalVM.
21+
https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/929
22+
</Reason>
23+
</LinkageError>
1424
<LinkageError>
1525
<Source>
1626
<Package name="com.oracle.svm" />
@@ -26,17 +36,16 @@
2636
<Target>
2737
<Package name="jdk.vm.ci" />
2838
</Target>
29-
<Source>
30-
<Package name="com.oracle.graal" />
31-
</Source>
3239
</LinkageError>
3340
<LinkageError>
3441
<Target>
3542
<Package name="jdk.vm.ci" />
3643
</Target>
37-
<Source>
38-
<Package name="org.graalvm" />
39-
</Source>
44+
<Reason>
45+
Substrate VM is part of GraalVM and the virtual machine references classes in the JVM-internal
46+
package 'sun.text.normalizer' that are not available in JVM runtime.
47+
https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/1825
48+
</Reason>
4049
</LinkageError>
4150
<LinkageError>
4251
<Target>
@@ -425,4 +434,25 @@
425434
in different JDK versions. Certain classes are unavailable in a JDK.
426435
</Reason>
427436
</LinkageError>
437+
<LinkageError>
438+
<Source>
439+
<Package name="com.sun.mail.smtp" />
440+
</Source>
441+
<Reason>
442+
Google Cloud libraries do not use SMTP protocols. There are discrepancy in
443+
javax.mail:mail:1.4.3 com.sun.mail:javax.mail:1.6.2 in dependency graph.
444+
</Reason>
445+
</LinkageError>
446+
<LinkageError>
447+
<Source>
448+
<Package name="com.ctc.wstx.shaded" />
449+
</Source>
450+
<Target>
451+
<Class name="com.ctc.wstx.shaded.msv_core.driver.textui.Driver" />
452+
</Target>
453+
<Reason>
454+
Shaded class in com.fasterxml.woodstox:woodstox-core:6.2.6 has a class
455+
reference to the textui.Driver but the shading process didn't include it.
456+
</Reason>
457+
</LinkageError>
428458
</LinkageCheckerFilter>

0 commit comments

Comments
 (0)