From d76bb757947c4e07aa0c4ee43e777dc7a62cab29 Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Thu, 9 Nov 2023 11:15:18 -0500 Subject: [PATCH 1/8] chore: fake update --- dependencies/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/README.md b/dependencies/README.md index c265ab122d..585e9e5b84 100644 --- a/dependencies/README.md +++ b/dependencies/README.md @@ -5,7 +5,7 @@ Linkage Checker is a tool that finds [linkage errors]( path. It scans the class files in the class path for references to other classes and reports any reference that cannot be satisfied. -#### User Documentation +### User Documentation Linkage Checker can be used from Maven or Gradle. From 29420781b516b9a0b51303f5ebb1e9cb73b278c0 Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Thu, 9 Nov 2023 11:38:09 -0500 Subject: [PATCH 2/8] chore: @Ignore LinkageCheckerMainIntegrationTest.testBom_java11 --- .../classpath/LinkageCheckerMainIntegrationTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java b/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java index 8a1d1179cf..efd9dea202 100644 --- a/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java +++ b/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java @@ -34,6 +34,7 @@ import org.junit.After; import org.junit.Assume; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; public class LinkageCheckerMainIntegrationTest { @@ -160,6 +161,9 @@ public void testBom_java8() } @Test + @Ignore("Began failing after Oct 4, 2023 and before Nov 9, 2023 without source changes") + // Error: expected: but was: + // No previous list of 756 expected linkage errors exists to compare against the new error count. public void testBom_java11() throws IOException, RepositoryException, TransformerException, XMLStreamException { // The number of linkage errors differs between Java 8 and Java 11 runtime. From 38545ac2265ab2fa78b3aa02620b1e2c1cc69e03 Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Thu, 9 Nov 2023 14:00:44 -0500 Subject: [PATCH 3/8] chore: change expected linkage errors in grpc-netty-shaded from 4 to 5 --- .../google/cloud/tools/opensource/dashboard/DashboardTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard/src/test/java/com/google/cloud/tools/opensource/dashboard/DashboardTest.java b/dashboard/src/test/java/com/google/cloud/tools/opensource/dashboard/DashboardTest.java index b62589cbc4..31e21962a2 100644 --- a/dashboard/src/test/java/com/google/cloud/tools/opensource/dashboard/DashboardTest.java +++ b/dashboard/src/test/java/com/google/cloud/tools/opensource/dashboard/DashboardTest.java @@ -217,7 +217,7 @@ public void testLinkageReports() { Nodes reports = details.query("//p[@class='jar-linkage-report']"); // appengine-api-sdk, shown as first item in linkage errors, has these errors assertThat(trimAndCollapseWhiteSpace(reports.get(0).getValue())) - .isEqualTo("4 target classes causing linkage errors referenced from 4 source classes."); + .isEqualTo("5 target classes causing linkage errors referenced from 5 source classes."); Nodes dependencyPaths = details.query("//p[@class='linkage-check-dependency-paths']"); Node dependencyPathMessageOnProblem = dependencyPaths.get(dependencyPaths.size() - 1); From b01a24b05c1b264554596970ca10ec8add06bccc Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Thu, 9 Nov 2023 14:45:06 -0500 Subject: [PATCH 4/8] chore: change expected Linkage Checker rule errors in bom-project-using-spring-repository from 107 to 108 --- .../src/it/bom-project-using-spring-repository/verify.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enforcer-rules/src/it/bom-project-using-spring-repository/verify.groovy b/enforcer-rules/src/it/bom-project-using-spring-repository/verify.groovy index e5d69decfd..ce90a31ff6 100644 --- a/enforcer-rules/src/it/bom-project-using-spring-repository/verify.groovy +++ b/enforcer-rules/src/it/bom-project-using-spring-repository/verify.groovy @@ -14,6 +14,6 @@ assert !buildLog.text.contains("NullPointerException") // 4 linkage errors are references to java.util.concurrent.Flow class, which does not exist in // Java 8 runtime yet. -def expectedErrorCount = System.getProperty("java.version").startsWith("1.8.") ? 111 : 107 +def expectedErrorCount = System.getProperty("java.version").startsWith("1.8.") ? 111 : 108 assert buildLog.text.contains("Linkage Checker rule found $expectedErrorCount errors:") From 17260a80f4c9c957d885a96ccd7dc8944399bbaa Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Thu, 9 Nov 2023 15:07:16 -0500 Subject: [PATCH 5/8] chore: relocate linkage error assertion to JDK-version specific test --- .../opensource/dashboard/DashboardTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dashboard/src/test/java/com/google/cloud/tools/opensource/dashboard/DashboardTest.java b/dashboard/src/test/java/com/google/cloud/tools/opensource/dashboard/DashboardTest.java index 31e21962a2..ffeba49324 100644 --- a/dashboard/src/test/java/com/google/cloud/tools/opensource/dashboard/DashboardTest.java +++ b/dashboard/src/test/java/com/google/cloud/tools/opensource/dashboard/DashboardTest.java @@ -214,11 +214,6 @@ public void testDashboard_statisticBox() { @Test public void testLinkageReports() { - Nodes reports = details.query("//p[@class='jar-linkage-report']"); - // appengine-api-sdk, shown as first item in linkage errors, has these errors - assertThat(trimAndCollapseWhiteSpace(reports.get(0).getValue())) - .isEqualTo("5 target classes causing linkage errors referenced from 5 source classes."); - Nodes dependencyPaths = details.query("//p[@class='linkage-check-dependency-paths']"); Node dependencyPathMessageOnProblem = dependencyPaths.get(dependencyPaths.size() - 1); Assert.assertEquals( @@ -296,6 +291,12 @@ public void testComponent_linkageCheckResult_java8() throws IOException, Parsing assertThat(trimAndCollapseWhiteSpace(reports.get(0).getValue())) .isEqualTo("100 target classes causing linkage errors referenced from 540 source classes."); + + Nodes artifactDetailsReports = details.query("//p[@class='jar-linkage-report']"); + // appengine-api-sdk, shown as first item in linkage errors, has these errors + assertThat(trimAndCollapseWhiteSpace(artifactDetailsReports.get(0).getValue())) + .isEqualTo("4 target classes causing linkage errors referenced from 4 source classes."); + Nodes causes = document.query("//p[@class='jar-linkage-report-cause']"); assertWithMessage( "google-http-client-appengine should show linkage errors for RpcStubDescriptor") @@ -313,6 +314,11 @@ public void testComponent_linkageCheckResult_java11() throws IOException, Parsin int javaMajorVersion = Integer.parseInt(javaVersion.split("\\.")[0]); Assume.assumeTrue(javaMajorVersion >= 11); + Nodes artifactDetailsReports = details.query("//p[@class='jar-linkage-report']"); + // appengine-api-sdk, shown as first item in linkage errors, has these errors + assertThat(trimAndCollapseWhiteSpace(artifactDetailsReports.get(0).getValue())) + .isEqualTo("5 target classes causing linkage errors referenced from 5 source classes."); + // The version used in libraries-bom 1.0.0. The google-http-client-appengine has been known to // have linkage errors in its dependency appengine-api-1.0-sdk:1.9.71. Document document = From bf7584463614421d9fd062968d02501c2ba7897d Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Fri, 10 Nov 2023 13:09:40 -0500 Subject: [PATCH 6/8] chore: update LinkageCheckerMainIntegrationTest expected error count --- .../classpath/LinkageCheckerMainIntegrationTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java b/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java index efd9dea202..65b3914adc 100644 --- a/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java +++ b/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java @@ -161,7 +161,6 @@ public void testBom_java8() } @Test - @Ignore("Began failing after Oct 4, 2023 and before Nov 9, 2023 without source changes") // Error: expected: but was: // No previous list of 756 expected linkage errors exists to compare against the new error count. public void testBom_java11() @@ -176,7 +175,7 @@ public void testBom_java11() LinkageCheckerMain.main(new String[] {"-b", "com.google.cloud:libraries-bom:1.0.0"}); fail("LinkageCheckerMain should throw LinkageCheckResultException upon errors"); } catch (LinkageCheckResultException expected) { - assertEquals("Found 756 linkage errors", expected.getMessage()); + assertEquals("Found 758 linkage errors", expected.getMessage()); } String output = readCapturedStdout(); From 605b80882b70845a0e932be7b4ae6c900394512a Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Fri, 10 Nov 2023 13:13:43 -0500 Subject: [PATCH 7/8] chore: remove unused import --- .../opensource/classpath/LinkageCheckerMainIntegrationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java b/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java index 65b3914adc..95e72b9354 100644 --- a/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java +++ b/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java @@ -34,7 +34,6 @@ import org.junit.After; import org.junit.Assume; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; public class LinkageCheckerMainIntegrationTest { From a45e86507753e5ca3edce97ce5982bde39127b0f Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Fri, 10 Nov 2023 13:14:08 -0500 Subject: [PATCH 8/8] chore: remove outdated comments --- .../opensource/classpath/LinkageCheckerMainIntegrationTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java b/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java index 95e72b9354..992f544656 100644 --- a/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java +++ b/dependencies/src/test/java/com/google/cloud/tools/opensource/classpath/LinkageCheckerMainIntegrationTest.java @@ -160,8 +160,6 @@ public void testBom_java8() } @Test - // Error: expected: but was: - // No previous list of 756 expected linkage errors exists to compare against the new error count. public void testBom_java11() throws IOException, RepositoryException, TransformerException, XMLStreamException { // The number of linkage errors differs between Java 8 and Java 11 runtime.