From bf97f425cb93e62364886de3ba51a9078773f2e7 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 12 Sep 2017 11:52:28 -0700 Subject: [PATCH 001/300] Update Compile-Testing docs to refer to latest version. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=168412915 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2fb5cec8..9a01925c 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ A library for testing javac compilation with or without annotation processors. S Latest Release -------------- -The latest release is version `0.8`. Include it as a [Maven](http://maven.apache.org/) dependency with the following snippet: +The latest release is version `0.12`. Include it as a [Maven](http://maven.apache.org/) dependency with the following snippet: ``` com.google.testing.compile compile-testing - 0.8 + 0.12 test ``` From e5e4eef1f1f504c26b7b10703d7ce6f370b485f4 Mon Sep 17 00:00:00 2001 From: jijiang Date: Wed, 20 Sep 2017 18:48:12 -0700 Subject: [PATCH 002/300] Change mocking of FailureStrategy to use ExpectFailure instead for testing custom subject as well as fixed several places in subjects where 'fail()' is invoked but check doesn't return. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=169485275 --- .../testing/compile/CompilationSubject.java | 7 +- .../testing/compile/JavaSourcesSubject.java | 201 +-- .../compile/CompilationSubjectTest.java | 714 +++++------ .../compile/JavaFileObjectSubjectTest.java | 96 +- .../JavaSourcesSubjectFactoryTest.java | 1088 ++++++++--------- .../compile/VerificationFailureStrategy.java | 46 - 6 files changed, 1056 insertions(+), 1096 deletions(-) delete mode 100644 src/test/java/com/google/testing/compile/VerificationFailureStrategy.java diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 7222e8a1..1a38a8f9 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -320,6 +320,10 @@ public JavaFileObjectSubject generatedSourceFile(String qualifiedName) { StandardLocation.SOURCE_OUTPUT, qualifiedName.replaceAll("\\.", "/") + ".java"); } + private static final JavaFileObject ALREADY_FAILED = + JavaFileObjects.forSourceLines( + "compile.Failure", "package compile;", "", "final class Failure {}"); + private JavaFileObjectSubject checkGeneratedFile( Optional generatedFile, Location location, String format, Object... args) { if (!generatedFile.isPresent()) { @@ -332,6 +336,7 @@ private JavaFileObjectSubject checkGeneratedFile( } } fail(builder.toString()); + return ignoreCheck().about(javaFileObjects()).that(ALREADY_FAILED); } return check().about(javaFileObjects()).that(generatedFile.get()); } @@ -445,7 +450,7 @@ ImmutableList linesInFile() { } return lines; } - + /** * Returns a {@link Collector} that lists the file lines numbered by the input stream (1-based). */ diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index f9759e70..f1fdf952 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -55,7 +55,7 @@ /** * A Truth {@link Subject} that evaluates the result - * of a {@code javac} compilation. See {@link com.google.testing.compile} for usage examples + * of a {@code javac} compilation. See {@link com.google.testing.compile} for usage examples * * @author Gregory Kick */ @@ -138,6 +138,7 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { if (Iterables.isEmpty(actual())) { failureStrategy.fail( "Compilation generated no additional source files, though some were expected."); + return; } ParseResult actualResult = Parser.parse(actual()); ImmutableList> errors = @@ -149,52 +150,61 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { message.append(error); } failureStrategy.fail(message.toString()); + return; } final ParseResult expectedResult = Parser.parse(Lists.asList(first, rest)); - final FluentIterable actualTrees = FluentIterable.from( - actualResult.compilationUnits()); - final FluentIterable expectedTrees = FluentIterable.from( - expectedResult.compilationUnits()); + final FluentIterable actualTrees = + FluentIterable.from(actualResult.compilationUnits()); + final FluentIterable expectedTrees = + FluentIterable.from(expectedResult.compilationUnits()); Function> getTypesFunction = new Function>() { - @Override public ImmutableSet apply(CompilationUnitTree compilationUnit) { - return TypeEnumerator.getTopLevelTypes(compilationUnit); - } - }; + @Override + public ImmutableSet apply(CompilationUnitTree compilationUnit) { + return TypeEnumerator.getTopLevelTypes(compilationUnit); + } + }; final ImmutableMap> expectedTreeTypes = Maps.toMap(expectedTrees, getTypesFunction); final ImmutableMap> actualTreeTypes = Maps.toMap(actualTrees, getTypesFunction); final ImmutableMap> - matchedTrees = Maps.toMap(expectedTrees, - new Function>() { - @Override public Optional apply( - final CompilationUnitTree expectedTree) { - return Iterables.tryFind(actualTrees, - new Predicate() { - @Override public boolean apply(CompilationUnitTree actualTree) { - return expectedTreeTypes.get(expectedTree).equals( - actualTreeTypes.get(actualTree)); - } - }); - } - }); + matchedTrees = + Maps.toMap( + expectedTrees, + new Function>() { + @Override + public Optional apply( + final CompilationUnitTree expectedTree) { + return Iterables.tryFind( + actualTrees, + new Predicate() { + @Override + public boolean apply(CompilationUnitTree actualTree) { + return expectedTreeTypes + .get(expectedTree) + .equals(actualTreeTypes.get(actualTree)); + } + }); + } + }); for (Map.Entry> - matchedTreePair : matchedTrees.entrySet()) { + matchedTreePair : matchedTrees.entrySet()) { final CompilationUnitTree expectedTree = matchedTreePair.getKey(); if (!matchedTreePair.getValue().isPresent()) { - failNoCandidates(expectedTreeTypes.get(expectedTree), expectedTree, - actualTreeTypes, actualTrees); + failNoCandidates( + expectedTreeTypes.get(expectedTree), expectedTree, actualTreeTypes, actualTrees); } else { CompilationUnitTree actualTree = matchedTreePair.getValue().get(); TreeDifference treeDifference = TreeDiffer.diffCompilationUnits(expectedTree, actualTree); if (!treeDifference.isEmpty()) { - String diffReport = treeDifference.getDiffReport( - new TreeContext(expectedTree, expectedResult.trees()), - new TreeContext(actualTree, actualResult.trees())); + String diffReport = + treeDifference.getDiffReport( + new TreeContext(expectedTree, expectedResult.trees()), + new TreeContext(actualTree, actualResult.trees())); failWithCandidate(expectedTree.getSourceFile(), actualTree.getSourceFile(), diffReport); } } @@ -202,62 +212,74 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { } /** Called when the {@code generatesSources()} verb fails with no diff candidates. */ - private void failNoCandidates(ImmutableSet expectedTypes, + private void failNoCandidates( + ImmutableSet expectedTypes, CompilationUnitTree expectedTree, final ImmutableMap> actualTypes, FluentIterable actualTrees) { - String generatedTypesReport = Joiner.on('\n').join( - actualTrees.transform(new Function() { - @Override public String apply(CompilationUnitTree generated) { - return String.format("- %s in <%s>", - actualTypes.get(generated), - generated.getSourceFile().toUri().getPath()); - } - }) - .toList()); - failureStrategy.fail(Joiner.on('\n').join( - "", - "An expected source declared one or more top-level types that were not present.", - "", - String.format("Expected top-level types: <%s>", expectedTypes), - String.format("Declared by expected file: <%s>", - expectedTree.getSourceFile().toUri().getPath()), - "", - "The top-level types that were present are as follows: ", - "", - generatedTypesReport, - "")); + String generatedTypesReport = + Joiner.on('\n') + .join( + actualTrees + .transform( + new Function() { + @Override + public String apply(CompilationUnitTree generated) { + return String.format( + "- %s in <%s>", + actualTypes.get(generated), + generated.getSourceFile().toUri().getPath()); + } + }) + .toList()); + failureStrategy.fail( + Joiner.on('\n') + .join( + "", + "An expected source declared one or more top-level types that were not present.", + "", + String.format("Expected top-level types: <%s>", expectedTypes), + String.format( + "Declared by expected file: <%s>", + expectedTree.getSourceFile().toUri().getPath()), + "", + "The top-level types that were present are as follows: ", + "", + generatedTypesReport, + "")); } /** Called when the {@code generatesSources()} verb fails with a diff candidate. */ - private void failWithCandidate(JavaFileObject expectedSource, - JavaFileObject actualSource, String diffReport) { + private void failWithCandidate( + JavaFileObject expectedSource, JavaFileObject actualSource, String diffReport) { try { - failureStrategy.fail(Joiner.on('\n').join( - "", - "Source declared the same top-level types of an expected source, but", - "didn't match exactly.", - "", - String.format("Expected file: <%s>", expectedSource.toUri().getPath()), - String.format("Actual file: <%s>", actualSource.toUri().getPath()), - "", - "Diffs:", - "======", - "", - diffReport, - "", - "Expected Source: ", - "================", - "", - expectedSource.getCharContent(false).toString(), - "", - "Actual Source:", - "=================", - "", - actualSource.getCharContent(false).toString())); + failureStrategy.fail( + Joiner.on('\n') + .join( + "", + "Source declared the same top-level types of an expected source, but", + "didn't match exactly.", + "", + String.format("Expected file: <%s>", expectedSource.toUri().getPath()), + String.format("Actual file: <%s>", actualSource.toUri().getPath()), + "", + "Diffs:", + "======", + "", + diffReport, + "", + "Expected Source: ", + "================", + "", + expectedSource.getCharContent(false).toString(), + "", + "Actual Source:", + "=================", + "", + actualSource.getCharContent(false).toString())); } catch (IOException e) { - throw new IllegalStateException("Couldn't read from JavaFileObject when it was already " - + "in memory.", e); + throw new IllegalStateException( + "Couldn't read from JavaFileObject when it was already " + "in memory.", e); } } @@ -355,9 +377,7 @@ public FileClause withErrorContaining(String messageFragment) { check().about(compilations()).that(compilation).hadErrorContaining(messageFragment)); } - /** - * Returns this object, cast to {@code T}. - */ + /** Returns this object, cast to {@code T}. */ @SuppressWarnings("unchecked") protected final T thisObject() { return (T) this; @@ -408,8 +428,8 @@ public ChainingClause atColumn(long columnNumber) { } /** - * Base implementation of {@link GeneratedPredicateClause GeneratedPredicateClause} and - * {@link ChainingClause ChainingClause>}. + * Base implementation of {@link GeneratedPredicateClause GeneratedPredicateClause} and {@link + * ChainingClause ChainingClause>}. * * @param T the type parameter to {@link GeneratedPredicateClause}. {@code this} must be an * instance of {@code T}. @@ -434,8 +454,8 @@ public T generatesSources(JavaFileObject first, JavaFileObject... rest) { public T generatesFiles(JavaFileObject first, JavaFileObject... rest) { for (JavaFileObject expected : Lists.asList(first, rest)) { if (!wasGenerated(expected)) { - failureStrategy.fail("Did not find a generated file corresponding to " - + expected.getName()); + failureStrategy.fail( + "Did not find a generated file corresponding to " + expected.getName()); } } return thisObject(); @@ -531,21 +551,20 @@ public static JavaSourcesSubject assertThat(JavaFileObject javaFileObject) { public static JavaSourcesSubject assertThat( JavaFileObject javaFileObject, JavaFileObject... javaFileObjects) { return assertAbout(javaSources()) - .that(ImmutableList.builder() - .add(javaFileObject) - .add(javaFileObjects) - .build()); + .that( + ImmutableList.builder() + .add(javaFileObject) + .add(javaFileObjects) + .build()); } - public static final class SingleSourceAdapter - extends Subject + public static final class SingleSourceAdapter extends Subject implements CompileTester, ProcessedCompileTesterFactory { private final JavaSourcesSubject delegate; SingleSourceAdapter(FailureStrategy failureStrategy, JavaFileObject subject) { super(failureStrategy, subject); - this.delegate = - new JavaSourcesSubject(failureStrategy, ImmutableList.of(subject)); + this.delegate = new JavaSourcesSubject(failureStrategy, ImmutableList.of(subject)); } @Override diff --git a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java index eb8fae97..765dc0f7 100644 --- a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java +++ b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java @@ -19,7 +19,6 @@ import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.CompilationSubject.compilations; import static com.google.testing.compile.Compiler.javac; -import static com.google.testing.compile.VerificationFailureStrategy.VERIFY; import static java.lang.String.format; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.stream.Collectors.joining; @@ -28,11 +27,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.ByteSource; -import com.google.testing.compile.VerificationFailureStrategy.VerificationException; +import com.google.common.truth.ExpectFailure; +import com.google.common.truth.Truth; import java.util.regex.Pattern; import java.util.stream.Stream; import javax.tools.Diagnostic; import javax.tools.JavaFileObject; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; @@ -82,6 +83,8 @@ public class CompilationSubjectTest { @RunWith(JUnit4.class) public static class StatusTest { + @Rule public final ExpectFailure expectFailure = new ExpectFailure(); + @Test public void succeeded() { assertThat(javac().compile(HELLO_WORLD)).succeeded(); @@ -90,33 +93,36 @@ public void succeeded() { @Test public void succeeded_failureReportsGeneratedFiles() { - try { - verifyThat(compilerWithGeneratorAndError().compile(HELLO_WORLD_RESOURCE)).succeeded(); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("Compilation produced the following errors:\n"); - assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_CLASS_NAME); - assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_SOURCE); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithGeneratorAndError().compile(HELLO_WORLD_RESOURCE)) + .succeeded(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("Compilation produced the following errors:\n"); + assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_CLASS_NAME); + assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_SOURCE); } @Test public void succeeded_failureReportsNoGeneratedFiles() { - try { - verifyThat(javac().compile(HELLO_WORLD_BROKEN_RESOURCE)).succeeded(); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Compilation produced the following errors:\n"); - assertThat(expected.getMessage()).contains("No files were generated."); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(javac().compile(HELLO_WORLD_BROKEN_RESOURCE)) + .succeeded(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).startsWith("Compilation produced the following errors:\n"); + assertThat(expected.getMessage()).contains("No files were generated."); } @Test public void succeeded_exceptionCreatedOrPassedThrough() { RuntimeException e = new RuntimeException(); try { - verifyThat(throwingCompiler(e).compile(HELLO_WORLD_RESOURCE)).succeeded(); + Truth.assertAbout(compilations()) + .that(throwingCompiler(e).compile(HELLO_WORLD_RESOURCE)) + .succeeded(); fail(); } catch (CompilationFailureException expected) { // some old javacs don't pass through exceptions, so we create one @@ -133,13 +139,14 @@ public void succeededWithoutWarnings() { @Test public void succeededWithoutWarnings_failsWithWarnings() { - try { - verifyThat(compilerWithWarning().compile(HELLO_WORLD)).succeededWithoutWarnings(); - fail(); - } catch (VerificationException e) { - assertThat(e.getMessage()) - .contains("Expected 0 warnings, but found the following 2 warnings:\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(HELLO_WORLD)) + .succeededWithoutWarnings(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 0 warnings, but found the following 2 warnings:\n"); } @Test @@ -149,14 +156,15 @@ public void failedToCompile() { @Test public void failedToCompile_compilationSucceeded() { - try { - verifyThat(javac().compile(HELLO_WORLD_RESOURCE)).failed(); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Compilation was expected to fail, but contained no errors"); - assertThat(expected.getMessage()).contains("No files were generated."); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(javac().compile(HELLO_WORLD_RESOURCE)) + .failed(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Compilation was expected to fail, but contained no errors"); + assertThat(expected.getMessage()).contains("No files were generated."); } } @@ -166,6 +174,7 @@ public void failedToCompile_compilationSucceeded() { */ @RunWith(Parameterized.class) public static final class WarningAndNoteTest { + @Rule public final ExpectFailure expectFailure = new ExpectFailure(); private final JavaFileObject sourceFile; @Parameters @@ -239,83 +248,84 @@ public void hadWarningContainingMatch_pattern() { @Test public void hadWarningContaining_noSuchWarning() { - try { - verifyThat(compilerWithWarning().compile(sourceFile)).hadWarningContaining("what is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Expected a warning containing \"what is it?\", but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(sourceFile)) + .hadWarningContaining("what is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Expected a warning containing \"what is it?\", but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void hadWarningContainingMatch_noSuchWarning() { - try { - verifyThat(compilerWithWarning().compile(sourceFile)) - .hadWarningContainingMatch("(what|where) is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith( - "Expected a warning containing match for /(what|where) is it?/, but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(sourceFile)) + .hadWarningContainingMatch("(what|where) is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith( + "Expected a warning containing match for /(what|where) is it?/, but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void hadWarningContainingMatch_pattern_noSuchWarning() { - try { - verifyThat(compilerWithWarning().compile(sourceFile)) - .hadWarningContainingMatch(Pattern.compile("(what|where) is it?")); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith( - "Expected a warning containing match for /(what|where) is it?/, but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(sourceFile)) + .hadWarningContainingMatch(Pattern.compile("(what|where) is it?")); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith( + "Expected a warning containing match for /(what|where) is it?/, but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void hadWarningContainingInFile_wrongFile() { - try { - verifyThat(compilerWithWarning().compile(sourceFile)) - .hadWarningContaining("this is a message") - .inFile(HELLO_WORLD_DIFFERENT_RESOURCE); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a warning containing \"this is a message\" in %s", - HELLO_WORLD_DIFFERENT_RESOURCE.getName())); - assertThat(expected.getMessage()).contains(sourceFile.getName()); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(sourceFile)) + .hadWarningContaining("this is a message") + .inFile(HELLO_WORLD_DIFFERENT_RESOURCE); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a warning containing \"this is a message\" in %s", + HELLO_WORLD_DIFFERENT_RESOURCE.getName())); + assertThat(expected.getMessage()).contains(sourceFile.getName()); } @Test public void hadWarningContainingInFileOnLine_wrongLine() { - try { - verifyThat(compilerWithWarning().compile(sourceFile)) - .hadWarningContaining("this is a message") - .inFile(sourceFile) - .onLine(1); - fail(); - } catch (VerificationException expected) { - int actualErrorLine = 6; - assertThat(expected.getMessage()) - .contains( - lines( - format( - "Expected a warning containing \"this is a message\" in %s on line:", - sourceFile.getName()), - " 1: ")); - assertThat(expected.getMessage()).contains("" + actualErrorLine); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(sourceFile)) + .hadWarningContaining("this is a message") + .inFile(sourceFile) + .onLine(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorLine = 6; + assertThat(expected.getMessage()) + .contains( + lines( + format( + "Expected a warning containing \"this is a message\" in %s on line:", + sourceFile.getName()), + " 1: ")); + assertThat(expected.getMessage()).contains("" + actualErrorLine); } /* TODO(dpb): Negative cases for onLineContaining for @@ -323,30 +333,31 @@ public void hadWarningContainingInFileOnLine_wrongLine() { * (containing(String), containingMatch(String), containingMatch(Pattern)). */ @Test public void hadNoteContainingInFileOnLineContaining_wrongLine() { - try { - verifyThat(compilerWithNote().compile(sourceFile)) - .hadNoteContaining("this is a message") - .inFile(sourceFile) - .onLineContaining("package"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .isEqualTo( - lines( - format( - "Expected a note containing \"this is a message\" in %s on line:", - sourceFile.getName()), - " 1: package test;", - "but found it on line(s):", - " 6: public class HelloWorld {", - " 7: @DiagnosticMessage Object foo;")); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithNote().compile(sourceFile)) + .hadNoteContaining("this is a message") + .inFile(sourceFile) + .onLineContaining("package"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .isEqualTo( + lines( + format( + "Expected a note containing \"this is a message\" in %s on line:", + sourceFile.getName()), + " 1: package test;", + "but found it on line(s):", + " 6: public class HelloWorld {", + " 7: @DiagnosticMessage Object foo;")); } @Test public void hadWarningContainingMatchInFileOnLineContaining_noMatches() { try { - verifyThat(compilerWithWarning().compile(sourceFile)) + Truth.assertAbout(compilations()) + .that(compilerWithWarning().compile(sourceFile)) .hadWarningContainingMatch("this is a+ message") .inFile(sourceFile) .onLineContaining("not found!"); @@ -360,7 +371,8 @@ public void hadWarningContainingMatchInFileOnLineContaining_noMatches() { @Test public void hadWarningContainingInFileOnLineContaining_moreThanOneMatch() { try { - verifyThat(compilerWithWarning().compile(sourceFile)) + Truth.assertAbout(compilations()) + .that(compilerWithWarning().compile(sourceFile)) .hadWarningContainingMatch(Pattern.compile("this is ab? message")) .inFile(sourceFile) .onLineContaining("@DiagnosticMessage"); @@ -379,23 +391,23 @@ public void hadWarningContainingInFileOnLineContaining_moreThanOneMatch() { @Test public void hadWarningContainingInFileOnLineAtColumn_wrongColumn() { - try { - verifyThat(compilerWithWarning().compile(sourceFile)) - .hadWarningContaining("this is a message") - .inFile(sourceFile) - .onLine(6) - .atColumn(1); - fail(); - } catch (VerificationException expected) { - int actualErrorCol = 8; - assertThat(expected.getMessage()) - .contains( - format( - "Expected a warning containing \"this is a message\" in %s " - + "at column 1 of line 6", - sourceFile.getName())); - assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(sourceFile)) + .hadWarningContaining("this is a message") + .inFile(sourceFile) + .onLine(6) + .atColumn(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorCol = 8; + assertThat(expected.getMessage()) + .contains( + format( + "Expected a warning containing \"this is a message\" in %s " + + "at column 1 of line 6", + sourceFile.getName())); + assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); } @Test @@ -405,13 +417,14 @@ public void hadWarningCount() { @Test public void hadWarningCount_wrongCount() { - try { - verifyThat(compilerWithWarning().compile(sourceFile)).hadWarningCount(42); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 42 warnings, but found the following 2 warnings:\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(sourceFile)) + .hadWarningCount(42); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 42 warnings, but found the following 2 warnings:\n"); } @Test @@ -458,103 +471,104 @@ public void hadNoteContainingMatch_pattern() { @Test public void hadNoteContaining_noSuchNote() { - try { - verifyThat(compilerWithNote().compile(sourceFile)).hadNoteContaining("what is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Expected a note containing \"what is it?\", but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithNote().compile(sourceFile)) + .hadNoteContaining("what is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Expected a note containing \"what is it?\", but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void hadNoteContainingMatch_noSuchNote() { - try { - verifyThat(compilerWithNote().compile(sourceFile)) - .hadNoteContainingMatch("(what|where) is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith( - "Expected a note containing match for /(what|where) is it?/, but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithNote().compile(sourceFile)) + .hadNoteContainingMatch("(what|where) is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith( + "Expected a note containing match for /(what|where) is it?/, but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void hadNoteContainingMatch_pattern_noSuchNote() { - try { - verifyThat(compilerWithNote().compile(sourceFile)) - .hadNoteContainingMatch(Pattern.compile("(what|where) is it?")); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith( - "Expected a note containing match for /(what|where) is it?/, but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithNote().compile(sourceFile)) + .hadNoteContainingMatch(Pattern.compile("(what|where) is it?")); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith( + "Expected a note containing match for /(what|where) is it?/, but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void hadNoteContainingInFile_wrongFile() { - try { - verifyThat(compilerWithNote().compile(sourceFile)) - .hadNoteContaining("this is a message") - .inFile(HELLO_WORLD_DIFFERENT_RESOURCE); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - format( - "Expected a note containing \"this is a message\" in %s", - HELLO_WORLD_DIFFERENT_RESOURCE.getName())); - assertThat(expected.getMessage()).contains(sourceFile.getName()); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithNote().compile(sourceFile)) + .hadNoteContaining("this is a message") + .inFile(HELLO_WORLD_DIFFERENT_RESOURCE); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + format( + "Expected a note containing \"this is a message\" in %s", + HELLO_WORLD_DIFFERENT_RESOURCE.getName())); + assertThat(expected.getMessage()).contains(sourceFile.getName()); } @Test public void hadNoteContainingInFileOnLine_wrongLine() { - try { - verifyThat(compilerWithNote().compile(sourceFile)) - .hadNoteContaining("this is a message") - .inFile(sourceFile) - .onLine(1); - fail(); - } catch (VerificationException expected) { - int actualErrorLine = 6; - assertThat(expected.getMessage()) - .contains( - lines( - format( - "Expected a note containing \"this is a message\" in %s on line:", - sourceFile.getName()), - " 1: ")); - assertThat(expected.getMessage()).contains("" + actualErrorLine); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithNote().compile(sourceFile)) + .hadNoteContaining("this is a message") + .inFile(sourceFile) + .onLine(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorLine = 6; + assertThat(expected.getMessage()) + .contains( + lines( + format( + "Expected a note containing \"this is a message\" in %s on line:", + sourceFile.getName()), + " 1: ")); + assertThat(expected.getMessage()).contains("" + actualErrorLine); } @Test public void hadNoteContainingInFileOnLineAtColumn_wrongColumn() { - try { - verifyThat(compilerWithNote().compile(sourceFile)) - .hadNoteContaining("this is a message") - .inFile(sourceFile) - .onLine(6) - .atColumn(1); - fail(); - } catch (VerificationException expected) { - int actualErrorCol = 8; - assertThat(expected.getMessage()) - .contains( - format( - "Expected a note containing \"this is a message\" in %s at column 1 of line 6", - sourceFile.getName())); - assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithNote().compile(sourceFile)) + .hadNoteContaining("this is a message") + .inFile(sourceFile) + .onLine(6) + .atColumn(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorCol = 8; + assertThat(expected.getMessage()) + .contains( + format( + "Expected a note containing \"this is a message\" in %s at column 1 of line 6", + sourceFile.getName())); + assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); } @Test @@ -564,19 +578,22 @@ public void hadNoteCount() { @Test public void hadNoteCount_wrongCount() { - try { - verifyThat(compilerWithNote().compile(sourceFile)).hadNoteCount(42); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 42 notes, but found the following 2 notes:\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithNote().compile(sourceFile)) + .hadNoteCount(42); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 42 notes, but found the following 2 notes:\n"); } } /** Tests for {@link CompilationSubject}'s assertions about errors. */ @RunWith(JUnit4.class) public static final class ErrorTest { + @Rule public final ExpectFailure expectFailure = new ExpectFailure(); + @Test public void hadErrorContaining() { assertThat(javac().compile(HELLO_WORLD_BROKEN_RESOURCE)) @@ -621,105 +638,105 @@ public void hadErrorContainingMatch_pattern() { @Test public void hadErrorContaining_noSuchError() { - try { - verifyThat(compilerWithError().compile(HELLO_WORLD_RESOURCE)) - .hadErrorContaining("some error"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Expected an error containing \"some error\", but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("expected error!\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithError().compile(HELLO_WORLD_RESOURCE)) + .hadErrorContaining("some error"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Expected an error containing \"some error\", but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("expected error!\n"); } @Test public void hadErrorContainingMatch_noSuchError() { - try { - verifyThat(compilerWithError().compile(HELLO_WORLD_RESOURCE)) - .hadErrorContainingMatch("(what|where) is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith( - "Expected an error containing match for /(what|where) is it?/, but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("expected error!\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithError().compile(HELLO_WORLD_RESOURCE)) + .hadErrorContainingMatch("(what|where) is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith( + "Expected an error containing match for /(what|where) is it?/, but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("expected error!\n"); } @Test public void hadErrorContainingMatch_pattern_noSuchError() { - try { - verifyThat(compilerWithError().compile(HELLO_WORLD_RESOURCE)) - .hadErrorContainingMatch(Pattern.compile("(what|where) is it?")); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith( - "Expected an error containing match for /(what|where) is it?/, but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("expected error!\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithError().compile(HELLO_WORLD_RESOURCE)) + .hadErrorContainingMatch(Pattern.compile("(what|where) is it?")); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith( + "Expected an error containing match for /(what|where) is it?/, but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("expected error!\n"); } @Test public void hadErrorContainingInFile_wrongFile() { - try { - verifyThat(compilerWithError().compile(HELLO_WORLD_RESOURCE)) - .hadErrorContaining("expected error!") - .inFile(HELLO_WORLD_DIFFERENT_RESOURCE); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - format( - "Expected an error containing \"expected error!\" in %s", - HELLO_WORLD_DIFFERENT_RESOURCE.getName())); - assertThat(expected.getMessage()).contains(HELLO_WORLD_RESOURCE.getName()); - // "(no associated file)"))); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithError().compile(HELLO_WORLD_RESOURCE)) + .hadErrorContaining("expected error!") + .inFile(HELLO_WORLD_DIFFERENT_RESOURCE); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + format( + "Expected an error containing \"expected error!\" in %s", + HELLO_WORLD_DIFFERENT_RESOURCE.getName())); + assertThat(expected.getMessage()).contains(HELLO_WORLD_RESOURCE.getName()); + // "(no associated file)"))); } @Test public void hadErrorContainingInFileOnLine_wrongLine() { - try { - verifyThat(compilerWithError().compile(HELLO_WORLD_RESOURCE)) - .hadErrorContaining("expected error!") - .inFile(HELLO_WORLD_RESOURCE) - .onLine(1); - fail(); - } catch (VerificationException expected) { - int actualErrorLine = 18; - assertThat(expected.getMessage()) - .contains( - lines( - format( - "Expected an error containing \"expected error!\" in %s on line:", - HELLO_WORLD_RESOURCE.getName()), - " 1: ")); - assertThat(expected.getMessage()).contains("" + actualErrorLine); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithError().compile(HELLO_WORLD_RESOURCE)) + .hadErrorContaining("expected error!") + .inFile(HELLO_WORLD_RESOURCE) + .onLine(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorLine = 18; + assertThat(expected.getMessage()) + .contains( + lines( + format( + "Expected an error containing \"expected error!\" in %s on line:", + HELLO_WORLD_RESOURCE.getName()), + " 1: ")); + assertThat(expected.getMessage()).contains("" + actualErrorLine); } @Test public void hadErrorContainingInFileOnLineAtColumn_wrongColumn() { - try { - verifyThat(compilerWithError().compile(HELLO_WORLD_RESOURCE)) - .hadErrorContaining("expected error!") - .inFile(HELLO_WORLD_RESOURCE) - .onLine(18) - .atColumn(1); - fail(); - } catch (VerificationException expected) { - int actualErrorCol = 8; - assertThat(expected.getMessage()) - .contains( - format( - "Expected an error containing \"expected error!\" in %s at column 1 of line 18", - HELLO_WORLD_RESOURCE.getName())); - assertThat(expected.getMessage()).contains("" + actualErrorCol); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithError().compile(HELLO_WORLD_RESOURCE)) + .hadErrorContaining("expected error!") + .inFile(HELLO_WORLD_RESOURCE) + .onLine(18) + .atColumn(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorCol = 8; + assertThat(expected.getMessage()) + .contains( + format( + "Expected an error containing \"expected error!\" in %s at column 1 of line 18", + HELLO_WORLD_RESOURCE.getName())); + assertThat(expected.getMessage()).contains("" + actualErrorCol); } @Test @@ -729,18 +746,21 @@ public void hadErrorCount() { @Test public void hadErrorCount_wrongCount() { - try { - verifyThat(compilerWithError().compile(HELLO_WORLD_RESOURCE)).hadErrorCount(42); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 42 errors, but found the following 2 errors:\n"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithError().compile(HELLO_WORLD_RESOURCE)) + .hadErrorCount(42); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 42 errors, but found the following 2 errors:\n"); } } @RunWith(JUnit4.class) public static class GeneratedFilesTest { + @Rule public final ExpectFailure expectFailure = new ExpectFailure(); + @Test public void generatedSourceFile() { assertThat(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) @@ -752,14 +772,14 @@ public void generatedSourceFile() { @Test public void generatedSourceFile_fail() { - try { - verifyThat(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) - .generatedSourceFile("ThisIsNotTheRightFile"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("generated the file ThisIsNotTheRightFile.java"); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) + .generatedSourceFile("ThisIsNotTheRightFile"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("generated the file ThisIsNotTheRightFile.java"); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); } @Test @@ -771,14 +791,14 @@ public void generatedFilePath() { @Test public void generatedFilePath_fail() { - try { - verifyThat(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) - .generatedFile(CLASS_OUTPUT, "com/google/testing/compile/Bogus.class"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("generated the file com/google/testing/compile/Bogus.class"); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) + .generatedFile(CLASS_OUTPUT, "com/google/testing/compile/Bogus.class"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("generated the file com/google/testing/compile/Bogus.class"); } @Test @@ -790,32 +810,32 @@ public void generatedFilePackageFile() { @Test public void generatedFilePackageFile_fail() { - try { - verifyThat(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) - .generatedFile(CLASS_OUTPUT, "com.google.testing.compile", "Bogus.class"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - "generated the file named \"Bogus.class\" " - + "in package \"com.google.testing.compile\""); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) + .generatedFile(CLASS_OUTPUT, "com.google.testing.compile", "Bogus.class"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + "generated the file named \"Bogus.class\" " + + "in package \"com.google.testing.compile\""); } @Test public void generatedFileDefaultPackageFile_fail() { - try { - verifyThat(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) - .generatedFile(CLASS_OUTPUT, "", "File.java"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("generated the file named \"File.java\" in the default package"); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); - } + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) + .generatedFile(CLASS_OUTPUT, "", "File.java"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("generated the file named \"File.java\" in the default package"); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); } } - + private static String lines(String... lines) { return Stream.of(lines).collect(joining("\n")); } @@ -843,8 +863,4 @@ private static Compiler compilerWithGeneratorAndError() { private static Compiler throwingCompiler(RuntimeException e) { return javac().withProcessors(new ThrowingProcessor(e)); } - - private static CompilationSubject verifyThat(Compilation compilation) { - return VERIFY.about(compilations()).that(compilation); - } } diff --git a/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java b/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java index fab0c97c..460f57e9 100644 --- a/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java +++ b/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java @@ -19,20 +19,20 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.testing.compile.JavaFileObjectSubject.assertThat; import static com.google.testing.compile.JavaFileObjectSubject.javaFileObjects; -import static com.google.testing.compile.VerificationFailureStrategy.VERIFY; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.junit.Assert.fail; -import com.google.testing.compile.VerificationFailureStrategy.VerificationException; +import com.google.common.truth.ExpectFailure; import java.io.IOException; import java.util.regex.Pattern; import javax.tools.JavaFileObject; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public final class JavaFileObjectSubjectTest { + @Rule public final ExpectFailure expectFailure = new ExpectFailure(); private static final JavaFileObject CLASS = JavaFileObjects.forSourceLines( @@ -73,12 +73,13 @@ public void hasContents() { @Test public void hasContents_failure() { - try { - verifyThat(CLASS_WITH_FIELD).hasContents(JavaFileObjects.asByteSource(DIFFERENT_NAME)); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getName()); - } + expectFailure + .whenTesting() + .about(javaFileObjects()) + .that(CLASS_WITH_FIELD) + .hasContents(JavaFileObjects.asByteSource(DIFFERENT_NAME)); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getName()); } @Test @@ -88,14 +89,16 @@ public void contentsAsString() { @Test public void contentsAsString_fail() { - try { - verifyThat(CLASS).contentsAsString(UTF_8).containsMatch("bad+"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .containsMatch("the contents of .*" + Pattern.quote(CLASS.getName())); - assertThat(expected.getMessage()).contains("bad+"); - } + expectFailure + .whenTesting() + .about(javaFileObjects()) + .that(CLASS) + .contentsAsString(UTF_8) + .containsMatch("bad+"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .containsMatch("the contents of .*" + Pattern.quote(CLASS.getName())); + assertThat(expected.getMessage()).contains("bad+"); } @Test @@ -110,43 +113,42 @@ public void hasSourceEquivalentTo_unresolvedReferences() { @Test public void hasSourceEquivalentTo_failOnDifferences() throws IOException { - try { - verifyThat(CLASS).hasSourceEquivalentTo(DIFFERENT_NAME); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("is equivalent to"); - assertThat(expected.getMessage()).contains(CLASS.getName()); - assertThat(expected.getMessage()).contains(CLASS.getCharContent(false)); - } + expectFailure + .whenTesting() + .about(javaFileObjects()) + .that(CLASS) + .hasSourceEquivalentTo(DIFFERENT_NAME); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("is equivalent to"); + assertThat(expected.getMessage()).contains(CLASS.getName()); + assertThat(expected.getMessage()).contains(CLASS.getCharContent(false)); } @Test public void hasSourceEquivalentTo_failOnExtraInExpected() throws IOException { - try { - verifyThat(CLASS).hasSourceEquivalentTo(CLASS_WITH_FIELD); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("is equivalent to"); - assertThat(expected.getMessage()).contains("unmatched nodes in the expected tree"); - assertThat(expected.getMessage()).contains(CLASS.getName()); - assertThat(expected.getMessage()).contains(CLASS.getCharContent(false)); - } + expectFailure + .whenTesting() + .about(javaFileObjects()) + .that(CLASS) + .hasSourceEquivalentTo(CLASS_WITH_FIELD); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("is equivalent to"); + assertThat(expected.getMessage()).contains("unmatched nodes in the expected tree"); + assertThat(expected.getMessage()).contains(CLASS.getName()); + assertThat(expected.getMessage()).contains(CLASS.getCharContent(false)); } @Test public void hasSourceEquivalentTo_failOnExtraInActual() throws IOException { - try { - verifyThat(CLASS_WITH_FIELD).hasSourceEquivalentTo(CLASS); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("is equivalent to"); - assertThat(expected.getMessage()).contains("unmatched nodes in the actual tree"); - assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getName()); - assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getCharContent(false)); - } - } - - private static JavaFileObjectSubject verifyThat(JavaFileObject file) { - return VERIFY.about(javaFileObjects()).that(file); + expectFailure + .whenTesting() + .about(javaFileObjects()) + .that(CLASS_WITH_FIELD) + .hasSourceEquivalentTo(CLASS); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("is equivalent to"); + assertThat(expected.getMessage()).contains("unmatched nodes in the actual tree"); + assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getName()); + assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getCharContent(false)); } } diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java index 0353ad44..92fdfdcd 100644 --- a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java +++ b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertAbout; import static com.google.common.truth.Truth.assertThat; import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource; -import static com.google.testing.compile.VerificationFailureStrategy.VERIFY; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.tools.StandardLocation.CLASS_OUTPUT; import static org.junit.Assert.fail; @@ -26,10 +25,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.ByteSource; import com.google.common.io.Resources; -import com.google.testing.compile.VerificationFailureStrategy.VerificationException; +import com.google.common.truth.ExpectFailure; +import com.google.common.truth.Truth; import java.util.Arrays; import javax.tools.Diagnostic; import javax.tools.JavaFileObject; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -41,6 +42,8 @@ */ @RunWith(JUnit4.class) public class JavaSourcesSubjectFactoryTest { + @Rule public final ExpectFailure expectFailure = new ExpectFailure(); + private static final JavaFileObject HELLO_WORLD = JavaFileObjects.forSourceLines( "test.HelloWorld", @@ -72,14 +75,16 @@ public void compilesWithoutError() { .that(JavaFileObjects.forResource(Resources.getResource("HelloWorld.java"))) .compilesWithoutError(); assertAbout(javaSource()) - .that(JavaFileObjects.forSourceLines("test.HelloWorld", - "package test;", - "", - "public class HelloWorld {", - " public static void main(String[] args) {", - " System.out.println(\"Hello World!\");", - " }", - "}")) + .that( + JavaFileObjects.forSourceLines( + "test.HelloWorld", + "package test;", + "", + "public class HelloWorld {", + " public static void main(String[] args) {", + " System.out.println(\"Hello World!\");", + " }", + "}")) .compilesWithoutError(); } @@ -107,120 +112,108 @@ public void compilesWithoutError_warnings() { @Test public void compilesWithoutWarnings_failsWithWarnings() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .compilesWithoutWarnings(); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 0 warnings, but found the following 2 warnings:\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .compilesWithoutWarnings(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 0 warnings, but found the following 2 warnings:\n"); } @Test public void compilesWithoutError_noWarning() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .compilesWithoutError() - .withWarningContaining("what is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Expected a warning containing \"what is it?\", but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .compilesWithoutError() + .withWarningContaining("what is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Expected a warning containing \"what is it?\", but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void compilesWithoutError_warningNotInFile() { JavaFileObject otherSource = JavaFileObjects.forResource("HelloWorld.java"); - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .compilesWithoutError() - .withWarningContaining("this is a message") - .in(otherSource); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a warning containing \"this is a message\" in %s", - otherSource.getName())); - assertThat(expected.getMessage()).contains(HELLO_WORLD.getName()); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .compilesWithoutError() + .withWarningContaining("this is a message") + .in(otherSource); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a warning containing \"this is a message\" in %s", + otherSource.getName())); + assertThat(expected.getMessage()).contains(HELLO_WORLD.getName()); } @Test public void compilesWithoutError_warningNotOnLine() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .compilesWithoutError() - .withWarningContaining("this is a message") - .in(HELLO_WORLD) - .onLine(1); - fail(); - } catch (VerificationException expected) { - int actualErrorLine = 6; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a warning containing \"this is a message\" in %s on line:\n 1: ", - HELLO_WORLD.getName())); - assertThat(expected.getMessage()).contains("" + actualErrorLine); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .compilesWithoutError() + .withWarningContaining("this is a message") + .in(HELLO_WORLD) + .onLine(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorLine = 6; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a warning containing \"this is a message\" in %s on line:\n 1: ", + HELLO_WORLD.getName())); + assertThat(expected.getMessage()).contains("" + actualErrorLine); } @Test public void compilesWithoutError_warningNotAtColumn() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .compilesWithoutError() - .withWarningContaining("this is a message") - .in(HELLO_WORLD) - .onLine(6) - .atColumn(1); - fail(); - } catch (VerificationException expected) { - int actualErrorCol = 8; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a warning containing \"this is a message\" in %s at column 1 of line 6", - HELLO_WORLD.getName())); - assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .compilesWithoutError() + .withWarningContaining("this is a message") + .in(HELLO_WORLD) + .onLine(6) + .atColumn(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorCol = 8; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a warning containing \"this is a message\" in %s at column 1 of line 6", + HELLO_WORLD.getName())); + assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); } @Test public void compilesWithoutError_wrongWarningCount() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .compilesWithoutError() - .withWarningCount(42); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 42 warnings, but found the following 2 warnings:\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .compilesWithoutError() + .withWarningCount(42); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 42 warnings, but found the following 2 warnings:\n"); } @Test @@ -244,141 +237,128 @@ public void compilesWithoutError_notes() { @Test public void compilesWithoutError_noNote() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .compilesWithoutError() - .withNoteContaining("what is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Expected a note containing \"what is it?\", but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .compilesWithoutError() + .withNoteContaining("what is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Expected a note containing \"what is it?\", but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void compilesWithoutError_noteNotInFile() { JavaFileObject otherSource = JavaFileObjects.forResource("HelloWorld.java"); - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .compilesWithoutError() - .withNoteContaining("this is a message") - .in(otherSource); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a note containing \"this is a message\" in %s", otherSource.getName())); - assertThat(expected.getMessage()).contains(HELLO_WORLD.getName()); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .compilesWithoutError() + .withNoteContaining("this is a message") + .in(otherSource); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a note containing \"this is a message\" in %s", otherSource.getName())); + assertThat(expected.getMessage()).contains(HELLO_WORLD.getName()); } @Test public void compilesWithoutError_noteNotOnLine() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .compilesWithoutError() - .withNoteContaining("this is a message") - .in(HELLO_WORLD) - .onLine(1); - fail(); - } catch (VerificationException expected) { - int actualErrorLine = 6; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a note containing \"this is a message\" in %s on line:\n 1: ", - HELLO_WORLD.getName())); - assertThat(expected.getMessage()).contains("" + actualErrorLine); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .compilesWithoutError() + .withNoteContaining("this is a message") + .in(HELLO_WORLD) + .onLine(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorLine = 6; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a note containing \"this is a message\" in %s on line:\n 1: ", + HELLO_WORLD.getName())); + assertThat(expected.getMessage()).contains("" + actualErrorLine); } @Test public void compilesWithoutError_noteNotAtColumn() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .compilesWithoutError() - .withNoteContaining("this is a message") - .in(HELLO_WORLD) - .onLine(6) - .atColumn(1); - fail(); - } catch (VerificationException expected) { - int actualErrorCol = 8; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a note containing \"this is a message\" in %s at column 1 of line 6", - HELLO_WORLD.getName())); - assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .compilesWithoutError() + .withNoteContaining("this is a message") + .in(HELLO_WORLD) + .onLine(6) + .atColumn(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorCol = 8; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a note containing \"this is a message\" in %s at column 1 of line 6", + HELLO_WORLD.getName())); + assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); } @Test public void compilesWithoutError_wrongNoteCount() { JavaFileObject fileObject = HELLO_WORLD; - try { - VERIFY - .about(javaSource()) - .that(fileObject) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .compilesWithoutError() - .withNoteCount(42); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 42 notes, but found the following 2 notes:\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(fileObject) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .compilesWithoutError() + .withNoteCount(42); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 42 notes, but found the following 2 notes:\n"); } @Test public void compilesWithoutError_failureReportsFiles() { - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource(Resources.getResource("HelloWorld.java"))) - .processedWith(new FailingGeneratingProcessor()) - .compilesWithoutError(); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("Compilation produced the following errors:\n"); - assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_CLASS_NAME); - assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_SOURCE); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource(Resources.getResource("HelloWorld.java"))) + .processedWith(new FailingGeneratingProcessor()) + .compilesWithoutError(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("Compilation produced the following errors:\n"); + assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_CLASS_NAME); + assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_SOURCE); } @Test public void compilesWithoutError_throws() { - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld-broken.java")) - .compilesWithoutError(); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).startsWith("Compilation produced the following errors:\n"); - assertThat(expected.getMessage()).contains("No files were generated."); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld-broken.java")) + .compilesWithoutError(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).startsWith("Compilation produced the following errors:\n"); + assertThat(expected.getMessage()).contains("No files were generated."); } @Test public void compilesWithoutError_exceptionCreatedOrPassedThrough() { RuntimeException e = new RuntimeException(); try { - VERIFY - .about(javaSource()) + Truth.assertAbout(javaSource()) .that(JavaFileObjects.forResource("HelloWorld.java")) .processedWith(new ThrowingProcessor(e)) .compilesWithoutError(); @@ -410,8 +390,7 @@ public void parsesAs() { @Test public void parsesAs_expectedFileFailsToParse() { try { - VERIFY - .about(javaSource()) + Truth.assertAbout(javaSource()) .that(JavaFileObjects.forResource("HelloWorld.java")) .parsesAs(JavaFileObjects.forResource("HelloWorld-broken.java")); fail(); @@ -423,8 +402,7 @@ public void parsesAs_expectedFileFailsToParse() { @Test public void parsesAs_actualFileFailsToParse() { try { - VERIFY - .about(javaSource()) + Truth.assertAbout(javaSource()) .that(JavaFileObjects.forResource("HelloWorld-broken.java")) .parsesAs(JavaFileObjects.forResource("HelloWorld.java")); fail(); @@ -435,318 +413,298 @@ public void parsesAs_actualFileFailsToParse() { @Test public void failsToCompile_throws() { - try { - VERIFY - .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .failsToCompile(); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).startsWith( - "Compilation was expected to fail, but contained no errors"); - assertThat(expected.getMessage()).contains("No files were generated."); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .failsToCompile(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Compilation was expected to fail, but contained no errors"); + assertThat(expected.getMessage()).contains("No files were generated."); } @Test public void failsToCompile_throwsNoMessage() { - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .processedWith(new ErrorProcessor()) - .failsToCompile().withErrorContaining("some error"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).startsWith( - "Expected an error containing \"some error\", but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("expected error!\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .processedWith(new ErrorProcessor()) + .failsToCompile() + .withErrorContaining("some error"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Expected an error containing \"some error\", but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("expected error!\n"); } @Test public void failsToCompile_throwsNotInFile() { JavaFileObject fileObject = JavaFileObjects.forResource("HelloWorld.java"); JavaFileObject otherFileObject = JavaFileObjects.forResource("HelloWorld-different.java"); - try { - VERIFY.about(javaSource()) - .that(fileObject) - .processedWith(new ErrorProcessor()) - .failsToCompile().withErrorContaining("expected error!") - .in(otherFileObject); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected an error containing \"expected error!\" in %s", - otherFileObject.getName())); - assertThat(expected.getMessage()).contains(fileObject.getName()); - // "(no associated file)"))); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(fileObject) + .processedWith(new ErrorProcessor()) + .failsToCompile() + .withErrorContaining("expected error!") + .in(otherFileObject); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected an error containing \"expected error!\" in %s", + otherFileObject.getName())); + assertThat(expected.getMessage()).contains(fileObject.getName()); + // "(no associated file)"))); } @Test public void failsToCompile_throwsNotOnLine() { JavaFileObject fileObject = JavaFileObjects.forResource("HelloWorld.java"); - try { - VERIFY.about(javaSource()) - .that(fileObject) - .processedWith(new ErrorProcessor()) - .failsToCompile().withErrorContaining("expected error!") - .in(fileObject).onLine(1); - fail(); - } catch (VerificationException expected) { - int actualErrorLine = 18; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected an error containing \"expected error!\" in %s on line:\n 1: ", - fileObject.getName())); - assertThat(expected.getMessage()).contains("" + actualErrorLine); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(fileObject) + .processedWith(new ErrorProcessor()) + .failsToCompile() + .withErrorContaining("expected error!") + .in(fileObject) + .onLine(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorLine = 18; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected an error containing \"expected error!\" in %s on line:\n 1: ", + fileObject.getName())); + assertThat(expected.getMessage()).contains("" + actualErrorLine); } @Test public void failsToCompile_throwsNotAtColumn() { JavaFileObject fileObject = JavaFileObjects.forResource("HelloWorld.java"); - try { - VERIFY.about(javaSource()) - .that(fileObject) - .processedWith(new ErrorProcessor()) - .failsToCompile().withErrorContaining("expected error!") - .in(fileObject).onLine(18).atColumn(1); - fail(); - } catch (VerificationException expected) { - int actualErrorCol = 8; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected an error containing \"expected error!\" in %s at column 1 of line 18", - fileObject.getName())); - assertThat(expected.getMessage()).contains("" + actualErrorCol); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(fileObject) + .processedWith(new ErrorProcessor()) + .failsToCompile() + .withErrorContaining("expected error!") + .in(fileObject) + .onLine(18) + .atColumn(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorCol = 8; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected an error containing \"expected error!\" in %s at column 1 of line 18", + fileObject.getName())); + assertThat(expected.getMessage()).contains("" + actualErrorCol); } @Test public void failsToCompile_wrongErrorCount() { JavaFileObject fileObject = JavaFileObjects.forResource("HelloWorld.java"); - try { - VERIFY.about(javaSource()) - .that(fileObject) - .processedWith(new ErrorProcessor()) - .failsToCompile() - .withErrorCount(42); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 42 errors, but found the following 2 errors:\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(fileObject) + .processedWith(new ErrorProcessor()) + .failsToCompile() + .withErrorCount(42); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 42 errors, but found the following 2 errors:\n"); } @Test public void failsToCompile_noWarning() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .failsToCompile() - .withWarningContaining("what is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Expected a warning containing \"what is it?\", but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .failsToCompile() + .withWarningContaining("what is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Expected a warning containing \"what is it?\", but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void failsToCompile_warningNotInFile() { JavaFileObject otherSource = JavaFileObjects.forResource("HelloWorld.java"); - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .failsToCompile() - .withWarningContaining("this is a message") - .in(otherSource); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a warning containing \"this is a message\" in %s", - otherSource.getName())); - assertThat(expected.getMessage()).contains(HELLO_WORLD_BROKEN.getName()); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .failsToCompile() + .withWarningContaining("this is a message") + .in(otherSource); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a warning containing \"this is a message\" in %s", + otherSource.getName())); + assertThat(expected.getMessage()).contains(HELLO_WORLD_BROKEN.getName()); } @Test public void failsToCompile_warningNotOnLine() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .failsToCompile() - .withWarningContaining("this is a message") - .in(HELLO_WORLD_BROKEN) - .onLine(1); - fail(); - } catch (VerificationException expected) { - int actualErrorLine = 6; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a warning containing \"this is a message\" in %s on line:\n 1: ", - HELLO_WORLD_BROKEN.getName())); - assertThat(expected.getMessage()).contains("" + actualErrorLine); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .failsToCompile() + .withWarningContaining("this is a message") + .in(HELLO_WORLD_BROKEN) + .onLine(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorLine = 6; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a warning containing \"this is a message\" in %s on line:\n 1: ", + HELLO_WORLD_BROKEN.getName())); + assertThat(expected.getMessage()).contains("" + actualErrorLine); } @Test public void failsToCompile_warningNotAtColumn() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .failsToCompile() - .withWarningContaining("this is a message") - .in(HELLO_WORLD_BROKEN) - .onLine(6) - .atColumn(1); - fail(); - } catch (VerificationException expected) { - int actualErrorCol = 8; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a warning containing \"this is a message\" in %s at column 1 of line 6", - HELLO_WORLD_BROKEN.getName())); - assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .failsToCompile() + .withWarningContaining("this is a message") + .in(HELLO_WORLD_BROKEN) + .onLine(6) + .atColumn(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorCol = 8; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a warning containing \"this is a message\" in %s at column 1 of line 6", + HELLO_WORLD_BROKEN.getName())); + assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); } @Test public void failsToCompile_wrongWarningCount() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) - .failsToCompile() - .withWarningCount(42); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 42 warnings, but found the following 2 warnings:\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.WARNING)) + .failsToCompile() + .withWarningCount(42); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 42 warnings, but found the following 2 warnings:\n"); } @Test public void failsToCompile_noNote() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .failsToCompile() - .withNoteContaining("what is it?"); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .startsWith("Expected a note containing \"what is it?\", but only found:\n"); - // some versions of javac wedge the file and position in the middle - assertThat(expected.getMessage()).endsWith("this is a message\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .failsToCompile() + .withNoteContaining("what is it?"); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Expected a note containing \"what is it?\", but only found:\n"); + // some versions of javac wedge the file and position in the middle + assertThat(expected.getMessage()).endsWith("this is a message\n"); } @Test public void failsToCompile_noteNotInFile() { JavaFileObject otherSource = JavaFileObjects.forResource("HelloWorld.java"); - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .failsToCompile() - .withNoteContaining("this is a message") - .in(otherSource); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a note containing \"this is a message\" in %s", otherSource.getName())); - assertThat(expected.getMessage()).contains(HELLO_WORLD_BROKEN.getName()); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .failsToCompile() + .withNoteContaining("this is a message") + .in(otherSource); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a note containing \"this is a message\" in %s", otherSource.getName())); + assertThat(expected.getMessage()).contains(HELLO_WORLD_BROKEN.getName()); } @Test public void failsToCompile_noteNotOnLine() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .failsToCompile() - .withNoteContaining("this is a message") - .in(HELLO_WORLD_BROKEN) - .onLine(1); - fail(); - } catch (VerificationException expected) { - int actualErrorLine = 6; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a note containing \"this is a message\" in %s on line:\n 1: ", - HELLO_WORLD_BROKEN.getName())); - assertThat(expected.getMessage()).contains("" + actualErrorLine); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .failsToCompile() + .withNoteContaining("this is a message") + .in(HELLO_WORLD_BROKEN) + .onLine(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorLine = 6; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a note containing \"this is a message\" in %s on line:\n 1: ", + HELLO_WORLD_BROKEN.getName())); + assertThat(expected.getMessage()).contains("" + actualErrorLine); } @Test public void failsToCompile_noteNotAtColumn() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .failsToCompile() - .withNoteContaining("this is a message") - .in(HELLO_WORLD_BROKEN) - .onLine(6) - .atColumn(1); - fail(); - } catch (VerificationException expected) { - int actualErrorCol = 8; - assertThat(expected.getMessage()) - .contains( - String.format( - "Expected a note containing \"this is a message\" in %s at column 1 of line 6", - HELLO_WORLD_BROKEN.getName())); - assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .failsToCompile() + .withNoteContaining("this is a message") + .in(HELLO_WORLD_BROKEN) + .onLine(6) + .atColumn(1); + AssertionError expected = expectFailure.getFailure(); + int actualErrorCol = 8; + assertThat(expected.getMessage()) + .contains( + String.format( + "Expected a note containing \"this is a message\" in %s at column 1 of line 6", + HELLO_WORLD_BROKEN.getName())); + assertThat(expected.getMessage()).contains("[" + actualErrorCol + "]"); } @Test public void failsToCompile_wrongNoteCount() { - try { - VERIFY - .about(javaSource()) - .that(HELLO_WORLD_BROKEN) - .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) - .failsToCompile() - .withNoteCount(42); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()) - .contains("Expected 42 notes, but found the following 2 notes:\n"); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(HELLO_WORLD_BROKEN) + .processedWith(new DiagnosticMessage.Processor(Diagnostic.Kind.NOTE)) + .failsToCompile() + .withNoteCount(42); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Expected 42 notes, but found the following 2 notes:\n"); } @Test @@ -755,7 +713,10 @@ public void failsToCompile() { assertAbout(javaSource()) .that(brokenFileObject) .failsToCompile() - .withErrorContaining("not a statement").in(brokenFileObject).onLine(23).atColumn(5) + .withErrorContaining("not a statement") + .in(brokenFileObject) + .onLine(23) + .atColumn(5) .and() .withErrorCount(4); @@ -764,7 +725,10 @@ public void failsToCompile() { .that(happyFileObject) .processedWith(new ErrorProcessor()) .failsToCompile() - .withErrorContaining("expected error!").in(happyFileObject).onLine(18).atColumn(8); + .withErrorContaining("expected error!") + .in(happyFileObject) + .onLine(18) + .atColumn(8); } @Test @@ -773,108 +737,110 @@ public void generatesSources() { .that(JavaFileObjects.forResource("HelloWorld.java")) .processedWith(new GeneratingProcessor()) .compilesWithoutError() - .and().generatesSources(JavaFileObjects.forSourceString( - GeneratingProcessor.GENERATED_CLASS_NAME, - GeneratingProcessor.GENERATED_SOURCE)); + .and() + .generatesSources( + JavaFileObjects.forSourceString( + GeneratingProcessor.GENERATED_CLASS_NAME, GeneratingProcessor.GENERATED_SOURCE)); } @Test public void generatesSources_failOnUnexpected() { String failingExpectationSource = "abstract class Blah {}"; - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .processedWith(new GeneratingProcessor()) - .compilesWithoutError() - .and().generatesSources(JavaFileObjects.forSourceString( - GeneratingProcessor.GENERATED_CLASS_NAME, - failingExpectationSource)); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("didn't match exactly"); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_SOURCE); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .processedWith(new GeneratingProcessor()) + .compilesWithoutError() + .and() + .generatesSources( + JavaFileObjects.forSourceString( + GeneratingProcessor.GENERATED_CLASS_NAME, failingExpectationSource)); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("didn't match exactly"); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_SOURCE); } @Test public void generatesSources_failOnExtraExpected() { - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .processedWith(new GeneratingProcessor()) - .compilesWithoutError() - .and().generatesSources(JavaFileObjects.forSourceLines( - GeneratingProcessor.GENERATED_CLASS_NAME, - "import java.util.List; // Extra import", - "final class Blah {", - " String blah = \"blah\";", - "}")); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("didn't match exactly"); - assertThat(expected.getMessage()).contains("unmatched nodes in the expected tree"); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_SOURCE); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .processedWith(new GeneratingProcessor()) + .compilesWithoutError() + .and() + .generatesSources( + JavaFileObjects.forSourceLines( + GeneratingProcessor.GENERATED_CLASS_NAME, + "import java.util.List; // Extra import", + "final class Blah {", + " String blah = \"blah\";", + "}")); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("didn't match exactly"); + assertThat(expected.getMessage()).contains("unmatched nodes in the expected tree"); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_SOURCE); } @Test public void generatesSources_failOnExtraActual() { - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .processedWith(new GeneratingProcessor()) - .compilesWithoutError() - .and().generatesSources(JavaFileObjects.forSourceLines( - GeneratingProcessor.GENERATED_CLASS_NAME, - "final class Blah {", - " // missing field", - "}")); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("didn't match exactly"); - assertThat(expected.getMessage()).contains("unmatched nodes in the actual tree"); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_SOURCE); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .processedWith(new GeneratingProcessor()) + .compilesWithoutError() + .and() + .generatesSources( + JavaFileObjects.forSourceLines( + GeneratingProcessor.GENERATED_CLASS_NAME, + "final class Blah {", + " // missing field", + "}")); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("didn't match exactly"); + assertThat(expected.getMessage()).contains("unmatched nodes in the actual tree"); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_SOURCE); } @Test public void generatesSources_failWithNoCandidates() { String failingExpectationName = "ThisIsNotTheRightFile"; String failingExpectationSource = "abstract class ThisIsNotTheRightFile {}"; - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .processedWith(new GeneratingProcessor()) - .compilesWithoutError() - .and().generatesSources(JavaFileObjects.forSourceString( - failingExpectationName, - failingExpectationSource)); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("top-level types that were not present"); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); - assertThat(expected.getMessage()).contains(failingExpectationName); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .processedWith(new GeneratingProcessor()) + .compilesWithoutError() + .and() + .generatesSources( + JavaFileObjects.forSourceString(failingExpectationName, failingExpectationSource)); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("top-level types that were not present"); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); + assertThat(expected.getMessage()).contains(failingExpectationName); } @Test public void generatesSources_failWithNoGeneratedSources() { - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .processedWith(new NonGeneratingProcessor()) - .compilesWithoutError() - .and().generatesSources(JavaFileObjects.forSourceString( - GeneratingProcessor.GENERATED_CLASS_NAME, - GeneratingProcessor.GENERATED_SOURCE)); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains( - "Compilation generated no additional source files, though some were expected."); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .processedWith(new NonGeneratingProcessor()) + .compilesWithoutError() + .and() + .generatesSources( + JavaFileObjects.forSourceString( + GeneratingProcessor.GENERATED_CLASS_NAME, GeneratingProcessor.GENERATED_SOURCE)); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .contains("Compilation generated no additional source files, though some were expected."); } @Test @@ -890,36 +856,34 @@ public void generatesFileNamed() { @Test public void generatesFileNamed_failOnFileExistence() { - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .processedWith(new GeneratingProcessor()) - .compilesWithoutError() - .and() - .generatesFileNamed(CLASS_OUTPUT, "com.google.testing.compile", "Bogus") - .withContents(ByteSource.wrap("Bar".getBytes(UTF_8))); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("generated the file named \"Bogus\""); - assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_RESOURCE_NAME); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .processedWith(new GeneratingProcessor()) + .compilesWithoutError() + .and() + .generatesFileNamed(CLASS_OUTPUT, "com.google.testing.compile", "Bogus") + .withContents(ByteSource.wrap("Bar".getBytes(UTF_8))); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("generated the file named \"Bogus\""); + assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_RESOURCE_NAME); } @Test public void generatesFileNamed_failOnFileContents() { - try { - VERIFY.about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .processedWith(new GeneratingProcessor()) - .compilesWithoutError() - .and() - .generatesFileNamed(CLASS_OUTPUT, "com.google.testing.compile", "Foo") - .withContents(ByteSource.wrap("Bogus".getBytes(UTF_8))); - fail(); - } catch (VerificationException expected) { - assertThat(expected.getMessage()).contains("Foo"); - assertThat(expected.getMessage()).contains(" has contents "); - } + expectFailure + .whenTesting() + .about(javaSource()) + .that(JavaFileObjects.forResource("HelloWorld.java")) + .processedWith(new GeneratingProcessor()) + .compilesWithoutError() + .and() + .generatesFileNamed(CLASS_OUTPUT, "com.google.testing.compile", "Foo") + .withContents(ByteSource.wrap("Bogus".getBytes(UTF_8))); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()).contains("Foo"); + assertThat(expected.getMessage()).contains(" has contents "); } @Test diff --git a/src/test/java/com/google/testing/compile/VerificationFailureStrategy.java b/src/test/java/com/google/testing/compile/VerificationFailureStrategy.java deleted file mode 100644 index a64edc0d..00000000 --- a/src/test/java/com/google/testing/compile/VerificationFailureStrategy.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2013 Google, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.testing.compile; - -import com.google.common.truth.AbstractFailureStrategy; -import com.google.common.truth.StandardSubjectBuilder; - -/** @deprecated prefer {@link com.google.common.truth.ExpectFailure} for testing Truth failures. */ -@Deprecated -final class VerificationFailureStrategy extends AbstractFailureStrategy { - static final class VerificationException extends RuntimeException { - private static final long serialVersionUID = 1L; - - VerificationException(String message) { - super(message); - } - } - - /** - * A {@link StandardSubjectBuilder} that throws something other than {@link AssertionError}. - * - * @deprecated prefer {@link com.google.common.truth.ExpectFailure} for testing Truth failures. - */ - @Deprecated - static final StandardSubjectBuilder VERIFY = - StandardSubjectBuilder.forCustomFailureStrategy(new VerificationFailureStrategy()); - - @Override - public void fail(String message, Throwable unused) { - throw new VerificationFailureStrategy.VerificationException(message); - } -} From 4dd5fde614e1e18810b57343e5059c564074af92 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 22 Sep 2017 09:20:57 -0700 Subject: [PATCH 003/300] Migrate from fail* calls on deprecated this.failureStrategy to equivalent this.fail* calls. Also, call check().about() instead of directly calling Subject constructors. Direct calls require access to the FailureStrategy instance, and we're hiding that instance. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=169697588 --- pom.xml | 2 +- .../google/testing/compile/CompilationSubject.java | 10 +++++----- .../google/testing/compile/JavaSourcesSubject.java | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 90a328d9..d8bfa5e1 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.3 21.0 - 0.35 + 0.36 4.12 3.0.1 diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 1a38a8f9..f89b6778 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -77,7 +77,7 @@ public static CompilationSubject assertThat(Compilation actual) { /** Asserts that the compilation succeeded. */ public void succeeded() { if (actual().status().equals(FAILURE)) { - failureStrategy.fail( + failWithRawMessage( actual().describeFailureDiagnostics() + actual().describeGeneratedSourceFiles()); } } @@ -91,7 +91,7 @@ public void succeededWithoutWarnings() { /** Asserts that the compilation failed. */ public void failed() { if (actual().status().equals(SUCCESS)) { - failureStrategy.fail( + failWithRawMessage( "Compilation was expected to fail, but contained no errors.\n\n" + actual().describeGeneratedSourceFiles()); } @@ -172,7 +172,7 @@ private void checkDiagnosticCount( actual().diagnosticsOfKind(kind, more); int actualCount = size(diagnostics); if (actualCount != expectedCount) { - failureStrategy.fail( + failWithRawMessage( messageListing( diagnostics, "Expected %d %s, but found the following %d %s:", @@ -284,7 +284,7 @@ private ImmutableList> findMatchingDiagnost .filter(diagnostic -> expectedPattern.matcher(diagnostic.getMessage(null)).find()) .collect(toImmutableList()); if (diagnosticsWithMessage.isEmpty()) { - failureStrategy.fail( + failWithRawMessage( messageListing(diagnosticsOfKind, "Expected %s, but only found:", expectedDiagnostic)); } return diagnosticsWithMessage; @@ -376,7 +376,7 @@ Stream mapDiagnostics(Function processors) { @Override public void parsesAs(JavaFileObject first, JavaFileObject... rest) { if (Iterables.isEmpty(actual())) { - failureStrategy.fail( + failWithRawMessage( "Compilation generated no additional source files, though some were expected."); return; } @@ -149,7 +149,7 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { message.append('\n'); message.append(error); } - failureStrategy.fail(message.toString()); + failWithRawMessage(message.toString()); return; } final ParseResult expectedResult = Parser.parse(Lists.asList(first, rest)); @@ -232,7 +232,7 @@ public String apply(CompilationUnitTree generated) { } }) .toList()); - failureStrategy.fail( + failWithRawMessage( Joiner.on('\n') .join( "", @@ -253,7 +253,7 @@ public String apply(CompilationUnitTree generated) { private void failWithCandidate( JavaFileObject expectedSource, JavaFileObject actualSource, String diffReport) { try { - failureStrategy.fail( + failWithRawMessage( Joiner.on('\n') .join( "", @@ -444,7 +444,7 @@ protected GeneratedCompilationBuilder(Compilation compilation) { @CanIgnoreReturnValue @Override public T generatesSources(JavaFileObject first, JavaFileObject... rest) { - new JavaSourcesSubject(failureStrategy, compilation.generatedSourceFiles()) + check().about(javaSources()).that(compilation.generatedSourceFiles()) .parsesAs(first, rest); return thisObject(); } @@ -454,7 +454,7 @@ public T generatesSources(JavaFileObject first, JavaFileObject... rest) { public T generatesFiles(JavaFileObject first, JavaFileObject... rest) { for (JavaFileObject expected : Lists.asList(first, rest)) { if (!wasGenerated(expected)) { - failureStrategy.fail( + failWithRawMessage( "Did not find a generated file corresponding to " + expected.getName()); } } @@ -564,7 +564,7 @@ public static final class SingleSourceAdapter extends Subject Date: Wed, 27 Sep 2017 13:02:03 -0700 Subject: [PATCH 004/300] Fix JavaFileObjectsTest.forResource_inJarFile so that it will work in Java 9 as well, where Object.class is not loadable as a resource. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=170239938 --- .../google/testing/compile/JavaFileObjectsTest.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/google/testing/compile/JavaFileObjectsTest.java b/src/test/java/com/google/testing/compile/JavaFileObjectsTest.java index eaf38e81..3546ea92 100644 --- a/src/test/java/com/google/testing/compile/JavaFileObjectsTest.java +++ b/src/test/java/com/google/testing/compile/JavaFileObjectsTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.fail; import java.io.IOException; -import java.net.URI; import javax.tools.JavaFileObject; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,11 +34,14 @@ public class JavaFileObjectsTest { @Test public void forResource_inJarFile() { - JavaFileObject resourceInJar = JavaFileObjects.forResource("java/lang/Object.class"); + JavaFileObject resourceInJar = + JavaFileObjects.forResource("com/google/testing/compile/JavaFileObjectsTest.class"); assertThat(resourceInJar.getKind()).isEqualTo(CLASS); - assertThat(resourceInJar.toUri()).isEqualTo(URI.create("/java/lang/Object.class")); - assertThat(resourceInJar.getName()).isEqualTo("/java/lang/Object.class"); - assertThat(resourceInJar.isNameCompatible("Object", CLASS)).isTrue(); + assertThat(resourceInJar.toUri().getPath()) + .endsWith("/com/google/testing/compile/JavaFileObjectsTest.class"); + assertThat(resourceInJar.getName()) + .endsWith("/com/google/testing/compile/JavaFileObjectsTest.class"); + assertThat(resourceInJar.isNameCompatible("JavaFileObjectsTest", CLASS)).isTrue(); } @Test public void forSourceLines() throws IOException { From c2f3634bcc10a484c1fea3b6297bd6006067977d Mon Sep 17 00:00:00 2001 From: dpb Date: Fri, 21 Jul 2017 12:51:00 -0400 Subject: [PATCH 005/300] Don't look for tools.jar in JDK9, since it's not there. Update Guava and AutoValue versions. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=170520031 --- pom.xml | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index d8bfa5e1..49651f85 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ com.google.testing.compile compile-testing - 1.0-SNAPSHOT + HEAD-SNAPSHOT Compile Testing Utilities for testing compilation. - 1.3 - 21.0 + 1.5 + 23.1-jre 0.36 4.12 3.0.1 @@ -65,13 +65,6 @@ guava ${guava.version} - - com.sun - tools - ${java.version} - system - ${toolsjar} - com.google.code.findbugs jsr305 @@ -119,28 +112,42 @@ - default-profile + tools-jar - true + false ${java.home}/../lib/tools.jar - - ${java.home}/../lib/tools.jar - + + + com.sun + tools + ${java.version} + system + ${java.home}/../lib/tools.jar + + - mac-profile + classes-jar false ${java.home}/../Classes/classes.jar - - ${java.home}/../Classes/classes.jar - + + + com.sun + tools + ${java.version} + system + + + ${java.home}/../Classes/classes.jar + + release From cc5a56776c0f625d04951e189070438a5fcb8f62 Mon Sep 17 00:00:00 2001 From: jijiang Date: Fri, 6 Oct 2017 09:08:06 -0700 Subject: [PATCH 006/300] Replace FailureStrategy with FailureMetadata ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=171299283 --- .../google/testing/compile/CompilationSubject.java | 13 ++++++------- .../testing/compile/CompilationSubjectFactory.java | 10 +++++----- .../testing/compile/JavaFileObjectSubject.java | 13 ++++++------- .../compile/JavaFileObjectSubjectFactory.java | 10 +++++----- .../testing/compile/JavaSourceSubjectFactory.java | 12 ++++++------ .../google/testing/compile/JavaSourcesSubject.java | 10 +++++----- .../testing/compile/JavaSourcesSubjectFactory.java | 12 ++++++------ 7 files changed, 39 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index f89b6778..56fc4cfe 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -35,9 +35,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import com.google.common.truth.FailureStrategy; +import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; -import com.google.common.truth.SubjectFactory; import com.google.common.truth.Truth; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.io.IOException; @@ -57,11 +56,11 @@ /** A {@link Truth} subject for a {@link Compilation}. */ public final class CompilationSubject extends Subject { - private static final SubjectFactory FACTORY = + private static final Subject.Factory FACTORY = new CompilationSubjectFactory(); - /** Returns a {@link SubjectFactory} for a {@link Compilation}. */ - public static SubjectFactory compilations() { + /** Returns a {@link Subject.Factory} for a {@link Compilation}. */ + public static Subject.Factory compilations() { return FACTORY; } @@ -70,8 +69,8 @@ public static CompilationSubject assertThat(Compilation actual) { return assertAbout(compilations()).that(actual); } - CompilationSubject(FailureStrategy failureStrategy, Compilation actual) { - super(failureStrategy, actual); + CompilationSubject(FailureMetadata failureMetadata, Compilation actual) { + super(failureMetadata, actual); } /** Asserts that the compilation succeeded. */ diff --git a/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java b/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java index 396a0a37..4c932763 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java @@ -15,15 +15,15 @@ */ package com.google.testing.compile; -import com.google.common.truth.FailureStrategy; -import com.google.common.truth.SubjectFactory; +import com.google.common.truth.FailureMetadata; +import com.google.common.truth.Subject; import com.google.common.truth.Truth; /** A {@link Truth} subject factory for a {@link Compilation}. */ -final class CompilationSubjectFactory extends SubjectFactory { +final class CompilationSubjectFactory implements Subject.Factory { @Override - public CompilationSubject getSubject(FailureStrategy fs, Compilation that) { - return new CompilationSubject(fs, that); + public CompilationSubject createSubject(FailureMetadata failureMetadata, Compilation that) { + return new CompilationSubject(failureMetadata, that); } } diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index b4fc9fcc..e995f97b 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -24,10 +24,9 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.io.ByteSource; -import com.google.common.truth.FailureStrategy; +import com.google.common.truth.FailureMetadata; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; -import com.google.common.truth.SubjectFactory; import com.google.testing.compile.Parser.ParseResult; import com.sun.source.tree.CompilationUnitTree; import java.io.IOException; @@ -38,11 +37,11 @@ /** Assertions about {@link JavaFileObject}s. */ public final class JavaFileObjectSubject extends Subject { - private static final SubjectFactory FACTORY = + private static final Subject.Factory FACTORY = new JavaFileObjectSubjectFactory(); - /** Returns a {@link SubjectFactory} for {@link JavaFileObjectSubject}s. */ - public static SubjectFactory javaFileObjects() { + /** Returns a {@link Subject.Factory} for {@link JavaFileObjectSubject}s. */ + public static Subject.Factory javaFileObjects() { return FACTORY; } @@ -51,8 +50,8 @@ public static JavaFileObjectSubject assertThat(JavaFileObject actual) { return assertAbout(FACTORY).that(actual); } - JavaFileObjectSubject(FailureStrategy failureStrategy, JavaFileObject actual) { - super(failureStrategy, actual); + JavaFileObjectSubject(FailureMetadata failureMetadata, JavaFileObject actual) { + super(failureMetadata, actual); } @Override diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java index 6207b546..dbe4f704 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java @@ -15,16 +15,16 @@ */ package com.google.testing.compile; -import com.google.common.truth.FailureStrategy; -import com.google.common.truth.SubjectFactory; +import com.google.common.truth.FailureMetadata; +import com.google.common.truth.Subject; import javax.tools.JavaFileObject; /** A factory for {@link JavaFileObjectSubject}s. */ final class JavaFileObjectSubjectFactory - extends SubjectFactory { + implements Subject.Factory { @Override - public JavaFileObjectSubject getSubject(FailureStrategy fs, JavaFileObject that) { - return new JavaFileObjectSubject(fs, that); + public JavaFileObjectSubject createSubject(FailureMetadata failureMetadata, JavaFileObject that) { + return new JavaFileObjectSubject(failureMetadata, that); } } diff --git a/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java b/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java index 80e8041c..d5562cee 100644 --- a/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java @@ -15,19 +15,19 @@ */ package com.google.testing.compile; -import com.google.common.truth.FailureStrategy; -import com.google.common.truth.SubjectFactory; +import com.google.common.truth.FailureMetadata; +import com.google.common.truth.Subject; import javax.tools.JavaFileObject; /** - * A Truth {@link SubjectFactory} similar to + * A Truth {@link Subject.Factory} similar to * {@link JavaSourcesSubjectFactory}, but for working with single source files. * * @author Gregory Kick */ public final class JavaSourceSubjectFactory - extends SubjectFactory { + implements Subject.Factory { public static JavaSourceSubjectFactory javaSource() { return new JavaSourceSubjectFactory(); } @@ -35,8 +35,8 @@ public static JavaSourceSubjectFactory javaSource() { private JavaSourceSubjectFactory() {} @Override - public JavaSourcesSubject.SingleSourceAdapter getSubject(FailureStrategy failureStrategy, + public JavaSourcesSubject.SingleSourceAdapter createSubject(FailureMetadata failureMetadata, JavaFileObject subject) { - return new JavaSourcesSubject.SingleSourceAdapter(failureStrategy, subject); + return new JavaSourcesSubject.SingleSourceAdapter(failureMetadata, subject); } } diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index e83319ef..774a78e1 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -32,7 +32,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.ByteSource; -import com.google.common.truth.FailureStrategy; +import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.testing.compile.CompilationSubject.DiagnosticAtColumn; @@ -66,8 +66,8 @@ public final class JavaSourcesSubject private final List options = new ArrayList(Arrays.asList("-Xlint")); @Nullable private ClassLoader classLoader; - JavaSourcesSubject(FailureStrategy failureStrategy, Iterable subject) { - super(failureStrategy, subject); + JavaSourcesSubject(FailureMetadata failureMetadata, Iterable subject) { + super(failureMetadata, subject); } @Override @@ -562,8 +562,8 @@ public static final class SingleSourceAdapter extends SubjectTruth {@link SubjectFactory} for creating + * A Truth {@link Subject.Factory} for creating * {@link JavaSourcesSubject} instances. * * @author Gregory Kick */ public final class JavaSourcesSubjectFactory - extends SubjectFactory> { + implements Subject.Factory> { public static JavaSourcesSubjectFactory javaSources() { return new JavaSourcesSubjectFactory(); } @@ -35,8 +35,8 @@ public static JavaSourcesSubjectFactory javaSources() { private JavaSourcesSubjectFactory() {} @Override - public JavaSourcesSubject getSubject(FailureStrategy failureStrategy, + public JavaSourcesSubject createSubject(FailureMetadata failureMetadata, Iterable subject) { - return new JavaSourcesSubject(failureStrategy, subject); + return new JavaSourcesSubject(failureMetadata, subject); } } From 724d44759e35d490c9b10c169d8ed7f963636107 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 20 Nov 2017 11:47:49 -0800 Subject: [PATCH 007/300] Update Compile-Testing docs to refer to latest version. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=176393016 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9a01925c..e90e9e50 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ A library for testing javac compilation with or without annotation processors. S Latest Release -------------- -The latest release is version `0.12`. Include it as a [Maven](http://maven.apache.org/) dependency with the following snippet: +The latest release is version `0.13`. Include it as a [Maven](http://maven.apache.org/) dependency with the following snippet: ``` com.google.testing.compile compile-testing - 0.12 + 0.13 test ``` From 49c254f02a0d9c9c9ebbedd7c7cd9635ecd699d5 Mon Sep 17 00:00:00 2001 From: ronshapiro Date: Mon, 4 Dec 2017 10:58:37 -0800 Subject: [PATCH 008/300] Implement JavaFileObjectSubject.containsElementsIn() RELNOTES=Implement JavaFileObjectSubject.containsElementsIn() ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=177837393 --- pom.xml | 6 + .../compile/JavaFileObjectSubject.java | 62 ++- .../google/testing/compile/TreeDiffer.java | 257 ++++++++++- .../compile/JavaFileObjectSubjectTest.java | 45 ++ .../testing/compile/TreeDifferTest.java | 401 ++++++++++++++++++ 5 files changed, 743 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 49651f85..c408464b 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ Utilities for testing compilation. + 0.8 1.5 23.1-jre 0.36 @@ -82,6 +83,11 @@ auto-value ${auto-value.version} + + com.google.auto + auto-common + ${auto-common.version} + diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index e995f97b..677b937c 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertAbout; import static com.google.testing.compile.JavaFileObjects.asByteSource; import static com.google.testing.compile.TreeDiffer.diffCompilationUnits; +import static com.google.testing.compile.TreeDiffer.matchCompilationUnits; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Joiner; @@ -31,6 +32,7 @@ import com.sun.source.tree.CompilationUnitTree; import java.io.IOException; import java.nio.charset.Charset; +import java.util.function.BiFunction; import javax.annotation.Nullable; import javax.tools.JavaFileObject; @@ -113,17 +115,65 @@ public StringSubject contentsAsUtf8String() { } /** - * Asserts that the actual file is a source file with contents equivalent to {@code + * Asserts that the actual file is a source file that has an equivalent AST to that of {@code * expectedSource}. */ public void hasSourceEquivalentTo(JavaFileObject expectedSource) { + performTreeDifference( + expectedSource, + "is equivalent to", + "Expected Source", + (expectedResult, actualResult) -> + diffCompilationUnits( + getOnlyElement(expectedResult.compilationUnits()), + getOnlyElement(actualResult.compilationUnits()))); + } + + /** + * Asserts that the every node in the AST of {@code expectedPattern} + * exists in the actual file's AST, in the same order. + * + *

Methods, constructors, fields, and types that are in the pattern must have the exact same + * modifiers and annotations as the actual AST. Ordering of AST nodes is also important (i.e. a + * type with identical members in a different order will fail the assertion). Types must match the + * entire type declaration: type parameters, {@code extends}/{@code implements} clauses, etc. + * Methods must also match the throws clause as well. + * + *

The body of a method or constructor, or field initializer in the actual AST must match the + * pattern in entirety if the member is present in the pattern. + * + *

Said in another way (from a graph-theoretic perspective): the pattern AST must be a subgraph + * of the actual AST. If a method, constructor, or field is in the pattern, that entire subtree, + * including modifiers and annotations, must be equal to the corresponding subtree in the actual + * AST (no proper subgraphs). + */ + public void containsElementsIn(JavaFileObject expectedPattern) { + performTreeDifference( + expectedPattern, + "contains elements in", + "Expected Pattern", + (expectedResult, actualResult) -> + matchCompilationUnits( + getOnlyElement(expectedResult.compilationUnits()), + actualResult.trees(), + getOnlyElement(actualResult.compilationUnits()), + expectedResult.trees())); + } + + private void performTreeDifference( + JavaFileObject expected, + String failureVerb, + String expectedTitle, + BiFunction differencingFunction) { ParseResult actualResult = Parser.parse(ImmutableList.of(actual())); CompilationUnitTree actualTree = getOnlyElement(actualResult.compilationUnits()); - ParseResult expectedResult = Parser.parse(ImmutableList.of(expectedSource)); + ParseResult expectedResult = Parser.parse(ImmutableList.of(expected)); CompilationUnitTree expectedTree = getOnlyElement(expectedResult.compilationUnits()); - TreeDifference treeDifference = diffCompilationUnits(expectedTree, actualTree); + TreeDifference treeDifference = differencingFunction.apply(expectedResult, actualResult); if (!treeDifference.isEmpty()) { String diffReport = @@ -134,17 +184,17 @@ public void hasSourceEquivalentTo(JavaFileObject expectedSource) { fail( Joiner.on('\n') .join( - String.format("is equivalent to <%s>.", expectedSource.toUri().getPath()), + String.format("%s <%s>.", failureVerb, expected.toUri().getPath()), "", "Diffs:", "======", "", diffReport, "", - "Expected Source:", + expectedTitle + ":", "================", "", - expectedSource.getCharContent(false), + expected.getCharContent(false), "", "Actual Source:", "==============", diff --git a/src/main/java/com/google/testing/compile/TreeDiffer.java b/src/main/java/com/google/testing/compile/TreeDiffer.java index e826c0d5..f047ab25 100644 --- a/src/main/java/com/google/testing/compile/TreeDiffer.java +++ b/src/main/java/com/google/testing/compile/TreeDiffer.java @@ -16,10 +16,17 @@ package com.google.testing.compile; import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.collect.ImmutableList.toImmutableList; +import static com.google.common.collect.ImmutableSet.toImmutableSet; +import com.google.auto.common.MoreTypes; +import com.google.auto.value.AutoValue; +import com.google.common.base.Equivalence; +import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.base.Optional; - +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.sun.source.tree.AnnotationTree; import com.sun.source.tree.ArrayAccessTree; import com.sun.source.tree.ArrayTypeTree; @@ -64,6 +71,7 @@ import com.sun.source.tree.ThrowTree; import com.sun.source.tree.Tree; import com.sun.source.tree.Tree.Kind; +import com.sun.source.tree.TreeVisitor; import com.sun.source.tree.TryTree; import com.sun.source.tree.TypeCastTree; import com.sun.source.tree.TypeParameterTree; @@ -73,11 +81,14 @@ import com.sun.source.tree.WildcardTree; import com.sun.source.util.SimpleTreeVisitor; import com.sun.source.util.TreePath; - +import com.sun.source.util.Trees; +import java.util.HashSet; import java.util.Iterator; - +import java.util.Set; import javax.annotation.Nullable; import javax.lang.model.element.Name; +import javax.lang.model.type.TypeMirror; +import javax.tools.JavaFileObject; /** * A class for determining how two compilation {@code Tree}s differ from each other. @@ -98,13 +109,37 @@ final class TreeDiffer { private TreeDiffer() {} /** - * Returns a {@code TreeDifference} describing the difference between the two - * {@code CompilationUnitTree}s provided. + * Returns a {@code TreeDifference} describing the difference between the two {@code + * CompilationUnitTree}s provided. + */ + static TreeDifference diffCompilationUnits( + CompilationUnitTree expected, CompilationUnitTree actual) { + return createDiff(checkNotNull(expected), checkNotNull(actual), TreeFilter.KEEP_ALL); + } + + /** + * Returns a {@code TreeDifference} describing the difference between the actual {@code + * CompilationUnitTree} provided and the pattern. See {@link + * JavaFileObjectSubject#containsElementsIn(JavaFileObject)} for more details on how the pattern + * is used. */ - static final TreeDifference diffCompilationUnits(@Nullable CompilationUnitTree expected, - @Nullable CompilationUnitTree actual) { + static TreeDifference matchCompilationUnits( + CompilationUnitTree pattern, + Trees patternTrees, + CompilationUnitTree actual, + Trees actualTrees) { + checkNotNull(pattern); + checkNotNull(actual); + return createDiff( + pattern, actual, new MatchExpectedTreesFilter(pattern, patternTrees, actual, actualTrees)); + } + + private static TreeDifference createDiff( + @Nullable CompilationUnitTree expected, + @Nullable CompilationUnitTree actual, + TreeFilter treeFilter) { TreeDifference.Builder diffBuilder = new TreeDifference.Builder(); - DiffVisitor diffVisitor = new DiffVisitor(diffBuilder); + DiffVisitor diffVisitor = new DiffVisitor(diffBuilder, treeFilter); diffVisitor.scan(expected, actual); return diffBuilder.build(); } @@ -119,8 +154,8 @@ static final TreeDifference diffCompilationUnits(@Nullable CompilationUnitTree e static final TreeDifference diffSubtrees(@Nullable TreePath pathToExpected, @Nullable TreePath pathToActual) { TreeDifference.Builder diffBuilder = new TreeDifference.Builder(); - DiffVisitor diffVisitor = new DiffVisitor(diffBuilder, - pathToExpected, pathToActual); + DiffVisitor diffVisitor = + new DiffVisitor(diffBuilder, TreeFilter.KEEP_ALL, pathToExpected, pathToActual); diffVisitor.scan(pathToExpected.getLeaf(), pathToActual.getLeaf()); return diffBuilder.build(); } @@ -135,20 +170,20 @@ static final class DiffVisitor extends SimpleTreeVisitor { private TreePath actualPath; private final TreeDifference.Builder diffBuilder; + private final TreeFilter filter; - public DiffVisitor(TreeDifference.Builder diffBuilder) { - this.diffBuilder = diffBuilder; - expectedPath = null; - actualPath = null; + DiffVisitor(TreeDifference.Builder diffBuilder, TreeFilter filter) { + this(diffBuilder, filter, null, null); } /** * Constructs a DiffVisitor whose {@code TreePath}s are initialized with the paths * provided. */ - public DiffVisitor(TreeDifference.Builder diffBuilder, + private DiffVisitor(TreeDifference.Builder diffBuilder, TreeFilter filter, TreePath pathToExpected, TreePath pathToActual) { this.diffBuilder = diffBuilder; + this.filter = filter; expectedPath = pathToExpected; actualPath = pathToActual; } @@ -209,7 +244,7 @@ private boolean namesEqual(@Nullable Name expected, @Nullable Name actual) { : (actual != null && expected.contentEquals(actual)); } - public Void scan(@Nullable Tree expected, @Nullable Tree actual) { + private void scan(@Nullable Tree expected, @Nullable Tree actual) { if (expected == null && actual != null) { diffBuilder.addExtraActualNode(actualPathPlus(actual)); } else if (expected != null && actual == null) { @@ -217,11 +252,10 @@ public Void scan(@Nullable Tree expected, @Nullable Tree actual) { } else if (actual != null && expected != null) { pushPathAndAccept(expected, actual); } - return null; } - private Void parallelScan(Iterable expecteds, - Iterable actuals) { + private void parallelScan( + Iterable expecteds, Iterable actuals) { if (expecteds != null && actuals != null) { Iterator expectedsIterator = expecteds.iterator(); Iterator actualsIterator = actuals.iterator(); @@ -238,7 +272,6 @@ private Void parallelScan(Iterable expecteds, } else if (actuals == null && !isEmptyOrNull(expecteds)) { diffBuilder.addExtraExpectedNode(expectedPathPlus(expecteds.iterator().next())); } - return null; } private boolean isEmptyOrNull(Iterable iterable) { @@ -425,7 +458,11 @@ public Void visitClass(ClassTree expected, Tree actual) { parallelScan(expected.getTypeParameters(), other.get().getTypeParameters()); scan(expected.getExtendsClause(), other.get().getExtendsClause()); parallelScan(expected.getImplementsClause(), other.get().getImplementsClause()); - parallelScan(expected.getMembers(), other.get().getMembers()); + parallelScan( + expected.getMembers(), + filter.filterActualMembers( + ImmutableList.copyOf(expected.getMembers()), + ImmutableList.copyOf(other.get().getMembers()))); return null; } @@ -776,7 +813,11 @@ public Void visitCompilationUnit(CompilationUnitTree expected, Tree actual) { parallelScan(expected.getPackageAnnotations(), other.get().getPackageAnnotations()); scan(expected.getPackageName(), other.get().getPackageName()); - parallelScan(expected.getImports(), other.get().getImports()); + parallelScan( + expected.getImports(), + filter.filterImports( + ImmutableList.copyOf(expected.getImports()), + ImmutableList.copyOf(other.get().getImports()))); parallelScan(expected.getTypeDecls(), other.get().getTypeDecls()); return null; } @@ -936,6 +977,7 @@ public Void visitOther(Tree expected, Tree actual) { throw new UnsupportedOperationException("cannot compare unknown trees"); } + // TODO(dpb,ronshapiro): rename this method and document which one is cast private Optional checkTypeAndCast(T expected, Tree actual) { Kind expectedKind = checkNotNull(expected).getKind(); Kind treeKind = checkNotNull(actual).getKind(); @@ -948,4 +990,175 @@ private Optional checkTypeAndCast(T expected, Tree actual) { } } } + + /** Strategy for determining which {link Tree}s should be diffed in {@link DiffVisitor}. */ + private interface TreeFilter { + + /** Returns the subset of {@code actualMembers} that should be diffed by {@link DiffVisitor}. */ + ImmutableList filterActualMembers( + ImmutableList expectedMembers, ImmutableList actualMembers); + + /** Returns the subset of {@code actualImports} that should be diffed by {@link DiffVisitor}. */ + ImmutableList filterImports( + ImmutableList expectedImports, ImmutableList actualImports); + + /** A {@link TreeFilter} that doesn't filter any subtrees out of the actual source AST. */ + TreeFilter KEEP_ALL = + new TreeFilter() { + @Override + public ImmutableList filterActualMembers( + ImmutableList expectedMembers, ImmutableList actualMembers) { + return actualMembers; + } + + @Override + public ImmutableList filterImports( + ImmutableList expectedImports, ImmutableList actualImports) { + return actualImports; + } + }; + } + + /** + * A {@link TreeFilter} that ignores all {@link Tree}s that don't have a matching {@link Tree} in + * a pattern. For more information on what trees are filtered, see {@link + * JavaFileObjectSubject#containsElementsIn(JavaFileObject)}. + */ + private static class MatchExpectedTreesFilter implements TreeFilter { + private final CompilationUnitTree pattern; + private final Trees patternTrees; + private final CompilationUnitTree actual; + private final Trees actualTrees; + + MatchExpectedTreesFilter( + CompilationUnitTree pattern, + Trees patternTrees, + CompilationUnitTree actual, + Trees actualTrees) { + this.pattern = pattern; + this.patternTrees = patternTrees; + this.actual = actual; + this.actualTrees = actualTrees; + } + + @Override + public ImmutableList filterActualMembers( + ImmutableList patternMembers, ImmutableList actualMembers) { + Set patternVariableNames = new HashSet<>(); + Set patternNestedTypeNames = new HashSet<>(); + Set patternMethods = new HashSet<>(); + for (Tree patternTree : patternMembers) { + patternTree.accept( + new SimpleTreeVisitor() { + @Override + public Void visitVariable(VariableTree variable, Void p) { + patternVariableNames.add(variable.getName().toString()); + return null; + } + + @Override + public Void visitMethod(MethodTree method, Void p) { + patternMethods.add(MethodSignature.create(pattern, method, patternTrees)); + return null; + } + + @Override + public Void visitClass(ClassTree clazz, Void p) { + patternNestedTypeNames.add(clazz.getSimpleName().toString()); + return null; + } + }, + null); + } + + ImmutableList.Builder filteredActualTrees = ImmutableList.builder(); + for (Tree actualTree : actualMembers) { + actualTree.accept(new SimpleTreeVisitor(){ + @Override + public Void visitVariable(VariableTree variable, Void p) { + if (patternVariableNames.contains(variable.getName().toString())) { + filteredActualTrees.add(actualTree); + } + return null; + } + + @Override + public Void visitMethod(MethodTree method, Void p) { + if (patternMethods.contains(MethodSignature.create(actual, method, actualTrees))) { + filteredActualTrees.add(method); + } + return null; + } + + @Override + public Void visitClass(ClassTree clazz, Void p) { + if (patternNestedTypeNames.contains(clazz.getSimpleName().toString())) { + filteredActualTrees.add(clazz); + } + return null; + } + + @Override + protected Void defaultAction(Tree tree, Void p) { + filteredActualTrees.add(tree); + return null; + } + }, null); + } + return filteredActualTrees.build(); + } + + @Override + public ImmutableList filterImports( + ImmutableList patternImports, ImmutableList actualImports) { + ImmutableSet patternImportsAsStrings = + patternImports.stream().map(this::fullyQualifiedImport).collect(toImmutableSet()); + return actualImports + .stream() + .filter(importTree -> patternImportsAsStrings.contains(fullyQualifiedImport(importTree))) + .collect(toImmutableList()); + } + + private String fullyQualifiedImport(ImportTree importTree) { + ImmutableList.Builder names = ImmutableList.builder(); + importTree.getQualifiedIdentifier().accept(IMPORT_NAMES_ACCUMULATOR, names); + return Joiner.on('.').join(names.build().reverse()); + } + } + + private static final TreeVisitor> IMPORT_NAMES_ACCUMULATOR = + new SimpleTreeVisitor>() { + @Override + public Void visitMemberSelect( + MemberSelectTree memberSelectTree, ImmutableList.Builder names) { + names.add(memberSelectTree.getIdentifier()); + return memberSelectTree.getExpression().accept(this, names); + } + + @Override + public Void visitIdentifier( + IdentifierTree identifierTree, ImmutableList.Builder names) { + names.add(identifierTree.getName()); + return null; + } + }; + + @AutoValue + abstract static class MethodSignature { + abstract String name(); + abstract ImmutableList> parameterTypes(); + + static MethodSignature create( + CompilationUnitTree compilationUnitTree, MethodTree tree, Trees trees) { + ImmutableList.Builder> parameterTypes = + ImmutableList.builder(); + for (VariableTree parameter : tree.getParameters()) { + parameterTypes.add( + MoreTypes.equivalence() + .wrap(trees.getTypeMirror(trees.getPath(compilationUnitTree, parameter)))); + } + return new AutoValue_TreeDiffer_MethodSignature( + tree.getName().toString(), parameterTypes.build()); + } + } } diff --git a/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java b/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java index 460f57e9..fb57d2c3 100644 --- a/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java +++ b/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java @@ -151,4 +151,49 @@ public void hasSourceEquivalentTo_failOnExtraInActual() throws IOException { assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getName()); assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getCharContent(false)); } + + private static final JavaFileObject SAMPLE_ACTUAL_FILE_FOR_MATCHING = + JavaFileObjects.forSourceLines( + "test.SomeFile", + "package test;", + "", + "import pkg.AnAnnotation;", + "import static another.something.Special.CONSTANT;", + "", + "@AnAnnotation(with = @Some(values = {1,2,3}), and = \"a string\")", + "public class SomeFile {", + " private static final int CONSTANT_TIMES_2 = CONSTANT * 2;", + " private static final int CONSTANT_TIMES_3 = CONSTANT * 3;", + " private static final int CONSTANT_TIMES_4 = CONSTANT * 4;", + "", + " @Nullable private MaybeNull field;", + "", + " @Inject SomeFile() {", + " this.field = MaybeNull.constructorBody();", + " }", + "", + " protected int method(Parameter p, OtherParam o) {", + " return CONSTANT_TIMES_4 / p.hashCode() + o.hashCode();", + " }", + "", + " public static class InnerClass {", + " private static final int CONSTANT_TIMES_8 = CONSTANT_TIMES_4 * 2;", + "", + " @Nullable private MaybeNull innerClassField;", + "", + " @Inject", + " InnerClass() {", + " this.innerClassField = MaybeNull.constructorBody();", + " }", + "", + " protected int innerClassMethod(Parameter p, OtherParam o) {", + " return CONSTANT_TIMES_8 / p.hashCode() + o.hashCode();", + " }", + " }", + "}"); + + @Test + public void containsElementsIn_completeMatch() { + assertThat(SAMPLE_ACTUAL_FILE_FOR_MATCHING).containsElementsIn(SAMPLE_ACTUAL_FILE_FOR_MATCHING); + } } diff --git a/src/test/java/com/google/testing/compile/TreeDifferTest.java b/src/test/java/com/google/testing/compile/TreeDifferTest.java index 92653b2e..a5d68e12 100644 --- a/src/test/java/com/google/testing/compile/TreeDifferTest.java +++ b/src/test/java/com/google/testing/compile/TreeDifferTest.java @@ -15,9 +15,11 @@ */ package com.google.testing.compile; +import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; +import com.google.testing.compile.Parser.ParseResult; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.Tree; import com.sun.source.util.TreePath; @@ -282,6 +284,405 @@ public void scan_testLambdaVersusAnonymousClass() { assertThat(diff.isEmpty()).isFalse(); } + @Test + public void matchCompilationUnits() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "", + "import not.NotUsed;", + "import is.IsUsed;", + "", + "public class HasExtras { ", + " private NotUsed skipped;", + " private Object matched;", + " private IsUsed usedFromImport;", + " private Object skipped2;", + "", + " HasExtras() {}", + " HasExtras(int overloadedConstructor) {}", + "", + " public String skippedMethod() { return null; }", + " public String matchedMethod() { return null; }", + " public Object overloadedMethod(int skipWithDifferentSignature) { return null; }", + " public String overloadedMethod(int i, Double d) { return null; }", + " public String overloadedMethod(int i, Double d, IsUsed u) { return null; }", + "", + " class NestedClass {", + " int matchMe = 0;", + " double ignoreMe = 0;", + " }", + "", + " class IgnoredNestedClass {}", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "import is.IsUsed;", + "", + "public class HasExtras { ", + " private Object matched;", + " private IsUsed usedFromImport;", + "", + " HasExtras(int overloadedConstructor) {}", + "", + " public String matchedMethod() { return null; }", + " public String overloadedMethod(int i, Double d) { return null; }", + " public String overloadedMethod(int i, Double d, IsUsed u) { return null; }", + "", + " class NestedClass {", + " int matchMe = 0;", + " }", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.isEmpty()).isTrue(); + } + + @Test + public void matchCompilationUnits_unresolvedTypeInPattern() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "", + "import is.IsUsed;", + "", + "public class HasExtras { ", + " private IsUsed usedFromImport;", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "public class HasExtras { ", + " private IsUsed usedFromImport;", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.isEmpty()).isTrue(); + } + + @Test + public void matchCompilationUnits_sameSignature_differentReturnType() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "public class HasExtras { ", + " private Object method(int i, double d) { return null; };", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "public class HasExtras { ", + " private String method(int i, double d) { return null; };", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getDifferingNodes()).isNotEmpty(); + } + + @Test + public void matchCompilationUnits_sameSignature_differentParameterNames() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "public class HasExtras { ", + " private Object method(int i, double d) { return null; };", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "public class HasExtras { ", + " private Object method(int i2, double d2) { return null; };", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getDifferingNodes()).isNotEmpty(); + } + + @Test + public void matchCompilationUnits_sameSignature_differentParameters() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "public class HasExtras { ", + " private Object method(int i, Object o) { return null; };", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "public class HasExtras { ", + " private Object method(int i2, @Nullable Object o) { return null; };", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getDifferingNodes()).isNotEmpty(); + } + + @Test + public void matchCompilationUnits_sameSignature_differentModifiers() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "public class HasExtras { ", + " private Object method(int i, Object o) { return null; };", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "public class HasExtras { ", + " public Object method(int i2, @Nullable Object o) { return null; };", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getDifferingNodes()).isNotEmpty(); + } + + @Test + public void matchCompilationUnits_sameSignature_differentThrows() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "public class HasExtras { ", + " private void method() throws RuntimeException {}", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "public class HasExtras { ", + " private void method() throws Error {}", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getDifferingNodes()).isNotEmpty(); + } + + @Test + public void matchCompilationUnits_variablesWithDifferentTypes() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "public class HasExtras { ", + " private Object field;", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "public class HasExtras { ", + " private String field;", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getDifferingNodes()).isNotEmpty(); + } + + @Test + public void matchCompilationUnits_importsWithSameSimpleName() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "", + "import foo.Imported;", + "", + "public class HasExtras { ", + " private Imported field;", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "import bar.Imported;", + "", + "public class HasExtras { ", + " private Imported field;", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getExtraExpectedNodes()).isNotEmpty(); + assertThat(diff.getExtraActualNodes()).isEmpty(); + } + + @Test + public void matchCompilationUnits_wrongOrder() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "", + "class Foo {", + " private String method1() { return new String(); }", + " private String method2() { return new String(); }", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "class Foo {", + " private String method2() { return new String(); }", + " private String method1() { return new String(); }", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getDifferingNodes()).isNotEmpty(); + } + + @Test + public void matchCompilationUnits_missingParameter() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "", + "class Foo {", + " private String method1(String s) { return s; }", + " private String method2() { return new String(); }", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "class Foo {", + " private String method1() { return s; }", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getExtraExpectedNodes()).isNotEmpty(); + assertThat(diff.getExtraActualNodes()).isEmpty(); + } + + @Test + public void matchCompilationUnits_missingMethodBodyStatement() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "", + "class Foo {", + " private String method1(String s) { ", + " System.out.println(s);", + " return s;", + " }", + " private String method2() { return new String(); }", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "class Foo {", + " private String method1(String s) { ", + " return s;", + " }", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.getExtraActualNodes()).isNotEmpty(); + } + + @Test + public void matchCompilationUnits_skipsImports() { + ParseResult actual = + MoreTrees.parseLines( + "package test;", + "", + "import bar.Bar;", + "", + "class Foo {", + " private Bar bar;", + "}"); + + ParseResult pattern = + MoreTrees.parseLines( + "package test;", + "", + "class Foo {", + " private Bar bar;", + "}"); + TreeDifference diff = + TreeDiffer.matchCompilationUnits( + getOnlyElement(pattern.compilationUnits()), + pattern.trees(), + getOnlyElement(actual.compilationUnits()), + actual.trees()); + + assertThat(diff.isEmpty()).isTrue(); + } + private TreePath asPath(CompilationUnitTree compilationUnit) { return MoreTrees.findSubtreePath(compilationUnit, Tree.Kind.COMPILATION_UNIT); } From aa87b6001da04b10483f159af8444580d094a672 Mon Sep 17 00:00:00 2001 From: dpb Date: Tue, 12 Dec 2017 12:40:34 -0800 Subject: [PATCH 009/300] Update version of auto-common to 0.9. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=178799574 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c408464b..f0d0f138 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 0.8 + 0.9 1.5 23.1-jre 0.36 From 1ea11bc1a11edfefe95bb4bf20d6a790328d3d7d Mon Sep 17 00:00:00 2001 From: dpb Date: Wed, 20 Dec 2017 08:41:39 -0800 Subject: [PATCH 010/300] Update dependencies and plugin versions to support Java 9. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=179690614 --- pom.xml | 54 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index f0d0f138..3a60cb19 100644 --- a/pom.xml +++ b/pom.xml @@ -15,20 +15,18 @@ Utilities for testing compilation. - 0.9 - 1.5 - 23.1-jre - 0.36 - 4.12 - 3.0.1 + 0.37 http://github.com/google/compile-testing + GitHub http://github.com/google/compile-testing/issues + 2013 + The Apache Software License, Version 2.0 @@ -36,20 +34,23 @@ repo + - 3.1.1 + 3.5.0 + scm:git:http://github.com/google/compile-testing scm:git:git@github.com:google/compile-testing.git http://github.com/google/compile-testing HEAD + junit junit - ${junit.version} + 4.12 com.google.truth @@ -64,36 +65,38 @@ com.google.guava guava - ${guava.version} + 23.5-jre com.google.code.findbugs jsr305 - ${jsr305.version} + 3.0.2 true com.google.errorprone error_prone_annotations - 2.0.8 + 2.1.3 provided com.google.auto.value auto-value - ${auto-value.version} + 1.5.3 com.google.auto auto-common - ${auto-common.version} + 0.9 + + org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.7.0 1.8 1.8 @@ -101,21 +104,31 @@ true true + + + org.codehaus.plexus + plexus-java + 0.9.5 + + + org.apache.maven.plugins maven-release-plugin - 2.5.1 + 2.5.3 release deploy + org.apache.maven.plugins maven-jar-plugin - 2.5 + 3.0.2 + tools-jar @@ -163,8 +176,9 @@ + org.apache.maven.plugins maven-gpg-plugin - 1.4 + 1.6 sign-artifacts @@ -174,8 +188,9 @@ + org.apache.maven.plugins maven-source-plugin - 2.1.2 + 3.0.1 attach-sources @@ -184,8 +199,9 @@ + org.apache.maven.plugins maven-javadoc-plugin - 2.8 + 3.0.0 attach-docs From 72a3e5cc44c1ca19e3feec8b39341e3d271eb005 Mon Sep 17 00:00:00 2001 From: dpb Date: Mon, 22 Jan 2018 13:35:13 -0800 Subject: [PATCH 011/300] Use new dependency versions. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=182827926 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3a60cb19..5ffb83f5 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ com.google.guava guava - 23.5-jre + 23.6-jre com.google.code.findbugs @@ -76,7 +76,7 @@ com.google.errorprone error_prone_annotations - 2.1.3 + 2.2.0 provided @@ -87,7 +87,7 @@ com.google.auto auto-common - 0.9 + 0.10 From ebbc46283385055c141effd1009477e91ca8c07d Mon Sep 17 00:00:00 2001 From: cushon Date: Tue, 23 Jan 2018 09:01:58 -0800 Subject: [PATCH 012/300] Update getClasspathFromClassloader to support JDK 9 JDK 9 breaks the assumption that the default application classloader is a URLClassLoader. RELNOTES=N/A ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=182941154 --- .../com/google/testing/compile/Compiler.java | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/google/testing/compile/Compiler.java b/src/main/java/com/google/testing/compile/Compiler.java index 02d11f61..3c8725eb 100644 --- a/src/main/java/com/google/testing/compile/Compiler.java +++ b/src/main/java/com/google/testing/compile/Compiler.java @@ -21,15 +21,14 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Joiner; +import com.google.common.base.StandardSystemProperty; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.testing.compile.Compilation.Status; import java.net.URL; import java.net.URLClassLoader; -import java.util.ArrayList; import java.util.LinkedHashSet; -import java.util.List; import java.util.Locale; import java.util.Set; import javax.annotation.processing.Processor; @@ -166,35 +165,33 @@ public final Compilation compile(Iterable files) { private static String getClasspathFromClassloader(ClassLoader currentClassloader) { ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader(); - // Add all URLClassloaders in the hirearchy till the system classloader. - List classloaders = new ArrayList<>(); - while(true) { - if (currentClassloader instanceof URLClassLoader) { - // We only know how to extract classpaths from URLClassloaders. - classloaders.add((URLClassLoader) currentClassloader); - } else { - throw new IllegalArgumentException("Classpath for compilation could not be extracted " - + "since given classloader is not an instance of URLClassloader"); - } + // Concatenate search paths from all classloaders in the hierarchy 'till the system classloader. + Set classpaths = new LinkedHashSet<>(); + while (true) { if (currentClassloader == systemClassLoader) { + classpaths.add(StandardSystemProperty.JAVA_CLASS_PATH.value()); break; } - currentClassloader = currentClassloader.getParent(); - } - - Set classpaths = new LinkedHashSet<>(); - for (URLClassLoader classLoader : classloaders) { - for (URL url : classLoader.getURLs()) { - if (url.getProtocol().equals("file")) { - classpaths.add(url.getPath()); - } else { - throw new IllegalArgumentException("Given classloader consists of classpaths which are " - + "unsupported for compilation."); + if (currentClassloader instanceof URLClassLoader) { + // We only know how to extract classpaths from URLClassloaders. + for (URL url : ((URLClassLoader) currentClassloader).getURLs()) { + if (url.getProtocol().equals("file")) { + classpaths.add(url.getPath()); + } else { + throw new IllegalArgumentException( + "Given classloader consists of classpaths which are " + + "unsupported for compilation."); + } } + } else { + throw new IllegalArgumentException( + "Classpath for compilation could not be extracted " + + "since given classloader is not an instance of URLClassloader"); } + currentClassloader = currentClassloader.getParent(); } - return Joiner.on(':').join(classpaths); + return Joiner.on(StandardSystemProperty.PATH_SEPARATOR.value()).join(classpaths); } private Compiler copy(ImmutableList processors, ImmutableList options) { From 7622471b989bcdb2e1f919f7f4b6fc57b1b48d35 Mon Sep 17 00:00:00 2001 From: cushon Date: Wed, 14 Feb 2018 09:47:24 -0800 Subject: [PATCH 013/300] Add withClasspath(Iterable) to Compiler and JavaSourcesSubject and deprecate withClasspathFrom(ClassLoader) RELNOTES=Add `withClasspath(Iterable)` to `Compiler` and `JavaSourcesSubject` and deprecate `withClasspathFrom(ClassLoader)` ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=185700333 --- .../com/google/testing/compile/Compiler.java | 90 ++++++++++++--- .../ForwardingStandardJavaFileManager.java | 71 ++++++++++++ .../compile/InMemoryJavaFileManager.java | 7 +- .../testing/compile/JavaSourcesSubject.java | 28 +++++ .../ProcessedCompileTesterFactory.java | 29 +++-- .../google/testing/compile/CompilerTest.java | 107 ++++++++++++++++++ 6 files changed, 302 insertions(+), 30 deletions(-) create mode 100644 src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java diff --git a/src/main/java/com/google/testing/compile/Compiler.java b/src/main/java/com/google/testing/compile/Compiler.java index 3c8725eb..4ebd657d 100644 --- a/src/main/java/com/google/testing/compile/Compiler.java +++ b/src/main/java/com/google/testing/compile/Compiler.java @@ -16,29 +16,39 @@ package com.google.testing.compile; import static com.google.common.base.Functions.toStringFunction; +import static com.google.common.collect.ImmutableList.toImmutableList; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.tools.ToolProvider.getSystemJavaCompiler; import com.google.auto.value.AutoValue; -import com.google.common.base.Joiner; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Splitter; import com.google.common.base.StandardSystemProperty; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; import com.google.testing.compile.Compilation.Status; +import java.io.File; +import java.io.IOException; +import java.io.UncheckedIOException; import java.net.URL; import java.net.URLClassLoader; import java.util.LinkedHashSet; import java.util.Locale; +import java.util.Optional; import java.util.Set; import javax.annotation.processing.Processor; import javax.tools.DiagnosticCollector; import javax.tools.JavaCompiler; import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject; +import javax.tools.StandardLocation; /** An object that can {@link #compile} Java source files. */ @AutoValue +// clashes with java.lang.Compiler (which is deprecated for removal in 9) +@SuppressWarnings("JavaLangClash") public abstract class Compiler { /** Returns the {@code javac} compiler. */ @@ -48,7 +58,8 @@ public static Compiler javac() { /** Returns a {@link Compiler} that uses a given {@link JavaCompiler} instance. */ public static Compiler compiler(JavaCompiler javaCompiler) { - return new AutoValue_Compiler(javaCompiler, ImmutableList.of(), ImmutableList.of()); + return new AutoValue_Compiler( + javaCompiler, ImmutableList.of(), ImmutableList.of(), Optional.empty()); } abstract JavaCompiler javaCompiler(); @@ -59,6 +70,9 @@ public static Compiler compiler(JavaCompiler javaCompiler) { /** The options passed to the compiler. */ public abstract ImmutableList options(); + /** The compilation class path. If not present, the system class path is used. */ + public abstract Optional> classPath(); + /** * Uses annotation processors during compilation. These replace any previously specified. * @@ -78,7 +92,7 @@ public final Compiler withProcessors(Processor... processors) { * @return a new instance with the same options and the given processors */ public final Compiler withProcessors(Iterable processors) { - return copy(ImmutableList.copyOf(processors), options()); + return copy(ImmutableList.copyOf(processors), options(), classPath()); } /** @@ -96,21 +110,30 @@ public final Compiler withOptions(Object... options) { * @return a new instance with the same processors and the given options */ public final Compiler withOptions(Iterable options) { - return copy(processors(), FluentIterable.from(options).transform(toStringFunction()).toList()); + return copy( + processors(), + FluentIterable.from(options).transform(toStringFunction()).toList(), + classPath()); } /** - * Uses the classpath from the passed on classloader (and its parents) for the compilation - * instead of the system classpath. + * Uses the classpath from the passed on classloader (and its parents) for the compilation instead + * of the system classpath. * * @throws IllegalArgumentException if the given classloader had classpaths which we could not * determine or use for compilation. + * @deprecated prefer {@link #withClasspath(Iterable)}. This method only supports {@link + * URLClassLoader} and the default system classloader, and {@link File}s are usually a more + * natural way to expression compilation classpaths than class loaders. */ + @Deprecated public final Compiler withClasspathFrom(ClassLoader classloader) { - String classpath = getClasspathFromClassloader(classloader); - ImmutableList options = - ImmutableList.builder().add("-classpath").add(classpath).addAll(options()).build(); - return copy(processors(), options); + return copy(processors(), options(), Optional.of(getClasspathFromClassloader(classloader))); + } + + /** Uses the given classpath for the compilation instead of the system classpath. */ + public final Compiler withClasspath(Iterable classPath) { + return copy(processors(), options(), Optional.of(ImmutableList.copyOf(classPath))); } /** @@ -132,6 +155,16 @@ public final Compilation compile(Iterable files) { InMemoryJavaFileManager fileManager = new InMemoryJavaFileManager( javaCompiler().getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8)); + classPath() + .ifPresent( + classPath -> { + try { + fileManager.setLocation(StandardLocation.CLASS_PATH, classPath); + } catch (IOException e) { + // impossible by specification + throw new UncheckedIOException(e); + } + }); CompilationTask task = javaCompiler() .getTask( @@ -156,20 +189,38 @@ public final Compilation compile(Iterable files) { return compilation; } + @VisibleForTesting static final ClassLoader platformClassLoader = getPlatformClassLoader(); + + private static ClassLoader getPlatformClassLoader() { + try { + // JDK >= 9 + return (ClassLoader) ClassLoader.class.getMethod("getPlatformClassLoader").invoke(null); + } catch (ReflectiveOperationException e) { + // Java <= 8 + return null; + } + } + /** * Returns the current classpaths of the given classloader including its parents. * * @throws IllegalArgumentException if the given classloader had classpaths which we could not * determine or use for compilation. */ - private static String getClasspathFromClassloader(ClassLoader currentClassloader) { + private static ImmutableList getClasspathFromClassloader(ClassLoader currentClassloader) { ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader(); // Concatenate search paths from all classloaders in the hierarchy 'till the system classloader. Set classpaths = new LinkedHashSet<>(); while (true) { if (currentClassloader == systemClassLoader) { - classpaths.add(StandardSystemProperty.JAVA_CLASS_PATH.value()); + Iterables.addAll( + classpaths, + Splitter.on(StandardSystemProperty.PATH_SEPARATOR.value()) + .split(StandardSystemProperty.JAVA_CLASS_PATH.value())); + break; + } + if (currentClassloader == platformClassLoader) { break; } if (currentClassloader instanceof URLClassLoader) { @@ -185,16 +236,21 @@ private static String getClasspathFromClassloader(ClassLoader currentClassloader } } else { throw new IllegalArgumentException( - "Classpath for compilation could not be extracted " - + "since given classloader is not an instance of URLClassloader"); + String.format( + "Classpath for compilation could not be extracted " + + "since %s is not an instance of URLClassloader", + currentClassloader)); } currentClassloader = currentClassloader.getParent(); } - return Joiner.on(StandardSystemProperty.PATH_SEPARATOR.value()).join(classpaths); + return classpaths.stream().map(File::new).collect(toImmutableList()); } - private Compiler copy(ImmutableList processors, ImmutableList options) { - return new AutoValue_Compiler(javaCompiler(), processors, options); + private Compiler copy( + ImmutableList processors, + ImmutableList options, + Optional> classPath) { + return new AutoValue_Compiler(javaCompiler(), processors, options, classPath); } } diff --git a/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java b/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java new file mode 100644 index 00000000..c8d49fc9 --- /dev/null +++ b/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2018 Google, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.testing.compile; + +import java.io.File; +import java.io.IOException; +import javax.tools.ForwardingJavaFileManager; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; + +/** + * Forwards calls to a given {@link StandardJavaFileManager}. Subclasses of this class might + * override some of these methods and might also provide additional fields and methods. + */ +class ForwardingStandardJavaFileManager extends ForwardingJavaFileManager + implements StandardJavaFileManager { + + /** + * Creates a new instance of ForwardingStandardJavaFileManager. + * + * @param fileManager delegate to this file manager + */ + ForwardingStandardJavaFileManager(StandardJavaFileManager fileManager) { + super(fileManager); + } + + @Override + public Iterable getJavaFileObjectsFromFiles( + Iterable files) { + return fileManager.getJavaFileObjectsFromFiles(files); + } + + @Override + public Iterable getJavaFileObjects(File... files) { + return fileManager.getJavaFileObjects(files); + } + + @Override + public Iterable getJavaFileObjects(String... names) { + return fileManager.getJavaFileObjects(names); + } + + @Override + public Iterable getJavaFileObjectsFromStrings(Iterable names) { + return fileManager.getJavaFileObjectsFromStrings(names); + } + + @Override + public void setLocation(Location location, Iterable path) throws IOException { + fileManager.setLocation(location, path); + } + + @Override + public Iterable getLocation(Location location) { + return fileManager.getLocation(location); + } +} diff --git a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java index 9d6442bb..94d4b360 100644 --- a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java +++ b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java @@ -34,11 +34,10 @@ import java.nio.charset.Charset; import java.util.Map.Entry; import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; import javax.tools.SimpleJavaFileObject; +import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; /** @@ -47,7 +46,7 @@ * @author Gregory Kick */ // TODO(gak): under java 1.7 this could all be done with a PathFileManager -final class InMemoryJavaFileManager extends ForwardingJavaFileManager { +final class InMemoryJavaFileManager extends ForwardingStandardJavaFileManager { private final LoadingCache inMemoryFileObjects = CacheBuilder.newBuilder().build(new CacheLoader() { @Override @@ -56,7 +55,7 @@ public JavaFileObject load(URI key) { } }); - InMemoryJavaFileManager(JavaFileManager fileManager) { + InMemoryJavaFileManager(StandardJavaFileManager fileManager) { super(fileManager); } diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 774a78e1..87e26fba 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -40,6 +40,7 @@ import com.google.testing.compile.CompilationSubject.DiagnosticOnLine; import com.google.testing.compile.Parser.ParseResult; import com.sun.source.tree.CompilationUnitTree; +import java.io.File; import java.io.IOException; import java.nio.charset.Charset; import java.util.ArrayList; @@ -65,6 +66,7 @@ public final class JavaSourcesSubject implements CompileTester, ProcessedCompileTesterFactory { private final List options = new ArrayList(Arrays.asList("-Xlint")); @Nullable private ClassLoader classLoader; + @Nullable private ImmutableList classPath; JavaSourcesSubject(FailureMetadata failureMetadata, Iterable subject) { super(failureMetadata, subject); @@ -82,12 +84,24 @@ public JavaSourcesSubject withCompilerOptions(String... options) { return this; } + /** + * @deprecated prefer {@link #withClasspath(Iterable)}. This method only supports {@link + * URLClassLoader} and the default system classloader, and {@link File}s are usually a more + * natural way to expression compilation classpaths than class loaders. + */ + @Deprecated @Override public JavaSourcesSubject withClasspathFrom(ClassLoader classLoader) { this.classLoader = classLoader; return this; } + @Override + public JavaSourcesSubject withClasspath(Iterable classPath) { + this.classPath = ImmutableList.copyOf(classPath); + return this; + } + @Override public CompileTester processedWith(Processor first, Processor... rest) { return processedWith(Lists.asList(first, rest)); @@ -312,6 +326,9 @@ private Compilation compilation() { if (classLoader != null) { compiler = compiler.withClasspathFrom(classLoader); } + if (classPath != null) { + compiler = compiler.withClasspath(classPath); + } return compiler.compile(actual()); } } @@ -577,11 +594,22 @@ public JavaSourcesSubject withCompilerOptions(String... options) { return delegate.withCompilerOptions(options); } + /** + * @deprecated prefer {@link #withClasspath(Iterable)}. This method only supports {@link + * URLClassLoader} and the default system classloader, and {@link File}s are usually a more + * natural way to expression compilation classpaths than class loaders. + */ + @Deprecated @Override public JavaSourcesSubject withClasspathFrom(ClassLoader classLoader) { return delegate.withClasspathFrom(classLoader); } + @Override + public JavaSourcesSubject withClasspath(Iterable classPath) { + return delegate.withClasspath(classPath); + } + @Override public CompileTester processedWith(Processor first, Processor... rest) { return delegate.newCompilationClause(Lists.asList(first, rest)); diff --git a/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java b/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java index 50e034fa..737bec45 100644 --- a/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java +++ b/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java @@ -15,6 +15,7 @@ */ package com.google.testing.compile; +import java.io.File; import javax.annotation.CheckReturnValue; import javax.annotation.processing.Processor; @@ -24,34 +25,44 @@ * * @author Gregory Kick */ +@CheckReturnValue public interface ProcessedCompileTesterFactory { /** * Adds options that will be passed to the compiler. {@code -Xlint} is the first option, by * default. */ - @CheckReturnValue ProcessedCompileTesterFactory withCompilerOptions(Iterable options); - + ProcessedCompileTesterFactory withCompilerOptions(Iterable options); + /** * Adds options that will be passed to the compiler. {@code -Xlint} is the first option, by * default. */ - @CheckReturnValue ProcessedCompileTesterFactory withCompilerOptions(String... options); + ProcessedCompileTesterFactory withCompilerOptions(String... options); /** * Attempts to extract the classpath from the classpath of the Classloader argument, including all * its parents up to (and including) the System Classloader. - *

- * If not specified, we will use the System classpath for compilation. + * + *

If not specified, we will use the System classpath for compilation. + * + * @deprecated prefer {@link #withClasspath(Iterable)}. This method only supports {@link + * URLClassLoader} and the default system classloader, and {@link File}s are usually a more + * natural way to expression compilation classpaths than class loaders. */ - @CheckReturnValue + @Deprecated ProcessedCompileTesterFactory withClasspathFrom(ClassLoader classloader); - + + /** + * Sets the compilation classpath. + * + *

If not specified, we will use the System classpath for compilation. + */ + ProcessedCompileTesterFactory withClasspath(Iterable classPath); + /** Adds {@linkplain Processor annotation processors} to the compilation being tested. */ - @CheckReturnValue CompileTester processedWith(Processor first, Processor... rest); /** Adds {@linkplain Processor annotation processors} to the compilation being tested. */ - @CheckReturnValue CompileTester processedWith(Iterable processors); } diff --git a/src/test/java/com/google/testing/compile/CompilerTest.java b/src/test/java/com/google/testing/compile/CompilerTest.java index 381ce182..a76a75bb 100644 --- a/src/test/java/com/google/testing/compile/CompilerTest.java +++ b/src/test/java/com/google/testing/compile/CompilerTest.java @@ -16,13 +16,27 @@ package com.google.testing.compile; import static com.google.common.truth.Truth.assertThat; +import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; +import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; import java.util.Arrays; +import java.util.Locale; import javax.annotation.processing.Processor; +import javax.tools.JavaCompiler; +import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; +import javax.tools.ToolProvider; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -30,6 +44,8 @@ @RunWith(JUnit4.class) public final class CompilerTest { + @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder(); + private static final JavaFileObject HELLO_WORLD = JavaFileObjects.forResource("HelloWorld.java"); @Test @@ -88,4 +104,95 @@ public void multipleProcesors_asIterable() { assertThat(noopProcessor2.invoked).isTrue(); assertThat(noopProcessor3.invoked).isFalse(); } + + @Test + public void classPath_default() { + Compilation compilation = + javac() + .compile( + JavaFileObjects.forSourceLines( + "Test", + "import com.google.testing.compile.CompilerTest;", + "class Test {", + " CompilerTest t;", + "}")); + assertThat(compilation).succeeded(); + } + + @Test + public void classPath_empty() { + Compilation compilation = + javac() + .withClasspath(ImmutableList.of()) + .compile( + JavaFileObjects.forSourceLines( + "Test", + "import com.google.testing.compile.CompilerTest;", + "class Test {", + " CompilerTest t;", + "}")); + assertThat(compilation).hadErrorContaining("com.google.testing.compile does not exist"); + } + + /** Sets up a jar containing a single class 'Lib', for use in classpath tests. */ + private File compileTestLib() throws IOException { + File lib = temporaryFolder.newFolder("tmp"); + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + StandardJavaFileManager fileManager = + compiler.getStandardFileManager(/* diagnosticListener= */ null, Locale.getDefault(), UTF_8); + fileManager.setLocation(StandardLocation.CLASS_OUTPUT, ImmutableList.of(lib)); + CompilationTask task = + compiler.getTask( + /* out= */ null, + fileManager, + /* diagnosticListener= */ null, + /* options= */ ImmutableList.of(), + /* classes= */ null, + ImmutableList.of(JavaFileObjects.forSourceLines("Lib", "class Lib {}"))); + assertThat(task.call()).isTrue(); + return lib; + } + + @Test + public void classPath_customFiles() throws Exception { + File lib = compileTestLib(); + // compile with only 'Lib' on the classpath + Compilation compilation = + javac() + .withClasspath(ImmutableList.of(lib)) + .withOptions("-verbose") + .compile( + JavaFileObjects.forSourceLines( + "Test", // + "class Test {", + " Lib lib;", + "}")); + assertThat(compilation).succeeded(); + } + + @Test + public void classPath_empty_urlClassLoader() { + Compilation compilation = + javac() + .withClasspathFrom(new URLClassLoader(new URL[0], Compiler.platformClassLoader)) + .compile( + JavaFileObjects.forSourceLines( + "Test", + "import com.google.testing.compile.CompilerTest;", + "class Test {", + " CompilerTest t;", + "}")); + assertThat(compilation).hadErrorContaining("com.google.testing.compile does not exist"); + } + + @Test + public void classPath_customFiles_urlClassLoader() throws Exception { + File lib = compileTestLib(); + Compilation compilation = + javac() + .withClasspathFrom(new URLClassLoader(new URL[] {lib.toURI().toURL()})) + .withOptions("-verbose") + .compile(JavaFileObjects.forSourceLines("Test", "class Test {", " Lib lib;", "}")); + assertThat(compilation).succeeded(); + } } From 99aed6329fa99ccf71854caa0e5f95f53096f60c Mon Sep 17 00:00:00 2001 From: cushon Date: Wed, 14 Feb 2018 10:55:07 -0800 Subject: [PATCH 014/300] Add support for --release The flag depends on FileManager support for nio, which was added to the API in 9. RELNOTES=N/A ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=185711608 --- .../ForwardingStandardJavaFileManager.java | 24 +++++++++++++++++++ .../google/testing/compile/CompilerTest.java | 16 +++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java b/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java index c8d49fc9..8e576b03 100644 --- a/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java +++ b/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java @@ -18,7 +18,11 @@ import java.io.File; import java.io.IOException; +import java.lang.reflect.Method; +import java.nio.file.Path; +import java.util.Collection; import javax.tools.ForwardingJavaFileManager; +import javax.tools.JavaFileManager.Location; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; @@ -68,4 +72,24 @@ public void setLocation(Location location, Iterable path) throws public Iterable getLocation(Location location) { return fileManager.getLocation(location); } + + // @Override for JDK 9 only + public void setLocationFromPaths(Location location, Collection searchpath) + throws IOException { + Method setLocationFromPaths; + try { + setLocationFromPaths = + fileManager + .getClass() + .getMethod("setLocationFromPaths", Location.class, Collection.class); + } catch (ReflectiveOperationException e) { + // JDK < 9 + return; + } + try { + setLocationFromPaths.invoke(fileManager, location, searchpath); + } catch (ReflectiveOperationException e) { + throw new LinkageError(e.getMessage(), e); + } + } } diff --git a/src/test/java/com/google/testing/compile/CompilerTest.java b/src/test/java/com/google/testing/compile/CompilerTest.java index a76a75bb..126c719d 100644 --- a/src/test/java/com/google/testing/compile/CompilerTest.java +++ b/src/test/java/com/google/testing/compile/CompilerTest.java @@ -19,6 +19,7 @@ import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.Assume.assumeTrue; import com.google.common.collect.ImmutableList; import java.io.File; @@ -28,6 +29,7 @@ import java.util.Arrays; import java.util.Locale; import javax.annotation.processing.Processor; +import javax.lang.model.SourceVersion; import javax.tools.JavaCompiler; import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject; @@ -195,4 +197,18 @@ public void classPath_customFiles_urlClassLoader() throws Exception { .compile(JavaFileObjects.forSourceLines("Test", "class Test {", " Lib lib;", "}")); assertThat(compilation).succeeded(); } + + @Test + public void releaseFlag() { + assumeTrue(isJdk9OrLater()); + Compilation compilation = + javac() + .withOptions("--release", "8") + .compile(JavaFileObjects.forSourceString("HelloWorld", "final class HelloWorld {}")); + assertThat(compilation).succeeded(); + } + + static boolean isJdk9OrLater() { + return SourceVersion.latestSupported().compareTo(SourceVersion.RELEASE_8) > 0; + } } From fbbf29ec970a5f4c61a5d66bccca048eae35dc3b Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 1 Jun 2018 09:29:40 -0700 Subject: [PATCH 015/300] Update latest version in docs. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=198882730 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e90e9e50..e0858722 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ A library for testing javac compilation with or without annotation processors. S Latest Release -------------- -The latest release is version `0.13`. Include it as a [Maven](http://maven.apache.org/) dependency with the following snippet: +The latest release is version `0.15`. Include it as a [Maven](http://maven.apache.org/) dependency with the following snippet: ``` com.google.testing.compile compile-testing - 0.13 + 0.15 test ``` From 2678c3674c99e83165d80aaae369c00f31ff6c40 Mon Sep 17 00:00:00 2001 From: jlavallee Date: Thu, 19 Jul 2018 12:39:30 -0700 Subject: [PATCH 016/300] Migrate callers of Truth's Subject.failWithRawMessage to Subject.failWithoutActual Requires the use of Guava 25.1 for Strings.lenientFormat and Truth 0.41 for Subject.failWithoutActual RELNOTES: Migrated from Subject.failWithRawMessage to Subject.failWithoutActual ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=205284461 --- pom.xml | 4 +- .../testing/compile/CompilationSubject.java | 47 ++++++---- .../testing/compile/JavaSourcesSubject.java | 93 ++++++++++--------- 3 files changed, 78 insertions(+), 66 deletions(-) diff --git a/pom.xml b/pom.xml index 5ffb83f5..4446da82 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 0.37 + 0.41 http://github.com/google/compile-testing @@ -65,7 +65,7 @@ com.google.guava guava - 23.6-jre + 25.1-jre com.google.code.findbugs diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 56fc4cfe..6d610603 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -19,6 +19,7 @@ import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Iterables.size; import static com.google.common.collect.Streams.mapWithIndex; +import static com.google.common.truth.Fact.simpleFact; import static com.google.common.truth.Truth.assertAbout; import static com.google.testing.compile.Compilation.Status.FAILURE; import static com.google.testing.compile.Compilation.Status.SUCCESS; @@ -76,8 +77,9 @@ public static CompilationSubject assertThat(Compilation actual) { /** Asserts that the compilation succeeded. */ public void succeeded() { if (actual().status().equals(FAILURE)) { - failWithRawMessage( - actual().describeFailureDiagnostics() + actual().describeGeneratedSourceFiles()); + failWithoutActual( + simpleFact( + actual().describeFailureDiagnostics() + actual().describeGeneratedSourceFiles())); } } @@ -90,9 +92,10 @@ public void succeededWithoutWarnings() { /** Asserts that the compilation failed. */ public void failed() { if (actual().status().equals(SUCCESS)) { - failWithRawMessage( - "Compilation was expected to fail, but contained no errors.\n\n" - + actual().describeGeneratedSourceFiles()); + failWithoutActual( + simpleFact( + "Compilation was expected to fail, but contained no errors.\n\n" + + actual().describeGeneratedSourceFiles())); } } @@ -171,14 +174,15 @@ private void checkDiagnosticCount( actual().diagnosticsOfKind(kind, more); int actualCount = size(diagnostics); if (actualCount != expectedCount) { - failWithRawMessage( - messageListing( - diagnostics, - "Expected %d %s, but found the following %d %s:", - expectedCount, - kindPlural(kind), - actualCount, - kindPlural(kind))); + failWithoutActual( + simpleFact( + messageListing( + diagnostics, + "Expected %d %s, but found the following %d %s:", + expectedCount, + kindPlural(kind), + actualCount, + kindPlural(kind)))); } } @@ -283,8 +287,10 @@ private ImmutableList> findMatchingDiagnost .filter(diagnostic -> expectedPattern.matcher(diagnostic.getMessage(null)).find()) .collect(toImmutableList()); if (diagnosticsWithMessage.isEmpty()) { - failWithRawMessage( - messageListing(diagnosticsOfKind, "Expected %s, but only found:", expectedDiagnostic)); + failWithoutActual( + simpleFact( + messageListing( + diagnosticsOfKind, "Expected %s, but only found:", expectedDiagnostic))); } return diagnosticsWithMessage; } @@ -375,11 +381,12 @@ Stream mapDiagnostics(Function processors) { @Override public void parsesAs(JavaFileObject first, JavaFileObject... rest) { if (Iterables.isEmpty(actual())) { - failWithRawMessage( - "Compilation generated no additional source files, though some were expected."); + failWithoutActual( + simpleFact( + "Compilation generated no additional source files, though some were expected.")); return; } ParseResult actualResult = Parser.parse(actual()); @@ -163,7 +165,7 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { message.append('\n'); message.append(error); } - failWithRawMessage(message.toString()); + failWithoutActual(simpleFact(message.toString())); return; } final ParseResult expectedResult = Parser.parse(Lists.asList(first, rest)); @@ -246,51 +248,54 @@ public String apply(CompilationUnitTree generated) { } }) .toList()); - failWithRawMessage( - Joiner.on('\n') - .join( - "", - "An expected source declared one or more top-level types that were not present.", - "", - String.format("Expected top-level types: <%s>", expectedTypes), - String.format( - "Declared by expected file: <%s>", - expectedTree.getSourceFile().toUri().getPath()), - "", - "The top-level types that were present are as follows: ", - "", - generatedTypesReport, - "")); + failWithoutActual( + simpleFact( + Joiner.on('\n') + .join( + "", + "An expected source declared one or more top-level types that were not " + + "present.", + "", + String.format("Expected top-level types: <%s>", expectedTypes), + String.format( + "Declared by expected file: <%s>", + expectedTree.getSourceFile().toUri().getPath()), + "", + "The top-level types that were present are as follows: ", + "", + generatedTypesReport, + ""))); } /** Called when the {@code generatesSources()} verb fails with a diff candidate. */ private void failWithCandidate( JavaFileObject expectedSource, JavaFileObject actualSource, String diffReport) { try { - failWithRawMessage( - Joiner.on('\n') - .join( - "", - "Source declared the same top-level types of an expected source, but", - "didn't match exactly.", - "", - String.format("Expected file: <%s>", expectedSource.toUri().getPath()), - String.format("Actual file: <%s>", actualSource.toUri().getPath()), - "", - "Diffs:", - "======", - "", - diffReport, - "", - "Expected Source: ", - "================", - "", - expectedSource.getCharContent(false).toString(), - "", - "Actual Source:", - "=================", - "", - actualSource.getCharContent(false).toString())); + failWithoutActual( + simpleFact( + Joiner.on('\n') + .join( + "", + "Source declared the same top-level types of an expected source, but", + "didn't match exactly.", + "", + String.format("Expected file: <%s>", expectedSource.toUri().getPath()), + String.format("Actual file: <%s>", actualSource.toUri().getPath()), + "", + "Diffs:", + "======", + "", + diffReport, + "", + "Expected Source: ", + "================", + "", + expectedSource.getCharContent(false).toString(), + "", + "Actual Source:", + "=================", + "", + actualSource.getCharContent(false).toString()))); } catch (IOException e) { throw new IllegalStateException( "Couldn't read from JavaFileObject when it was already " + "in memory.", e); @@ -471,8 +476,8 @@ public T generatesSources(JavaFileObject first, JavaFileObject... rest) { public T generatesFiles(JavaFileObject first, JavaFileObject... rest) { for (JavaFileObject expected : Lists.asList(first, rest)) { if (!wasGenerated(expected)) { - failWithRawMessage( - "Did not find a generated file corresponding to " + expected.getName()); + failWithoutActual( + simpleFact("Did not find a generated file corresponding to " + expected.getName())); } } return thisObject(); From 43a513ab14a5b4ab5810a13e14d8cb763546ab5d Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 14 Aug 2018 13:38:57 -0700 Subject: [PATCH 017/300] Truth dependency hygiene: - Bump Truth version to https://github.com/google/truth/releases/tag/release_0_42 (which mainly just improves Truth's own dependencies). - Move Java 8 Truth extensions to test scope. They're used only from CompilationTest. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=208703663 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4446da82..979f423f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 0.41 + 0.42 http://github.com/google/compile-testing @@ -61,6 +61,7 @@ com.google.truth.extensions truth-java8-extension ${truth.version} + test com.google.guava From acf6ae797507398ed75ba0973a2e661718f60f43 Mon Sep 17 00:00:00 2001 From: dpb Date: Mon, 3 Dec 2018 14:24:26 -0800 Subject: [PATCH 018/300] Make ForwardingStandardJavaFileManager public. RELNOTES=Make `ForwardingStandardJavaFileManager` public. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=223862220 --- .../testing/compile/ForwardingStandardJavaFileManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java b/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java index 8e576b03..9b612b9f 100644 --- a/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java +++ b/src/main/java/com/google/testing/compile/ForwardingStandardJavaFileManager.java @@ -30,15 +30,15 @@ * Forwards calls to a given {@link StandardJavaFileManager}. Subclasses of this class might * override some of these methods and might also provide additional fields and methods. */ -class ForwardingStandardJavaFileManager extends ForwardingJavaFileManager - implements StandardJavaFileManager { +public class ForwardingStandardJavaFileManager + extends ForwardingJavaFileManager implements StandardJavaFileManager { /** * Creates a new instance of ForwardingStandardJavaFileManager. * * @param fileManager delegate to this file manager */ - ForwardingStandardJavaFileManager(StandardJavaFileManager fileManager) { + protected ForwardingStandardJavaFileManager(StandardJavaFileManager fileManager) { super(fileManager); } From 7d31b533855942490e2065f720d484cd9c0d9c2f Mon Sep 17 00:00:00 2001 From: erichang Date: Thu, 13 Dec 2018 12:54:56 -0800 Subject: [PATCH 019/300] Print out warnings as well as errors in describeFailureDiagnostics. RELNOTES=`CompilationSubject.succeeded()` now shows warnings as well as errors on failure. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=225420368 --- .../google/testing/compile/Compilation.java | 14 +++++------- .../compile/CompilationSubjectTest.java | 22 +++++++++++++++++-- .../JavaSourcesSubjectFactoryTest.java | 4 ++-- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/google/testing/compile/Compilation.java b/src/main/java/com/google/testing/compile/Compilation.java index 1893b0cc..68881c45 100644 --- a/src/main/java/com/google/testing/compile/Compilation.java +++ b/src/main/java/com/google/testing/compile/Compilation.java @@ -220,16 +220,12 @@ public String toString() { /** Returns a description of the why the compilation failed. */ String describeFailureDiagnostics() { - ImmutableList> errors = errors(); - if (errors.isEmpty()) { - return "Compilation produced no errors.\n"; - } - StringBuilder message = new StringBuilder("Compilation produced the following errors:\n"); - errors.stream().forEach(error -> message.append(error).append('\n')); - // If we compiled with -Werror we should output the warnings too - if (compiler.options().contains("-Werror")) { - warnings().stream().forEach(warning -> message.append(warning).append('\n')); + ImmutableList> diagnostics = diagnostics(); + if (diagnostics.isEmpty()) { + return "Compilation produced no diagnostics.\n"; } + StringBuilder message = new StringBuilder("Compilation produced the following diagnostics:\n"); + diagnostics.forEach(diagnostic -> message.append(diagnostic).append('\n')); return message.toString(); } diff --git a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java index 765dc0f7..871975de 100644 --- a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java +++ b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java @@ -99,7 +99,8 @@ public void succeeded_failureReportsGeneratedFiles() { .that(compilerWithGeneratorAndError().compile(HELLO_WORLD_RESOURCE)) .succeeded(); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).contains("Compilation produced the following errors:\n"); + assertThat(expected.getMessage()).contains( + "Compilation produced the following diagnostics:\n"); assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_CLASS_NAME); assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_SOURCE); } @@ -112,7 +113,8 @@ public void succeeded_failureReportsNoGeneratedFiles() { .that(javac().compile(HELLO_WORLD_BROKEN_RESOURCE)) .succeeded(); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).startsWith("Compilation produced the following errors:\n"); + assertThat(expected.getMessage()).startsWith( + "Compilation produced the following diagnostics:\n"); assertThat(expected.getMessage()).contains("No files were generated."); } @@ -132,6 +134,22 @@ public void succeeded_exceptionCreatedOrPassedThrough() { } } + @Test + public void succeeded_failureReportsWarnings() { + expectFailure + .whenTesting() + .about(compilations()) + .that(compilerWithWarning().compile(HELLO_WORLD_BROKEN)) + .succeeded(); + AssertionError expected = expectFailure.getFailure(); + assertThat(expected.getMessage()) + .startsWith("Compilation produced the following diagnostics:\n"); + assertThat(expected.getMessage()).contains("No files were generated."); + // "this is a message" is output by compilerWithWarning() since the source has + // @DiagnosticMessage + assertThat(expected.getMessage()).contains("warning: this is a message"); + } + @Test public void succeededWithoutWarnings() { assertThat(javac().compile(HELLO_WORLD)).succeededWithoutWarnings(); diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java index 92fdfdcd..29e9d16a 100644 --- a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java +++ b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java @@ -337,7 +337,7 @@ public void compilesWithoutError_failureReportsFiles() { .processedWith(new FailingGeneratingProcessor()) .compilesWithoutError(); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).contains("Compilation produced the following errors:\n"); + assertThat(expected.getMessage()).contains("Compilation produced the following diagnostics:\n"); assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_CLASS_NAME); assertThat(expected.getMessage()).contains(FailingGeneratingProcessor.GENERATED_SOURCE); } @@ -350,7 +350,7 @@ public void compilesWithoutError_throws() { .that(JavaFileObjects.forResource("HelloWorld-broken.java")) .compilesWithoutError(); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).startsWith("Compilation produced the following errors:\n"); + assertThat(expected.getMessage()).startsWith("Compilation produced the following diagnostics:\n"); assertThat(expected.getMessage()).contains("No files were generated."); } From 1093f736b0a8f51ea21e441fbd89d16e78176811 Mon Sep 17 00:00:00 2001 From: ronshapiro Date: Thu, 28 Mar 2019 14:00:34 -0700 Subject: [PATCH 020/300] Update dependency versions ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=240846927 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 979f423f..bc4341f2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 0.42 + 0.43 http://github.com/google/compile-testing @@ -66,7 +66,7 @@ com.google.guava guava - 25.1-jre + 27.1-jre com.google.code.findbugs @@ -77,7 +77,7 @@ com.google.errorprone error_prone_annotations - 2.2.0 + 2.3.3 provided From 3f1f22201d9cd0a2f1d5b3255e5787645f098d5c Mon Sep 17 00:00:00 2001 From: cpovirk Date: Sat, 20 Apr 2019 14:51:09 -0700 Subject: [PATCH 021/300] Migrate Truth subjects from the old fail(String, Object) to the new failWithActual(String, Object), tweaking verbs for the new grammar. Before: fail("has foo", expected); After: failWithActual("expected to have foo", expected); ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=244518456 --- .../com/google/testing/compile/JavaFileObjectSubject.java | 4 ++-- .../testing/compile/JavaSourcesSubjectFactoryTest.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index 677b937c..0a136984 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -74,7 +74,7 @@ public void isEqualTo(@Nullable Object other) { JavaFileObject otherFile = (JavaFileObject) other; try { if (!asByteSource(actual()).contentEquals(asByteSource(otherFile))) { - fail("is equal to", other); + failWithActual("expected to be equal to", other); } } catch (IOException e) { throw new RuntimeException(e); @@ -85,7 +85,7 @@ public void isEqualTo(@Nullable Object other) { public void hasContents(ByteSource expected) { try { if (!asByteSource(actual()).contentEquals(expected)) { - fail("has contents", expected); + failWithActual("expected to have contents", expected); } } catch (IOException e) { throw new RuntimeException(e); diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java index 29e9d16a..ec202236 100644 --- a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java +++ b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java @@ -350,7 +350,8 @@ public void compilesWithoutError_throws() { .that(JavaFileObjects.forResource("HelloWorld-broken.java")) .compilesWithoutError(); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).startsWith("Compilation produced the following diagnostics:\n"); + assertThat(expected.getMessage()).startsWith("Compilation produced the following" + + " diagnostics:\n"); assertThat(expected.getMessage()).contains("No files were generated."); } @@ -883,7 +884,7 @@ public void generatesFileNamed_failOnFileContents() { .withContents(ByteSource.wrap("Bogus".getBytes(UTF_8))); AssertionError expected = expectFailure.getFailure(); assertThat(expected.getMessage()).contains("Foo"); - assertThat(expected.getMessage()).contains(" has contents "); + assertThat(expected.getMessage()).contains(" have contents"); } @Test From 2f978485400d1bff806dd007d0226194b8f85217 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 23 Apr 2019 10:13:18 -0700 Subject: [PATCH 022/300] Update to Truth 0.44. This is necessary for some forthcoming changes that migrate to methods introduced in that version: https://github.com/google/truth/releases/tag/release_0_44 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=244875785 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc4341f2..dbf6fe3f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 0.43 + 0.44 http://github.com/google/compile-testing From 0f4e551ae4c9124ad937037edc478195b0b8700c Mon Sep 17 00:00:00 2001 From: cpovirk Date: Wed, 24 Apr 2019 12:42:10 -0700 Subject: [PATCH 023/300] Fix Javadoc links. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=245096478 --- .../com/google/testing/compile/JavaSourcesSubject.java | 8 ++++---- .../testing/compile/ProcessedCompileTesterFactory.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index ed2bbd39..027f612d 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -87,8 +87,8 @@ public JavaSourcesSubject withCompilerOptions(String... options) { /** * @deprecated prefer {@link #withClasspath(Iterable)}. This method only supports {@link - * URLClassLoader} and the default system classloader, and {@link File}s are usually a more - * natural way to expression compilation classpaths than class loaders. + * java.net.URLClassLoader} and the default system classloader, and {@link File}s are usually + * a more natural way to expression compilation classpaths than class loaders. */ @Deprecated @Override @@ -601,8 +601,8 @@ public JavaSourcesSubject withCompilerOptions(String... options) { /** * @deprecated prefer {@link #withClasspath(Iterable)}. This method only supports {@link - * URLClassLoader} and the default system classloader, and {@link File}s are usually a more - * natural way to expression compilation classpaths than class loaders. + * java.net.URLClassLoader} and the default system classloader, and {@link File}s are + * usually a more natural way to expression compilation classpaths than class loaders. */ @Deprecated @Override diff --git a/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java b/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java index 737bec45..7082656f 100644 --- a/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java +++ b/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java @@ -47,8 +47,8 @@ public interface ProcessedCompileTesterFactory { *

If not specified, we will use the System classpath for compilation. * * @deprecated prefer {@link #withClasspath(Iterable)}. This method only supports {@link - * URLClassLoader} and the default system classloader, and {@link File}s are usually a more - * natural way to expression compilation classpaths than class loaders. + * java.net.URLClassLoader} and the default system classloader, and {@link File}s are usually + * a more natural way to expression compilation classpaths than class loaders. */ @Deprecated ProcessedCompileTesterFactory withClasspathFrom(ClassLoader classloader); @@ -60,9 +60,9 @@ public interface ProcessedCompileTesterFactory { */ ProcessedCompileTesterFactory withClasspath(Iterable classPath); - /** Adds {@linkplain Processor annotation processors} to the compilation being tested. */ + /** Adds {@linkplain Processor annotation processors} to the compilation being tested. */ CompileTester processedWith(Processor first, Processor... rest); - /** Adds {@linkplain Processor annotation processors} to the compilation being tested. */ + /** Adds {@linkplain Processor annotation processors} to the compilation being tested. */ CompileTester processedWith(Iterable processors); } From 0839d26dad97d228d7f37c03e6c1e1f3bf6ca188 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 29 Apr 2019 06:56:30 -0700 Subject: [PATCH 024/300] Update docs to show latest version of Compile-Testing. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=245738260 --- README.md | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index e0858722..ad4d652c 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,9 @@ Compile Testing =============== -A library for testing javac compilation with or without annotation processors. See the [javadoc][package-info] for usage examples. - -Latest Release --------------- +[![Maven Release][maven-shield]][maven-link] -The latest release is version `0.15`. Include it as a [Maven](http://maven.apache.org/) dependency with the following snippet: - -``` - - com.google.testing.compile - compile-testing - 0.15 - test - -``` +A library for testing javac compilation with or without annotation processors. See the [javadoc][package-info] for usage examples. License ------- @@ -35,3 +23,5 @@ License limitations under the License. [package-info]: https://github.com/google/compile-testing/blob/master/src/main/java/com/google/testing/compile/package-info.java +[maven-shield]: https://img.shields.io/maven-central/v/com.google.testing.compile/compile-testing.png +[maven-link]: https://search.maven.org/artifact/com.google.testing.compile/compile-testing From 20f6d44299529a824a522933a4ffdfc7d8d88d9c Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 29 Apr 2019 06:57:04 -0700 Subject: [PATCH 025/300] Migrate from assertThat(foo).named("foo") to assertWithMessage("foo").that(foo). (The exact change is slightly different in some cases, like when using custom subjects or check(), but it's always a migration from named(...) to [assert]WithMessage(...).) named(...) is being removed. This CL may slightly modify the failure messages produced, but all the old information will still be present. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=245738312 --- .../com/google/testing/compile/JavaFileObjectSubject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index 0a136984..5cc9d5d8 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -99,8 +99,8 @@ public void hasContents(ByteSource expected) { public StringSubject contentsAsString(Charset charset) { try { return check() - .that(JavaFileObjects.asByteSource(actual()).asCharSource(charset).read()) - .named("the contents of " + actualAsString()); + .withMessage("the contents of " + actualAsString()) + .that(JavaFileObjects.asByteSource(actual()).asCharSource(charset).read()); } catch (IOException e) { throw new RuntimeException(e); } From 6b329011414723b425ec96b2aa226b072a1efc4d Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 3 May 2019 13:49:51 -0700 Subject: [PATCH 026/300] Migrate Truth Subjects from no-arg check() to the overload that accepts a description. The overload that accepts a description generally produces better failure messages: - The first line of the message it produces is something like: "value of: myProto.getResponse()" (where "getResponse()" is taken from the provided description) - The last line of the message it produces is something like: "myProto was: response: query was throttled" (the full value of myProto) - And the existing text goes in between. Additional motivation: We are deleting the no-arg overload externally (and probably internally thereafter). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=246566785 --- .../testing/compile/CompilationSubject.java | 5 ++- .../compile/JavaFileObjectSubject.java | 3 +- .../testing/compile/JavaSourcesSubject.java | 44 ++++++++++++++----- .../compile/JavaFileObjectSubjectTest.java | 8 ++-- .../JavaSourcesSubjectFactoryTest.java | 27 ++++++------ 5 files changed, 54 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 6d610603..6e31be3a 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -331,9 +331,10 @@ public JavaFileObjectSubject generatedSourceFile(String qualifiedName) { private JavaFileObjectSubject checkGeneratedFile( Optional generatedFile, Location location, String format, Object... args) { + String name = args.length == 0 ? format : String.format(format, args); if (!generatedFile.isPresent()) { StringBuilder builder = new StringBuilder("generated the file "); - builder.append(args.length == 0 ? format : String.format(format, args)); + builder.append(name); builder.append("; it generated:\n"); for (JavaFileObject generated : actual().generatedFiles()) { if (generated.toUri().getPath().contains(location.getName())) { @@ -343,7 +344,7 @@ private JavaFileObjectSubject checkGeneratedFile( fail(builder.toString()); return ignoreCheck().about(javaFileObjects()).that(ALREADY_FAILED); } - return check().about(javaFileObjects()).that(generatedFile.get()); + return check("generatedFile(%s)", name).about(javaFileObjects()).that(generatedFile.get()); } private static Collector> toImmutableList() { diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index 5cc9d5d8..292c9a7b 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -98,8 +98,7 @@ public void hasContents(ByteSource expected) { */ public StringSubject contentsAsString(Charset charset) { try { - return check() - .withMessage("the contents of " + actualAsString()) + return check("contents()") .that(JavaFileObjects.asByteSource(actual()).asCharSource(charset).read()); } catch (IOException e) { throw new RuntimeException(e); diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 027f612d..07aa9bce 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -306,7 +306,7 @@ private void failWithCandidate( @Override public SuccessfulCompilationClause compilesWithoutError() { Compilation compilation = compilation(); - check().about(compilations()).that(compilation).succeeded(); + check("compilation()").about(compilations()).that(compilation).succeeded(); return new SuccessfulCompilationBuilder(compilation); } @@ -314,7 +314,7 @@ public SuccessfulCompilationClause compilesWithoutError() { @Override public CleanCompilationClause compilesWithoutWarnings() { Compilation compilation = compilation(); - check().about(compilations()).that(compilation).succeededWithoutWarnings(); + check("compilation()").about(compilations()).that(compilation).succeededWithoutWarnings(); return new CleanCompilationBuilder(compilation); } @@ -322,7 +322,7 @@ public CleanCompilationClause compilesWithoutWarnings() { @Override public UnsuccessfulCompilationClause failsToCompile() { Compilation compilation = compilation(); - check().about(compilations()).that(compilation).failed(); + check("compilation()").about(compilations()).that(compilation).failed(); return new UnsuccessfulCompilationBuilder(compilation); } @@ -362,7 +362,7 @@ protected CompilationWithWarningsBuilder(Compilation compilation) { @CanIgnoreReturnValue @Override public T withNoteCount(int noteCount) { - check().about(compilations()).that(compilation).hadNoteCount(noteCount); + check("compilation()").about(compilations()).that(compilation).hadNoteCount(noteCount); return thisObject(); } @@ -370,13 +370,16 @@ public T withNoteCount(int noteCount) { @Override public FileClause withNoteContaining(String messageFragment) { return new FileBuilder( - check().about(compilations()).that(compilation).hadNoteContaining(messageFragment)); + check("compilation()") + .about(compilations()) + .that(compilation) + .hadNoteContaining(messageFragment)); } @CanIgnoreReturnValue @Override public T withWarningCount(int warningCount) { - check().about(compilations()).that(compilation).hadWarningCount(warningCount); + check("compilation()").about(compilations()).that(compilation).hadWarningCount(warningCount); return thisObject(); } @@ -384,19 +387,25 @@ public T withWarningCount(int warningCount) { @Override public FileClause withWarningContaining(String messageFragment) { return new FileBuilder( - check().about(compilations()).that(compilation).hadWarningContaining(messageFragment)); + check("compilation()") + .about(compilations()) + .that(compilation) + .hadWarningContaining(messageFragment)); } @CanIgnoreReturnValue public T withErrorCount(int errorCount) { - check().about(compilations()).that(compilation).hadErrorCount(errorCount); + check("compilation()").about(compilations()).that(compilation).hadErrorCount(errorCount); return thisObject(); } @CanIgnoreReturnValue public FileClause withErrorContaining(String messageFragment) { return new FileBuilder( - check().about(compilations()).that(compilation).hadErrorContaining(messageFragment)); + check("compilation()") + .about(compilations()) + .that(compilation) + .hadErrorContaining(messageFragment)); } /** Returns this object, cast to {@code T}. */ @@ -466,7 +475,9 @@ protected GeneratedCompilationBuilder(Compilation compilation) { @CanIgnoreReturnValue @Override public T generatesSources(JavaFileObject first, JavaFileObject... rest) { - check().about(javaSources()).that(compilation.generatedSourceFiles()) + check("generatedSourceFiles()") + .about(javaSources()) + .that(compilation.generatedSourceFiles()) .parsesAs(first, rest); return thisObject(); } @@ -503,7 +514,7 @@ boolean wasGenerated(JavaFileObject expected) { public SuccessfulFileClause generatesFileNamed( JavaFileManager.Location location, String packageName, String relativeName) { final JavaFileObjectSubject javaFileObjectSubject = - check() + check("compilation()") .about(compilations()) .that(compilation) .generatedFile(location, packageName, relativeName); @@ -586,7 +597,16 @@ public static final class SingleSourceAdapter extends Subject Date: Wed, 8 May 2019 08:23:41 -0700 Subject: [PATCH 027/300] Migrate users from the old, deprecated Subject.fail* methods to the new Subject.fail* methods or, in some cases, to Subject.check. Most of the changes in this CL were made manually. I've tried to preserve all information, but the format and grammar of the messages does change. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=247216731 --- .../testing/compile/CompilationSubject.java | 29 +++++++-------- .../compile/JavaFileObjectSubject.java | 35 ++++++------------- .../compile/CompilationSubjectTest.java | 20 ++++++----- .../compile/JavaFileObjectSubjectTest.java | 12 +++---- .../JavaSourcesSubjectFactoryTest.java | 5 ++- 5 files changed, 45 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 6e31be3a..fab107eb 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -19,6 +19,7 @@ import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Iterables.size; import static com.google.common.collect.Streams.mapWithIndex; +import static com.google.common.truth.Fact.fact; import static com.google.common.truth.Fact.simpleFact; import static com.google.common.truth.Truth.assertAbout; import static com.google.testing.compile.Compilation.Status.FAILURE; @@ -36,6 +37,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import com.google.common.truth.Fact; import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import com.google.common.truth.Truth; @@ -302,14 +304,8 @@ private ImmutableList> findMatchingDiagnost @CanIgnoreReturnValue public JavaFileObjectSubject generatedFile( Location location, String packageName, String fileName) { - return checkGeneratedFile( - actual().generatedFile(location, packageName, fileName), - location, - "named \"%s\" in %s", - fileName, - packageName.isEmpty() - ? "the default package" - : String.format("package \"%s\"", packageName)); + String path = packageName.isEmpty() ? fileName : packageName.replace('.', '/') + '/' + fileName; + return generatedFile(location, path); } /** Asserts that compilation generated a file at {@code path}. */ @@ -330,21 +326,22 @@ public JavaFileObjectSubject generatedSourceFile(String qualifiedName) { "compile.Failure", "package compile;", "", "final class Failure {}"); private JavaFileObjectSubject checkGeneratedFile( - Optional generatedFile, Location location, String format, Object... args) { - String name = args.length == 0 ? format : String.format(format, args); + Optional generatedFile, Location location, String path) { if (!generatedFile.isPresent()) { - StringBuilder builder = new StringBuilder("generated the file "); - builder.append(name); - builder.append("; it generated:\n"); + // TODO(b/132162475): Use Facts if it becomes public API. + ImmutableList.Builder facts = ImmutableList.builder(); + facts.add(fact("in location", location.getName())); + facts.add(simpleFact("it generated:")); for (JavaFileObject generated : actual().generatedFiles()) { if (generated.toUri().getPath().contains(location.getName())) { - builder.append(" ").append(generated.toUri().getPath()).append('\n'); + facts.add(simpleFact(" " + generated.toUri().getPath())); } } - fail(builder.toString()); + failWithoutActual( + fact("expected to generate file", "/" + path), facts.build().toArray(new Fact[0])); return ignoreCheck().about(javaFileObjects()).that(ALREADY_FAILED); } - return check("generatedFile(%s)", name).about(javaFileObjects()).that(generatedFile.get()); + return check("generatedFile(/%s)", path).about(javaFileObjects()).that(generatedFile.get()); } private static Collector> toImmutableList() { diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index 292c9a7b..04bb0d51 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -16,13 +16,13 @@ package com.google.testing.compile; import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.truth.Fact.fact; import static com.google.common.truth.Truth.assertAbout; import static com.google.testing.compile.JavaFileObjects.asByteSource; import static com.google.testing.compile.TreeDiffer.diffCompilationUnits; import static com.google.testing.compile.TreeDiffer.matchCompilationUnits; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.io.ByteSource; import com.google.common.truth.FailureMetadata; @@ -121,8 +121,8 @@ public StringSubject contentsAsUtf8String() { public void hasSourceEquivalentTo(JavaFileObject expectedSource) { performTreeDifference( expectedSource, - "is equivalent to", - "Expected Source", + "expected to be equivalent to", + "expected", (expectedResult, actualResult) -> diffCompilationUnits( getOnlyElement(expectedResult.compilationUnits()), @@ -151,8 +151,8 @@ public void hasSourceEquivalentTo(JavaFileObject expectedSource) { public void containsElementsIn(JavaFileObject expectedPattern) { performTreeDifference( expectedPattern, - "contains elements in", - "Expected Pattern", + "expected to contain elements in", + "expected pattern", (expectedResult, actualResult) -> matchCompilationUnits( getOnlyElement(expectedResult.compilationUnits()), @@ -180,25 +180,12 @@ private void performTreeDifference( new TreeContext(expectedTree, expectedResult.trees()), new TreeContext(actualTree, actualResult.trees())); try { - fail( - Joiner.on('\n') - .join( - String.format("%s <%s>.", failureVerb, expected.toUri().getPath()), - "", - "Diffs:", - "======", - "", - diffReport, - "", - expectedTitle + ":", - "================", - "", - expected.getCharContent(false), - "", - "Actual Source:", - "==============", - "", - actual().getCharContent(false))); + failWithoutActual( + fact("for file", actual().toUri().getPath()), + fact(failureVerb, expected.toUri().getPath()), + fact("diff", diffReport), + fact(expectedTitle, expected.getCharContent(false)), + fact("but was", actual().getCharContent(false))); } catch (IOException e) { throw new IllegalStateException( "Couldn't read from JavaFileObject when it was already in memory.", e); diff --git a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java index 871975de..706ede87 100644 --- a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java +++ b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java @@ -15,6 +15,7 @@ */ package com.google.testing.compile; +import static com.google.common.truth.ExpectFailure.assertThat; import static com.google.common.truth.Truth.assertThat; import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.CompilationSubject.compilations; @@ -796,7 +797,9 @@ public void generatedSourceFile_fail() { .that(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) .generatedSourceFile("ThisIsNotTheRightFile"); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).contains("generated the file ThisIsNotTheRightFile.java"); + assertThat(expected) + .factValue("expected to generate file") + .isEqualTo("/ThisIsNotTheRightFile.java"); assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); } @@ -815,8 +818,9 @@ public void generatedFilePath_fail() { .that(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) .generatedFile(CLASS_OUTPUT, "com/google/testing/compile/Bogus.class"); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()) - .contains("generated the file com/google/testing/compile/Bogus.class"); + assertThat(expected) + .factValue("expected to generate file") + .isEqualTo("/com/google/testing/compile/Bogus.class"); } @Test @@ -834,10 +838,9 @@ public void generatedFilePackageFile_fail() { .that(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) .generatedFile(CLASS_OUTPUT, "com.google.testing.compile", "Bogus.class"); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()) - .contains( - "generated the file named \"Bogus.class\" " - + "in package \"com.google.testing.compile\""); + assertThat(expected) + .factValue("expected to generate file") + .isEqualTo("/com/google/testing/compile/Bogus.class"); } @Test @@ -848,8 +851,7 @@ public void generatedFileDefaultPackageFile_fail() { .that(compilerWithGenerator().compile(HELLO_WORLD_RESOURCE)) .generatedFile(CLASS_OUTPUT, "", "File.java"); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()) - .contains("generated the file named \"File.java\" in the default package"); + assertThat(expected).factValue("expected to generate file").isEqualTo("/File.java"); assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_CLASS_NAME); } } diff --git a/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java b/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java index 9bfc001e..485c84f5 100644 --- a/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java +++ b/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java @@ -119,9 +119,9 @@ public void hasSourceEquivalentTo_failOnDifferences() throws IOException { .that(CLASS) .hasSourceEquivalentTo(DIFFERENT_NAME); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).contains("is equivalent to"); + assertThat(expected).factKeys().contains("expected to be equivalent to"); assertThat(expected.getMessage()).contains(CLASS.getName()); - assertThat(expected.getMessage()).contains(CLASS.getCharContent(false)); + assertThat(expected).factValue("but was").isEqualTo(CLASS.getCharContent(false)); } @Test @@ -132,10 +132,10 @@ public void hasSourceEquivalentTo_failOnExtraInExpected() throws IOException { .that(CLASS) .hasSourceEquivalentTo(CLASS_WITH_FIELD); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).contains("is equivalent to"); + assertThat(expected).factKeys().contains("expected to be equivalent to"); assertThat(expected.getMessage()).contains("unmatched nodes in the expected tree"); assertThat(expected.getMessage()).contains(CLASS.getName()); - assertThat(expected.getMessage()).contains(CLASS.getCharContent(false)); + assertThat(expected).factValue("but was").isEqualTo(CLASS.getCharContent(false)); } @Test @@ -146,10 +146,10 @@ public void hasSourceEquivalentTo_failOnExtraInActual() throws IOException { .that(CLASS_WITH_FIELD) .hasSourceEquivalentTo(CLASS); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).contains("is equivalent to"); + assertThat(expected).factKeys().contains("expected to be equivalent to"); assertThat(expected.getMessage()).contains("unmatched nodes in the actual tree"); assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getName()); - assertThat(expected.getMessage()).contains(CLASS_WITH_FIELD.getCharContent(false)); + assertThat(expected).factValue("but was").isEqualTo(CLASS_WITH_FIELD.getCharContent(false)); } private static final JavaFileObject SAMPLE_ACTUAL_FILE_FOR_MATCHING = diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java index 57182405..114a5c29 100644 --- a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java +++ b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java @@ -15,6 +15,7 @@ */ package com.google.testing.compile; +import static com.google.common.truth.ExpectFailure.assertThat; import static com.google.common.truth.Truth.assertAbout; import static com.google.common.truth.Truth.assertThat; import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource; @@ -868,7 +869,9 @@ public void generatesFileNamed_failOnFileExistence() { .generatesFileNamed(CLASS_OUTPUT, "com.google.testing.compile", "Bogus") .withContents(ByteSource.wrap("Bar".getBytes(UTF_8))); AssertionError expected = expectFailure.getFailure(); - assertThat(expected.getMessage()).contains("generated the file named \"Bogus\""); + assertThat(expected) + .factValue("expected to generate file") + .isEqualTo("/com/google/testing/compile/Bogus"); assertThat(expected.getMessage()).contains(GeneratingProcessor.GENERATED_RESOURCE_NAME); } From 38f6d0c1e4519521fbccfb871cf1e796747a5cba Mon Sep 17 00:00:00 2001 From: cpovirk Date: Thu, 9 May 2019 06:40:56 -0700 Subject: [PATCH 028/300] Instead of calling Subject.actual(), store the actual value in a field, and read that. actual() is being removed. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=247414505 --- .../testing/compile/CompilationSubject.java | 20 ++++++++++--------- .../compile/JavaFileObjectSubject.java | 17 +++++++++------- .../testing/compile/JavaSourcesSubject.java | 8 +++++--- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index fab107eb..65610af1 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -72,16 +72,18 @@ public static CompilationSubject assertThat(Compilation actual) { return assertAbout(compilations()).that(actual); } + private final Compilation actual; + CompilationSubject(FailureMetadata failureMetadata, Compilation actual) { super(failureMetadata, actual); + this.actual = actual; } /** Asserts that the compilation succeeded. */ public void succeeded() { - if (actual().status().equals(FAILURE)) { + if (actual.status().equals(FAILURE)) { failWithoutActual( - simpleFact( - actual().describeFailureDiagnostics() + actual().describeGeneratedSourceFiles())); + simpleFact(actual.describeFailureDiagnostics() + actual.describeGeneratedSourceFiles())); } } @@ -93,11 +95,11 @@ public void succeededWithoutWarnings() { /** Asserts that the compilation failed. */ public void failed() { - if (actual().status().equals(SUCCESS)) { + if (actual.status().equals(SUCCESS)) { failWithoutActual( simpleFact( "Compilation was expected to fail, but contained no errors.\n\n" - + actual().describeGeneratedSourceFiles())); + + actual.describeGeneratedSourceFiles())); } } @@ -173,7 +175,7 @@ public DiagnosticInFile hadNoteContainingMatch(Pattern expectedPattern) { private void checkDiagnosticCount( int expectedCount, Diagnostic.Kind kind, Diagnostic.Kind... more) { Iterable> diagnostics = - actual().diagnosticsOfKind(kind, more); + actual.diagnosticsOfKind(kind, more); int actualCount = size(diagnostics); if (actualCount != expectedCount) { failWithoutActual( @@ -282,7 +284,7 @@ private ImmutableList> findMatchingDiagnost Diagnostic.Kind kind, Diagnostic.Kind... more) { ImmutableList> diagnosticsOfKind = - actual().diagnosticsOfKind(kind, more); + actual.diagnosticsOfKind(kind, more); ImmutableList> diagnosticsWithMessage = diagnosticsOfKind .stream() @@ -311,7 +313,7 @@ public JavaFileObjectSubject generatedFile( /** Asserts that compilation generated a file at {@code path}. */ @CanIgnoreReturnValue public JavaFileObjectSubject generatedFile(Location location, String path) { - return checkGeneratedFile(actual().generatedFile(location, path), location, path); + return checkGeneratedFile(actual.generatedFile(location, path), location, path); } /** Asserts that compilation generated a source file for a type with a given qualified name. */ @@ -332,7 +334,7 @@ private JavaFileObjectSubject checkGeneratedFile( ImmutableList.Builder facts = ImmutableList.builder(); facts.add(fact("in location", location.getName())); facts.add(simpleFact("it generated:")); - for (JavaFileObject generated : actual().generatedFiles()) { + for (JavaFileObject generated : actual.generatedFiles()) { if (generated.toUri().getPath().contains(location.getName())) { facts.add(simpleFact(" " + generated.toUri().getPath())); } diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index 04bb0d51..ec631ad8 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -52,13 +52,16 @@ public static JavaFileObjectSubject assertThat(JavaFileObject actual) { return assertAbout(FACTORY).that(actual); } + private final JavaFileObject actual; + JavaFileObjectSubject(FailureMetadata failureMetadata, JavaFileObject actual) { super(failureMetadata, actual); + this.actual = actual; } @Override protected String actualCustomStringRepresentation() { - return actual().toUri().getPath(); + return actual.toUri().getPath(); } /** @@ -73,7 +76,7 @@ public void isEqualTo(@Nullable Object other) { JavaFileObject otherFile = (JavaFileObject) other; try { - if (!asByteSource(actual()).contentEquals(asByteSource(otherFile))) { + if (!asByteSource(actual).contentEquals(asByteSource(otherFile))) { failWithActual("expected to be equal to", other); } } catch (IOException e) { @@ -84,7 +87,7 @@ public void isEqualTo(@Nullable Object other) { /** Asserts that the actual file's contents are equal to {@code expected}. */ public void hasContents(ByteSource expected) { try { - if (!asByteSource(actual()).contentEquals(expected)) { + if (!asByteSource(actual).contentEquals(expected)) { failWithActual("expected to have contents", expected); } } catch (IOException e) { @@ -99,7 +102,7 @@ public void hasContents(ByteSource expected) { public StringSubject contentsAsString(Charset charset) { try { return check("contents()") - .that(JavaFileObjects.asByteSource(actual()).asCharSource(charset).read()); + .that(JavaFileObjects.asByteSource(actual).asCharSource(charset).read()); } catch (IOException e) { throw new RuntimeException(e); } @@ -166,7 +169,7 @@ private void performTreeDifference( String failureVerb, String expectedTitle, BiFunction differencingFunction) { - ParseResult actualResult = Parser.parse(ImmutableList.of(actual())); + ParseResult actualResult = Parser.parse(ImmutableList.of(actual)); CompilationUnitTree actualTree = getOnlyElement(actualResult.compilationUnits()); ParseResult expectedResult = Parser.parse(ImmutableList.of(expected)); @@ -181,11 +184,11 @@ private void performTreeDifference( new TreeContext(actualTree, actualResult.trees())); try { failWithoutActual( - fact("for file", actual().toUri().getPath()), + fact("for file", actual.toUri().getPath()), fact(failureVerb, expected.toUri().getPath()), fact("diff", diffReport), fact(expectedTitle, expected.getCharContent(false)), - fact("but was", actual().getCharContent(false))); + fact("but was", actual.getCharContent(false))); } catch (IOException e) { throw new IllegalStateException( "Couldn't read from JavaFileObject when it was already in memory.", e); diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 07aa9bce..09d8cebf 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -65,12 +65,14 @@ public final class JavaSourcesSubject extends Subject> implements CompileTester, ProcessedCompileTesterFactory { + private final Iterable actual; private final List options = new ArrayList(Arrays.asList("-Xlint")); @Nullable private ClassLoader classLoader; @Nullable private ImmutableList classPath; JavaSourcesSubject(FailureMetadata failureMetadata, Iterable subject) { super(failureMetadata, subject); + this.actual = subject; } @Override @@ -150,13 +152,13 @@ private CompilationClause(Iterable processors) { @Override public void parsesAs(JavaFileObject first, JavaFileObject... rest) { - if (Iterables.isEmpty(actual())) { + if (Iterables.isEmpty(actual)) { failWithoutActual( simpleFact( "Compilation generated no additional source files, though some were expected.")); return; } - ParseResult actualResult = Parser.parse(actual()); + ParseResult actualResult = Parser.parse(actual); ImmutableList> errors = actualResult.diagnosticsByKind().get(Kind.ERROR); if (!errors.isEmpty()) { @@ -334,7 +336,7 @@ private Compilation compilation() { if (classPath != null) { compiler = compiler.withClasspath(classPath); } - return compiler.compile(actual()); + return compiler.compile(actual); } } From ac382a970e3b574454bd8760b5e184afdee5f172 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 4 Jun 2019 12:35:26 -0700 Subject: [PATCH 029/300] Extend raw Subject instead of supplying type parameters. The type parameters are being removed from Subject. This CL will temporarily produce rawtypes warnings, which will go away when I remove the type parameters (as soon as this batch of CLs is submitted). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=251493484 --- pom.xml | 2 +- .../java/com/google/testing/compile/CompilationSubject.java | 2 +- .../com/google/testing/compile/JavaFileObjectSubject.java | 2 +- .../java/com/google/testing/compile/JavaSourcesSubject.java | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index dbf6fe3f..4d26fa5a 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 0.44 + 0.45 http://github.com/google/compile-testing diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 65610af1..bed9a0f0 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -57,7 +57,7 @@ import javax.tools.StandardLocation; /** A {@link Truth} subject for a {@link Compilation}. */ -public final class CompilationSubject extends Subject { +public final class CompilationSubject extends Subject { private static final Subject.Factory FACTORY = new CompilationSubjectFactory(); diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index ec631ad8..22f25b8e 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -37,7 +37,7 @@ import javax.tools.JavaFileObject; /** Assertions about {@link JavaFileObject}s. */ -public final class JavaFileObjectSubject extends Subject { +public final class JavaFileObjectSubject extends Subject { private static final Subject.Factory FACTORY = new JavaFileObjectSubjectFactory(); diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 09d8cebf..0163614a 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -62,8 +62,7 @@ * @author Gregory Kick */ @SuppressWarnings("restriction") // Sun APIs usage intended -public final class JavaSourcesSubject - extends Subject> +public final class JavaSourcesSubject extends Subject implements CompileTester, ProcessedCompileTesterFactory { private final Iterable actual; private final List options = new ArrayList(Arrays.asList("-Xlint")); @@ -593,7 +592,7 @@ public static JavaSourcesSubject assertThat( .build()); } - public static final class SingleSourceAdapter extends Subject + public static final class SingleSourceAdapter extends Subject implements CompileTester, ProcessedCompileTesterFactory { private final JavaSourcesSubject delegate; From dd93c0ad922d2c99557d26490ef48e0a1a8fefe5 Mon Sep 17 00:00:00 2001 From: spratt Date: Mon, 19 Aug 2019 09:12:50 -0700 Subject: [PATCH 030/300] Remove TODO. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=264169676 --- src/main/java/com/google/testing/compile/Breadcrumbs.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/google/testing/compile/Breadcrumbs.java b/src/main/java/com/google/testing/compile/Breadcrumbs.java index a65b18b9..b5adef93 100644 --- a/src/main/java/com/google/testing/compile/Breadcrumbs.java +++ b/src/main/java/com/google/testing/compile/Breadcrumbs.java @@ -19,7 +19,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; - import com.sun.source.tree.BlockTree; import com.sun.source.tree.BreakTree; import com.sun.source.tree.ClassTree; @@ -37,7 +36,6 @@ import com.sun.source.tree.VariableTree; import com.sun.source.util.SimpleTreeVisitor; import com.sun.source.util.TreePath; - import java.util.List; /** @@ -54,9 +52,6 @@ private Breadcrumbs() {} * Returns a string describing the {@link TreePath} given. */ static String describeTreePath(TreePath path) { - // TODO(spratt) The number of extra strings this creates by building a list of strings, - // and then joining it is at least a little wasteful. Consider modifying the BreadcrumbVisitor - // to take a StringBuilder and traverse the whole path. return Joiner.on("->").join(getBreadcrumbList(path)); } From bba1624b82fc9495471ecd96b637481b00d7f14d Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Tue, 20 Aug 2019 11:49:21 -0700 Subject: [PATCH 031/300] Travis build: use [openjdk8] and [openjdk11] Closes #172 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=264432562 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0995cc00..0f73e167 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ install: mvn -B -U install clean --fail-never --quiet -DskipTests=true -Dinvoker script: mvn -B verify jdk: - - oraclejdk8 + - openjdk8 + - openjdk11 notifications: email: false From d34c5c79627ebcd31b4f709f84ad690f675dfefe Mon Sep 17 00:00:00 2001 From: clshepherd Date: Fri, 11 Oct 2019 08:16:51 -0700 Subject: [PATCH 032/300] Fix 2 ErrorProneStyle findings: * The actual and expected values appear to be swapped, which results in poor assertion failure messages. The actual value should come first. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=274175832 --- .../java/com/google/testing/compile/TreeDifferTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/google/testing/compile/TreeDifferTest.java b/src/test/java/com/google/testing/compile/TreeDifferTest.java index a5d68e12..f70579b1 100644 --- a/src/test/java/com/google/testing/compile/TreeDifferTest.java +++ b/src/test/java/com/google/testing/compile/TreeDifferTest.java @@ -183,14 +183,14 @@ public void scan_differingCompilationUnits() { for (TreeDifference.OneWayDiff extraNode : diff.getExtraActualNodes()) { extraNodesFound.add(SimplifiedDiff.create(extraNode)); } - assertThat(extraNodesExpected).containsExactlyElementsIn(extraNodesFound.build()).inOrder(); + assertThat(extraNodesFound.build()).containsExactlyElementsIn(extraNodesExpected).inOrder(); ImmutableList.Builder differingNodesFound = new ImmutableList.Builder(); for (TreeDifference.TwoWayDiff differingNode : diff.getDifferingNodes()) { differingNodesFound.add(SimplifiedDiff.create(differingNode)); } - assertThat(differingNodesExpected) - .containsExactlyElementsIn(differingNodesFound.build()) + assertThat(differingNodesFound.build()) + .containsExactlyElementsIn(differingNodesExpected) .inOrder(); } From f04802a184f4bda9ecb9df303f0fe16f8551a74c Mon Sep 17 00:00:00 2001 From: sullis Date: Mon, 28 Oct 2019 06:54:28 -0700 Subject: [PATCH 033/300] CompilationTest: more assertions Fixes https://github.com/google/compile-testing/pull/176 RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=277053349 --- src/test/java/com/google/testing/compile/CompilationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/google/testing/compile/CompilationTest.java b/src/test/java/com/google/testing/compile/CompilationTest.java index f5fecd2a..51f830ce 100644 --- a/src/test/java/com/google/testing/compile/CompilationTest.java +++ b/src/test/java/com/google/testing/compile/CompilationTest.java @@ -67,6 +67,8 @@ public void compilerStatusFailure() { Compiler compiler = compilerWithGenerator(); Compilation compilation = compiler.compile(brokenSource); assertThat(compilation.status()).isEqualTo(Compilation.Status.FAILURE); + assertThat(compilation.errors()).hasSize(1); + assertThat(compilation.errors().get(0).getLineNumber()).isEqualTo(3); } @Test From 1246d7e1e8325d906109d8bf5ffd8f0681f2b6a4 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Mon, 28 Oct 2019 10:20:05 -0700 Subject: [PATCH 034/300] Update maven-compiler-plugin to 3.8.1. Fixes https://github.com/google/compile-testing/pull/171. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=277090096 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d26fa5a..dc3f7c5a 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.1 1.8 1.8 From b3d4329eee164261d4fb898132c30f23336e6446 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Mon, 28 Oct 2019 10:21:44 -0700 Subject: [PATCH 035/300] Fix incorrect types nullcheck in CompilationRule. Fixes https://github.com/google/compile-testing/pull/174. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=277090455 --- src/main/java/com/google/testing/compile/CompilationRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/testing/compile/CompilationRule.java b/src/main/java/com/google/testing/compile/CompilationRule.java index 81df84f0..d54e05ba 100644 --- a/src/main/java/com/google/testing/compile/CompilationRule.java +++ b/src/main/java/com/google/testing/compile/CompilationRule.java @@ -81,7 +81,7 @@ public Elements getElements() { * @throws IllegalStateException if this method is invoked outside the execution of the rule. */ public Types getTypes() { - checkState(elements != null, "Not running within the rule"); + checkState(types != null, "Not running within the rule"); return types; } From e957576e8560333d968229d0dc0b0729c28a49b9 Mon Sep 17 00:00:00 2001 From: clshepherd Date: Thu, 14 Nov 2019 08:59:50 -0800 Subject: [PATCH 036/300] Fix 1 ErrorProneStyle finding: * These grouping parentheses are unnecessary; it is unlikely the code will be misinterpreted without them ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=280440017 --- src/main/java/com/google/testing/compile/MoreTrees.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/testing/compile/MoreTrees.java b/src/main/java/com/google/testing/compile/MoreTrees.java index 7ffec537..a7ff86a1 100644 --- a/src/main/java/com/google/testing/compile/MoreTrees.java +++ b/src/main/java/com/google/testing/compile/MoreTrees.java @@ -198,7 +198,7 @@ public Optional scan(Iterable nodes, Void v) { /** Returns the first present value. If both values are absent, then returns absent .*/ @Override public Optional reduce(Optional t1, Optional t2) { - return (t1.isPresent()) ? t1 : t2; + return t1.isPresent() ? t1 : t2; } @Override From cdda4880bb150387b8c2a71f3ecbafb50e207731 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Thu, 6 Feb 2020 07:13:06 -0800 Subject: [PATCH 037/300] Add a badge to HTML Javadocs [skip ci] javadoc.io provides free Javadoc hosting, which is easier to read than comments in Java source files. This change adds a badge to point to the latest version of Javadoc (also with history), and updates Fixes #186 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=293585959 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ad4d652c..0eb1f3e0 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,9 @@ Compile Testing =============== [![Maven Release][maven-shield]][maven-link] +[![Javadoc][javadoc-shield]][javadoc-link] -A library for testing javac compilation with or without annotation processors. See the [javadoc][package-info] for usage examples. +A library for testing javac compilation with or without annotation processors. See the [javadoc][javadoc-link] for usage examples. License ------- @@ -22,6 +23,7 @@ License See the License for the specific language governing permissions and limitations under the License. -[package-info]: https://github.com/google/compile-testing/blob/master/src/main/java/com/google/testing/compile/package-info.java [maven-shield]: https://img.shields.io/maven-central/v/com.google.testing.compile/compile-testing.png [maven-link]: https://search.maven.org/artifact/com.google.testing.compile/compile-testing +[javadoc-shield]: https://javadoc.io/badge/com.google.testing.compile/compile-testing.svg?color=blue +[javadoc-link]: https://javadoc.io/doc/com.google.testing.compile/compile-testing From b59a137626ea4589fb2c71bb67ae4220e07f8524 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Thu, 6 Feb 2020 07:24:40 -0800 Subject: [PATCH 038/300] Add build status badge [skip ci] Fixes #185 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=293587438 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0eb1f3e0..afbc0433 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Compile Testing =============== +[![Build Status][travis-shield]][travis-link] [![Maven Release][maven-shield]][maven-link] [![Javadoc][javadoc-shield]][javadoc-link] @@ -23,6 +24,8 @@ License See the License for the specific language governing permissions and limitations under the License. +[travis-shield]: https://travis-ci.org/google/compile-testing.svg?branch=master +[travis-link]: https://travis-ci.org/google/compile-testing [maven-shield]: https://img.shields.io/maven-central/v/com.google.testing.compile/compile-testing.png [maven-link]: https://search.maven.org/artifact/com.google.testing.compile/compile-testing [javadoc-shield]: https://javadoc.io/badge/com.google.testing.compile/compile-testing.svg?color=blue From b4eaa92f272e799c61221eebd4fe30bc2532d230 Mon Sep 17 00:00:00 2001 From: emcmanus Date: Tue, 31 Mar 2020 13:07:27 -0700 Subject: [PATCH 039/300] In onLine(n), produce a sensible exception message if n is out of range. Currently you get an ArrayIndexOutOfBoundsException. RELNOTES=Better exception in onLine(n) when n is out of range. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=304030110 --- pom.xml | 2 +- .../testing/compile/CompilationSubject.java | 9 ++++++--- .../compile/CompilationSubjectTest.java | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dc3f7c5a..d552e615 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ junit junit - 4.12 + 4.13 com.google.truth diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index bed9a0f0..1bf8b64a 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -466,9 +466,12 @@ ImmutableList linesInFile() { /** Lists the line at a line number (1-based). */ String listLine(long lineNumber) { - return lineNumber == Diagnostic.NOPOS - ? "(no associated line)" - : String.format("%4d: %s", lineNumber, linesInFile().get((int) (lineNumber - 1))); + if (lineNumber == Diagnostic.NOPOS) { + return "(no associated line)"; + } + checkArgument(lineNumber > 0 && lineNumber <= linesInFile().size(), + "Invalid line number %s; number of lines is only %s", lineNumber, linesInFile().size()); + return String.format("%4d: %s", lineNumber, linesInFile().get((int) (lineNumber - 1))); } } diff --git a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java index 706ede87..ae38a16a 100644 --- a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java +++ b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java @@ -24,12 +24,15 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.stream.Collectors.joining; import static javax.tools.StandardLocation.CLASS_OUTPUT; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.common.io.ByteSource; import com.google.common.truth.ExpectFailure; import com.google.common.truth.Truth; +import java.io.BufferedReader; +import java.io.IOException; import java.util.regex.Pattern; import java.util.stream.Stream; import javax.tools.Diagnostic; @@ -347,6 +350,22 @@ public void hadWarningContainingInFileOnLine_wrongLine() { assertThat(expected.getMessage()).contains("" + actualErrorLine); } + @Test + public void hadWarningContainingInFileOnLine_lineTooBig() throws IOException { + long lineCount = new BufferedReader(sourceFile.openReader(false)).lines().count(); + IllegalArgumentException exception = + assertThrows( + IllegalArgumentException.class, + () -> + assertThat(compilerWithWarning().compile(sourceFile)) + .hadWarningContainingMatch("this is a+ message") + .inFile(sourceFile) + .onLine(100)); + assertThat(exception) + .hasMessageThat() + .isEqualTo("Invalid line number 100; number of lines is only " + lineCount); + } + /* TODO(dpb): Negative cases for onLineContaining for * (warning, error, note) x * (containing(String), containingMatch(String), containingMatch(Pattern)). */ From 0e477c8aa9d106cd731411370e6a93579042b72f Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 12 Jun 2020 09:22:39 -0700 Subject: [PATCH 040/300] Copybara config for Compile-Testing. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=316117015 --- copy.bara.sky | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 copy.bara.sky diff --git a/copy.bara.sky b/copy.bara.sky new file mode 100644 index 00000000..3bae3bdf --- /dev/null +++ b/copy.bara.sky @@ -0,0 +1,49 @@ +"""Copybara config for syncing Compile-Testing from Piper to GitHub.""" + +load("//devtools/copybara/library/workflow", "google3_glob") +load( + "//java/com/google/devtools/java/copybara/workflow", + "java_team_piper_to_github", +) + +google3_path = "third_party/java_src/compile_testing" +google3_files = google3_glob( + google3_path, + google3_exclude = [ + "LICENSE", + "opensource/BUILD", + "opensource/maven_test.sh", + "opensource/*moe*", + "**/com/google/testing/compile/refactor/**", + ], +) + +java_team_piper_to_github( + google3_path = google3_path, + google3_files = google3_files, + default_author = "Compile-Testing Team", + contact_email = "java-libraries-firehose+copybara@google.com", + owner_mdb = "java-libraries", + status_context_names = [ + "continuous-integration/travis-ci/pr", + ], + github_project_name = "compile-testing", + additional_transformations = [ + core.move( + "opensource", + "", + ), + core.move( + "java/com", + "src/main/java/com", + ), + core.move( + "javatests/com", + "src/test/java/com", + ), + core.move( + "javatests", + "src/test/resources", + ), + ], +) From f334e437aaff75475a0437e5db900204c309fed8 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 12 Jun 2020 13:11:51 -0700 Subject: [PATCH 041/300] Make MOE ignore copy.bara.sky. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=316163524 --- copy.bara.sky | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 copy.bara.sky diff --git a/copy.bara.sky b/copy.bara.sky deleted file mode 100644 index 3bae3bdf..00000000 --- a/copy.bara.sky +++ /dev/null @@ -1,49 +0,0 @@ -"""Copybara config for syncing Compile-Testing from Piper to GitHub.""" - -load("//devtools/copybara/library/workflow", "google3_glob") -load( - "//java/com/google/devtools/java/copybara/workflow", - "java_team_piper_to_github", -) - -google3_path = "third_party/java_src/compile_testing" -google3_files = google3_glob( - google3_path, - google3_exclude = [ - "LICENSE", - "opensource/BUILD", - "opensource/maven_test.sh", - "opensource/*moe*", - "**/com/google/testing/compile/refactor/**", - ], -) - -java_team_piper_to_github( - google3_path = google3_path, - google3_files = google3_files, - default_author = "Compile-Testing Team", - contact_email = "java-libraries-firehose+copybara@google.com", - owner_mdb = "java-libraries", - status_context_names = [ - "continuous-integration/travis-ci/pr", - ], - github_project_name = "compile-testing", - additional_transformations = [ - core.move( - "opensource", - "", - ), - core.move( - "java/com", - "src/main/java/com", - ), - core.move( - "javatests/com", - "src/test/java/com", - ), - core.move( - "javatests", - "src/test/resources", - ), - ], -) From ffc732e8cbea9c7361b2c6bdba54a1c67f9f13fb Mon Sep 17 00:00:00 2001 From: Compile-Testing Team Date: Fri, 12 Jun 2020 12:22:39 -0400 Subject: [PATCH 042/300] Automatic code cleanup. PiperOrigin-RevId: 316117015 --- src/main/java/com/google/testing/compile/Compilation.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/google/testing/compile/Compilation.java b/src/main/java/com/google/testing/compile/Compilation.java index 68881c45..b00dc93d 100644 --- a/src/main/java/com/google/testing/compile/Compilation.java +++ b/src/main/java/com/google/testing/compile/Compilation.java @@ -265,7 +265,6 @@ private String describeGeneratedFile(JavaFileObject generatedFile) { } } - // TODO(dpb): Use Guava's toImmutableList() once that's available. MOE:strip_line private static Collector> toImmutableList() { return collectingAndThen(toList(), ImmutableList::copyOf); } From 461a44ea4abeb415e48e6e8b4461bee7ef4d93e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 08:27:44 -0700 Subject: [PATCH 043/300] Bump junit from 4.13 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.

Release notes

Sourced from junit's releases.

JUnit 4.13.1

Please refer to the release notes for details.

Changelog

Sourced from junit's changelog.

Summary of changes in version 4.13.1

Rules

Security fix: TemporaryFolder now limits access to temporary folders on Java 1.7 or later

A local information disclosure vulnerability in TemporaryFolder has been fixed. See the published security advisory for details.

Test Runners

[Pull request #1669:](junit-team/junit#1669) Make FrameworkField constructor public

Prior to this change, custom runners could make FrameworkMethod instances, but not FrameworkField instances. This small change allows for both now, because FrameworkField's constructor has been promoted from package-private to public.

Commits
  • 1b683f4 [maven-release-plugin] prepare release r4.13.1
  • ce6ce3a Draft 4.13.1 release notes
  • c29dd82 Change version to 4.13.1-SNAPSHOT
  • 1d17486 Add a link to assertThrows in exception testing
  • 543905d Use separate line for annotation in Javadoc
  • 510e906 Add sub headlines to class Javadoc
  • 610155b Merge pull request from GHSA-269g-pwp5-87pp
  • b6cfd1e Explicitly wrap float parameter for consistency (#1671)
  • a5d205c Fix GitHub link in FAQ (#1672)
  • 3a5c6b4 Deprecated since jdk9 replacing constructor instance of Double and Float (#1660)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=junit:junit&package-manager=maven&previous-version=4.13&new-version=4.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/google/compile-testing/network/alerts).
Fixes #196 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/196 from google:dependabot/maven/junit-junit-4.13.1 b58bef38bb6f9da2f077375064cdb5acca24ebf9 PiperOrigin-RevId: 336880588 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d552e615..9fc60377 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ junit junit - 4.13 + 4.13.1 com.google.truth From 82c260597244b34f7fa6afd97fab0fce2bcd939a Mon Sep 17 00:00:00 2001 From: Compile-Testing Team Date: Thu, 15 Oct 2020 12:44:35 -0700 Subject: [PATCH 044/300] Add Dependabot v2 This will indirectly move us toward addressing https://github.com/google/compile-testing/issues/195. It should also help prevent such problems in the future. (But hopefully we don't depend on too many libraries that will make breaking changes in the first place. Now that Truth maintains backward compatibility, the main concern would be auto-common.) RELNOTES=n/a PiperOrigin-RevId: 337362092 --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..b76b8957 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" From e3d1c3e491d1a96b14c4863e59b045de3056eb29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2020 13:35:54 -0700 Subject: [PATCH 045/300] Bump auto-common from 0.10 to 0.11 Bumps [auto-common](https://github.com/google/auto) from 0.10 to 0.11.
Release notes

Sourced from auto-common's releases.

Auto Common 0.11

  • Add javadoc for SuperficialValidation methods. (5384b30)
  • Open SuperficialValidation#validateType(TypeMirror) to public visibility (6c39b13)
  • Adding String-based Step as a replacement for ProcessingStep to BasicAnnotationProcessor. Allows for fully-qualified Annotation names to be specified in a processing Step in order to remove the requirement that implementation processors depend directly on their Annotation classes. (df5641b)
  • Added MoreTypes.isConversionFromObjectUnchecked to test whether casting to a type will elicit an "unchecked" compiler warning. (13a0b24)
  • Adding helper methods for getting different types of annotation values with AnnotationValueVisitor. (6c2c1a3)
  • Suppress error noise in com.google.auto.common.BasicAnnotationProcessor (3966280)
  • Adds MoreElements#getAllMethods(), which returns all local and inherited methods (including static methods), but does not include any methods that have been overridden. (93fb9c5)
  • Suppress TypeEquals check (e1beeff)
  • Added MoreTypes.asIntersection() (c16ef66)
  • Fix bug where ProcessingStep.process(...) was called with too many elements when there had been deferred elements. (46718eb)
  • Add MoreElements.asTypeParameter() (19474fc)
  • Add an overrides() method to MoreElements that is more consistent between javac and ECJ. (b1ba2e3)
  • Document MoreTypes.equivalence(). (df5eb3a)
Commits
  • 123db86 Set version number for auto-common to 0.11.
  • 9f870cc Update dependency versions.
  • 5384b30 Add javadoc to the methods in SuperficialValidation. Also add a private const...
  • 85af443 Fully Qualify @Override to avoid name conflicts
  • 6c39b13 Open SuperficialValidation#validateType(TypeMirror) to public visibility
  • c6e35e6 Add [tags] to AutoValue error messages. This will enable them to be correla...
  • 43ff5f2 AutoValue annotation can be provided scope.
  • b484417 Stop the LazyInit annotation from getting shaded by Maven, so that AutoValue ...
  • d9d66ad Fix handling of @Nullable Optional\<T> foo() properties being set by `setFoo...
  • da84ef1 Tests related to e62e0abd2fbdfd2512c292ef95d4d152a5ca0691
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto:auto-common&package-manager=maven&previous-version=0.10&new-version=0.11)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #202 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/202 from google:dependabot/maven/com.google.auto-auto-common-0.11 0dc4b5e25ec70c96d901651682e48d8f16b3b3e5 PiperOrigin-RevId: 337372373 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9fc60377..34509512 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ com.google.auto auto-common - 0.10 + 0.11 From a68838e5a413dc74b3a641714b6bfa0c2e2ba10b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2020 13:36:29 -0700 Subject: [PATCH 046/300] Bump maven-source-plugin from 3.0.1 to 3.2.1 Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.0.1 to 3.2.1.
Commits
  • a59a2e4 [maven-release-plugin] prepare release maven-source-plugin-3.2.1
  • c954a7e make build as reproducible as possible for now
  • d5b9878 [MSOURCES-123] set archiver reproducible mode earlier
  • 258d666 MSOURCES-122 make output independant from OS newline
  • 5b4e02f [maven-release-plugin] prepare for next development iteration
  • 2a74824 [maven-release-plugin] prepare release maven-source-plugin-3.2.0
  • 816ebc4 MSOURCES-120 fix reproducible IT: remove plugin version from pom.xml
  • 32f122a MSOURCES-120 make output jar file binary Reproducible
  • 6e715b1 [MSOURCES-95] Source JAR is re-created even if sources are not changed
  • 9154e1a [maven-release-plugin] prepare for next development iteration
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-source-plugin&package-manager=maven&previous-version=3.0.1&new-version=3.2.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #199 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/199 from google:dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.2.1 f04a6f828efc92918f4d87471f47069504b97517 PiperOrigin-RevId: 337372487 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34509512..5d4b5ec6 100644 --- a/pom.xml +++ b/pom.xml @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.2.1 attach-sources From b867b4a5cf385a673fc05b63362b223941f47e3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2020 15:55:59 -0700 Subject: [PATCH 047/300] Bump truth.version from 0.45 to 1.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps `truth.version` from 0.45 to 1.0.1. Updates `truth` from 0.45 to 1.0.1
Release notes

Sourced from truth's releases.

1.0.1

  • Changed failure messages to identify trailing whitespace in failed string comparisons. (7a58a45b)
  • Moved gwt-user to test scope. (51bbbf42)
  • Fixed handling of proto maps with keys equal to the key type's default value. (8ebfe2ab)
  • Worked around what seems to be a classloading bug in old versions of some vendors' Android runtimes. (02c5e79925d455331377f3e6640cc450aecf6774)

Truth 1.0

Truth is a library for performing assertions in tests:

assertThat(notificationText).contains("testuser@google.com");

Truth is owned and maintained by the Guava team. It is used in the majority of the tests in Google’s own codebase.

For more information, see our full documentation at truth.dev, or start with our higher-level blog post.

Users of AssertJ will be particularly interested in our comparison of Truth and AssertJ.

Truth 1.0 contains no changes relative to 1.0-rc2. For a list of changes since Truth 0.46, see the release notes for rc1 and rc2.

Now that we have reached 1.0 (after eight years! We're sorry, and we thank you again for your patience), we will maintain binary compatibility.

Truth 0.46

  • Removed deprecated containsAllOf and containsAllIn. Use containsAtLeast and containsAtLeastElementsIn, which are equivalent. (5de3d216)
  • Removed deprecated isOrdered and isStrictlyOrdered. Use isInOrder and isInStrictOrder, which are equivalent. (5de3d216)
  • Removed deprecated SortedMapSubject and SortedSetSubject. Users will have to perform assertions directly on the result of methods like firstKey. We haven't found sufficient demand for the classes to keep them. (057ef315)
  • Removed deprecated ListMultimapSubject, SetMultimapSubject, and ProtoTruth equivalents, which add little to the general Multimap subjects. (057ef315)
  • Removed the type parameters from Subject. If you subclass this type (or declare it as a method return type, etc.), you will have to update those usages at the same time you update Truth. Or you can remove the type parameters from your usages (temporarily introducing rawtypes/unchecked warnings, which you may wish to suppress) and then update Truth (at which point the warnings will go away and you can remove any suppressions). (3740ee65) To remove the type parameters from Subject subclasses, you can get most of the way there with a Perl-compatible regex search-and-replace operation: s/\bSubject<([^<>]*|[^<>]*<[^<>]*>[^<>]*|[^<>]*<[^<>]*>[^<>]*<[^<>]*>[^<>]*|[^<>]*<[^<>]*<[^<>]*>[^<>]*>)>/Subject/g
  • Removed the self-type parameter of ComparableSubject and most of the type parameters of IterableOfProtosSubject, MapWithProtoValuesSubject, and MultimapWithProtoValuesSubject. If you subclass any of those types (or declare them as method return types, etc.), you will have to update those usages at the same time you update Truth. Or you can remove the type parameters from your usages, update Truth, and then add back the remaining type parameters. (e611568b)
  • Removed the type parameters of ProtoSubject and LiteProtoSubject. If you subclass either of those types (or declare them as method return types, etc.), you will have to update those usages at the same time you update Truth. Or you can remove the type parameters from your usages (temporarily introducing rawtypes/unchecked warnings, which you may wish to suppress) and then update Truth (at which point the warnings will go away and you can remove any suppressions). (eb3852c4)
  • Removed deprecated actual(), getSubject(), named(), internalCustomName(), and actualAsString(). To automate most migrations, we've provided StoreActualValueInField and NamedToWithMessage (and a quick-and-dirty regex version for common cases). (If you are migrating manually, you may need to know how to handle java.util.Optional, Stream, and other types that aren't built in.) You might also be interested in our notes from the API Review of this decision. (c1db1b78)
  • Changed ProtoSubject to not extend ProtoFluentAssertion. It still contains all the same methods, except that isEqualTo and isNotEqualTo now require a Message, rather than accept any Object. (777af33d)
  • Deprecated the overload of StandardSubjectBuilder.fail(...) that accepts a message. Instead of assert_().fail(...), use assertWithMessage(...).fail(). Similarly, instead of expect.fail(...), use expect.withMessage(...).fail(), and so forth. (227b559e)
  • Deprecated AtomicLongMapSubject. In most cases, you can assert on the asMap() view instead. (19e1f22c)
  • Deprecated Optional*Subject.hasValueThat(). Instead of assertThat(optional).hasValueThat()...., use assertThat(optional.getAs*())..... (227b559e)
  • Changed assertWithMessage to throw an exception if given format arguments but a null format string. (31e44cc3d2597b90986122853c149d68ea2c5cde)
  • Reimplemented the message-accepting overload of fail(...) in terms of withMessage(...). This is mostly a no-op but can affect behavior in unusual cases. For details, see the commit description. (a52f89b9)
  • Made IterableSubject.isEqualTo produce the same message format as containsExactly. (27a9111c504648ab830929730d6a2b0face5d23d)
  • Introduced TruthFailureSubject.truthFailures() factory for callers that want to test Truth failure messages with expect, assertWithMessage, etc. (c1db1b78)
Commits

Updates `truth-java8-extension` from 0.45 to 1.0.1 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #198 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/198 from google:dependabot/maven/truth.version-1.0.1 33cb3459e1c261cd3c12328fc917b5d9ec6845fe PiperOrigin-RevId: 337400093 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d4b5ec6..95b1b76b 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 0.45 + 1.0.1 http://github.com/google/compile-testing From a163144452658c40d8f10fc8ce90a83a9e6e249d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Oct 2020 13:43:53 -0700 Subject: [PATCH 048/300] Bump maven-javadoc-plugin from 3.0.0 to 3.2.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.0.0 to 3.2.0.
Commits
  • d3b77d6 [maven-release-plugin] prepare release maven-javadoc-plugin-3.2.0
  • 41bc516 back to 3.2.0-SNAPSHOT
  • 819cf1e [maven-release-plugin] prepare for next development iteration
  • 45f4b3e [maven-release-plugin] prepare release maven-javadoc-plugin-3.2.0
  • d772fce MJAVADOC-610 Add IT test for multirelease jar
  • 37d0ef5 [MJAVADOC-638] upgrade Doxia Sitetools to 1.9.2 to remove dependency on Strut...
  • 528ce30 [MJAVADOC-639] Switch to Oracle OpenJDK 11 compatible jar, see MJAVADOC-610
  • 405b16d [MJAVADOC-639] include requires static from external dependencies for all mod...
  • aaa2007 [MJAVADOC-637] make build Reproducible
  • 7bfa76d [MJAVADOC-636] exclude some modules from aggregated javadoc
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.0.0&new-version=3.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #200 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/200 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.2.0 572752509cac41979d568a71be49448776e286e3 PiperOrigin-RevId: 337570022 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95b1b76b..c6803253 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0 + 3.2.0 attach-docs From 36ae47d8b9a16abc67f25f136d85e344f72f9b33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Oct 2020 14:43:22 -0700 Subject: [PATCH 049/300] Bump auto-value from 1.5.3 to 1.7.4 Bumps [auto-value](https://github.com/google/auto) from 1.5.3 to 1.7.4.
Release notes

Sourced from auto-value's releases.

AutoValue 1.7.4

  • Stop the LazyInit annotation from getting shaded by Maven, so that AutoValue can find it on the classpath. (b484417)
  • Fixed handling of @Nullable Optional<T> foo() properties being set by setFoo(@Nullable T) setters. Now setFoo(null) results in Optional.empty(), not null. (d9d66ad)

AutoValue 1.7.3

  • Optionally copy annotations from the @AutoValue.Builder class to the generated subclass. (b22f969)
  • Drop unnecessary parentheses in AutoAnnotation equals and hashCode methods. (b9ba06a)
  • Fixed a problem when an @AutoValue class references types that are generated by other annotation processors. (2797d38)

AutoValue 1.7.2

Only one change in this release:

  • AutoValue is once again "isolating" for Gradle incremental compilation. (8e7515a)

AutoValue 1.7.1

New features

  • SerializableAutoValue extension. This can be used to serialize @AutoValue classes with properties of type java.util.Optional, even though java.util.Optional is not serializable, and it can also be configured to serialize other arbitrary types. Thanks to @alvinlao for this contribution! (f91d2fe)
  • The logic for determining if we can make a BarBuilder out of a Bar has been generalized. For example, if your @AutoValue class Foo has a property IntList ints(), then your builder can have IntListBuilder intsBuilder(). Previously this worked if there was no Foo.toBuilder() method, or if IntList had its own toBuilder() method. Now it also works if it is possible to call IntListBuilder.addAll(IntList). (6aeb44f)
  • AutoValue now allows boxed properties to be set from the corresponding primitive type, for example Integer from int. (2bbe506)

Behaviour changes

  • AutoValue now gives a warning if the static builder() method is inside the @AutoValue.Builder class instead of directly in the @AutoValue class. (fcccded)
  • AutoValue doesn't generate code or invoke extensions if it detects a problem, for example a mismatch between getters and setters. (ecb6032)
  • AutoOneOf factory methods for void values now have type parameters if the @AutoOneOf class does. (4ab1b53)
  • It is now a compilation error if a setter method in a builder has a parameter marked @Nullable when the corresponding property is not in fact @Nullable. Calling such a method with a null parameter already generated a NullPointerException at runtime. (bd7bed2)
  • The @Memoized annotation now has class-level retention, rather than source-level. (107694b)

Bug fixes

  • We fixed an issue with type checking of setter parameters in the presence of inheritance and generics. (e97d1f0)
  • We now generate a better toString() for arrays in AutoOneOf (0a7c049)

Miscellaneous

  • We added CompileWithEclipseTest, which checks that AutoValue works with ecj, the Eclipse compiler. (05e983c)

AutoValue 1.7

This is the same as 1.7rc1, with one small addition:

  • Add a way for extensions to retrieve the name of the final AutoValue_Foo class. (4543619)

Thanks to @bryanstern for checking that the API changes for builder introspection do indeed work in a real extension.

AutoValue 1.7rc1

  • Add an API to allow AutoValue extensions to find out about builders. (86f4563)
  • The generated AutoValue builder class is no longer final if there are extensions generating code. This means that extensions can subclass Builder to modify or extend its functionality. (49fbf55)
  • Property builders now work correctly when their actual return type is different from the corresponding property type because of type variable substitution. (7646889)
  • Allow @AutoValue getters to define properties that are not valid Java identifiers, for example get1st(). (6dfa04e)
  • Add a propertyTypes() method to AutoValueExtension.Context, to allow extensions to see the true type of every property. In preference to properties().get(p).getReturnType(), extensions should use propertyTypes().get(p). (99ae134)

... (truncated)

Commits
  • c59110e Set version number for auto-value-parent to 1.7.4.
  • b484417 Stop the LazyInit annotation from getting shaded by Maven, so that AutoValue ...
  • d9d66ad Fix handling of @Nullable Optional\<T> foo() properties being set by `setFoo...
  • da84ef1 Tests related to e62e0abd2fbdfd2512c292ef95d4d152a5ca0691
  • df5641b [ #HiltMigration ] Updating BasicAnnotationProcessor to support a String-base...
  • e62e0ab Fix a problem with references to Factory classes in other packages.
  • 08f930a Make the nested @AutoValue class static otherwise you get the following error:
  • 32fdb09 Change links from google.github.io/guava to guava.dev, including making sure ...
  • 2f437b5 Change error reporting methods to use format strings.
  • b22f969 Copy annotations from @AutoValue.Builder to the generated Builder subclass.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.5.3&new-version=1.7.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #201 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/201 from google:dependabot/maven/com.google.auto.value-auto-value-1.7.4 a6255f5d81f64d1cbf88a36f8a4ece4612871e12 PiperOrigin-RevId: 337581372 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6803253..00a53991 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ com.google.auto.value auto-value - 1.5.3 + 1.7.4 com.google.auto From 5cc6fb7a482507393b04f0f7848324de1112e376 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Oct 2020 06:20:18 -0700 Subject: [PATCH 050/300] Bump maven-jar-plugin from 3.0.2 to 3.2.0 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.0.2 to 3.2.0.
Commits
  • d91fff8 [maven-release-plugin] prepare release maven-jar-plugin-3.2.0
  • 64c5e65 MJAR-263 make output jars reproducible like m-source-p
  • 80f58a8 [maven-release-plugin] prepare for next development iteration
  • 783d893 [maven-release-plugin] prepare release maven-jar-plugin-3.1.2
  • 8164b8a [MJAR-259] - Archiving to jar is very slow
  • 78dbb29 [MJAR-238] Allow setting of module main class
  • 13d5a9e removing MockArtifact, not used
  • 660cb85 (doc) fix broken link
  • bc84ec0 [maven-release-plugin] prepare for next development iteration
  • e072165 [maven-release-plugin] prepare release maven-jar-plugin-3.1.1
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-jar-plugin&package-manager=maven&previous-version=3.0.2&new-version=3.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #203 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/203 from google:dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.2.0 de16ee5d3d9d67ec6813b1e9497d4ab4af063683 PiperOrigin-RevId: 337841493 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00a53991..8be67572 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.2.0 From 90f7d61b6a913822286b9a213c434ae062bfe753 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:36:35 -0700 Subject: [PATCH 051/300] Bump error_prone_annotations from 2.3.3 to 2.4.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.3.3 to 2.4.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.4.0

Support for latest JDK versions: Error Prone is now compatible with JDK 8 through JDK 14, as well as early access builds of JDK 15.

New checks:

Fixed issues: #1070, #1106, #1107, #1110, #1111, #1187, #1208, #1239, #1265, #1428, #1432, #1433, #1439, #1444, #1447, #1449, #1451, #1454, #1455, #1458, #1462, #1473, #1491, #1531, #1558, #1565, #1570, #1573, #1586, #1587, #1590, #1591, #1602, #1606, #1609, #1624, #776, #785, #930

Error Prone 2.3.4

Performance Improvements: 40% speedup when run against Google's codebase with errors enabled.

New Checks:

... (truncated)

Commits
  • 1e2c8ac Fix an NPE in MultipleUnaryOperatorsInMethodCall
  • d216dc1 Set versions for 2.4.0 release
  • 708a544 Recommend the JavaTimeConversion static conversion methods instead of decompo...
  • ab06403 Don't crash when trying to qualify ambiguous simple names
  • b83a2b4 Fix a CCE in MutablePublicArray
  • 10c7955 Fix an NPE in InvalidLink
  • 35c7777 Fix a StringIndexOutOfBoundsException in MissingSummary
  • 67a923c Unwrap JavaTimeConversion calls when converting.
  • 9803086 Improve exemptions for CollectionUndefinedEquality.
  • 746c15f Add up to JDK 14 to CI
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.3.3&new-version=2.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #204 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/204 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.4.0 6545eb4d992f3f10ce1c8b2a7a974c85feaf7ccd PiperOrigin-RevId: 337898718 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8be67572..0320f6e7 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.errorprone error_prone_annotations - 2.3.3 + 2.4.0 provided From 0937e7bf32b790eda753f348dcfbb16e10b6d3b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Oct 2020 12:48:55 -0700 Subject: [PATCH 052/300] Bump guava from 27.1-jre to 30.0-jre Bumps [guava](https://github.com/google/guava) from 27.1-jre to 30.0-jre.
Release notes

Sourced from guava's releases.

30.0

Maven

<dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
  <version>30.0-jre</version>
  <!-- or, for Android: -->
  <version>30.0-android</version>
</dependency>

Javadoc

JDiff

Changelog

  • Guava types can no longer be sent over GWT-RPC. Even the earlier, temporary way to reenable support (guava.gwt.emergency_reenable_rpc) no longer has an effect. (0cb89dd110)
  • cache: Fixed memory leak in LocalCache under j2objc. (5e519d91d0)
  • collect: Added two-element min and max methods to Comparators. (958186c071)
  • collect: Removed @Beta from Multimaps.toMultimap. (b6b4dc49b1)
  • collect: Made the set returned by ImmutableMap<K, V>.keySet() serializable as long as K is serializable, even if V is not (and similarly for values()). (f5a69c33fc)
  • collect: Fixed bug in powerSet.equals(otherPowerSet) would erroneously return false if the two power sets' underlying sets were equal but had a different iteration order. (215b1f0dd7)
  • collect: Eliminated j2objc retain-cycle in SingletonImmutableBiMap. (0ad38b88bd)
  • eventbus: Prevented @Subscribe from being applied to a method that takes a primitive, as that will never be called. (554546c971)
  • graph: Made Traverser.breadthFirst() lazier, and optimized Traverser more generally. (32f2d770f7, b5210ca95c)
  • graph: Added @DoNotMock to Traverser. (6410f18c06)
  • io: Deprecated Files.createTempDir(). (fec0dbc463) (CVE forthcoming)
  • io: Upgraded ByteStreams.copy(InputStream, OutputStream) to use the faster FileChannel if possible. (a1e9a0bd12)
  • math: Added roundToDouble to BigDecimalMath, BigIntegerMath, and LongMath. (bee4f3c7ed, 2b5c096ddf, 633abf2c62)
  • net: Added MediaType constants for several font/ types. (571cf66bac)
  • net: Added HttpHeaders constants for Cross-Origin-Embedder-Policy(-Report-Only)?. (c3bf73187a)
  • testing: Made EqualsTester test that non-String objects are not equal to their String representations. (c9570eae69)
  • util.concurrent: Added ClosingFuture. (52e048ed6c)
  • util.concurrent: Removed the deprecated 1-arg ServiceManager.addListener(Listener). Use the 2-arg addListener(Listener, Executor) overload, setting the executor to directExecutor() for equivalent behavior. (dfb0001714)
  • util.concurrent: Changed AbstractFuture.toString() to no longer include the toString() of the result. (2ebf27fd45)
  • util.concurrent: Added awaitTerminationUninterruptibly. (f07b9540dc)

29.0

Maven

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.guava:guava&package-manager=maven&previous-version=27.1-jre&new-version=30.0-jre)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #206 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/206 from google:dependabot/maven/com.google.guava-guava-30.0-jre f33d1c28c96bf7159fb970acf721d388356db55e PiperOrigin-RevId: 337913517 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0320f6e7..270d0d73 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 27.1-jre + 30.0-jre com.google.code.findbugs From 1d67fb92aec456eb3fe81801edc76859ce746efb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:55:33 -0700 Subject: [PATCH 053/300] Bump plexus-java from 0.9.5 to 1.0.5 Bumps [plexus-java](https://github.com/codehaus-plexus/plexus-languages) from 0.9.5 to 1.0.5.
Commits
  • 77ee749 [maven-release-plugin] prepare release plexus-languages-1.0.5
  • 3622c04 add some javadoc for new parameter
  • 15031cc Add an extra parameter to resolve requires static for modules see MJAVADOC-639
  • 2cd0a17 upgrade to Java 7
  • 9885000 activate Reproducible Builds
  • bff956d [maven-release-plugin] prepare for next development iteration
  • 71a9cb4 [maven-release-plugin] prepare release plexus-languages-1.0.4
  • 697c00e upgrade some plugins
  • 75c5318 add null check
  • c780e3a Update OpenJDK versions for Travis
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=0.9.5&new-version=1.0.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/configuring-github-dependabot-security-updates) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #205 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/205 from google:dependabot/maven/org.codehaus.plexus-plexus-java-1.0.5 b592c24d0ff18f8d351928200684788839e63c19 PiperOrigin-RevId: 338059295 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 270d0d73..d2f0a9d8 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ org.codehaus.plexus plexus-java - 0.9.5 + 1.0.5 From 8344549132de97282782f005d279b48a2a22ed03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Oct 2020 06:39:43 -0700 Subject: [PATCH 054/300] Bump truth.version from 1.0.1 to 1.1 Bumps `truth.version` from 1.0.1 to 1.1. Updates `truth` from 1.0.1 to 1.1
Release notes

Sourced from truth's releases.

1.1

  • Fixed (we think :)) R8 compilation failure: Error: com.android.tools.r8.errors.b: Compilation can't be completed because `org.objectweb.asm.ClassVisitor` and 1 other classes are missing. (0bfa285fa)
  • Added unpackingAnyUsing(TypeRegistry, ExtensionRegistry). If you call this method, ProtoTruth will attempt to unpack Any messages before comparing them. (b50d878b)
  • Added formattingDiffsUsing methods to IterableSubject and MapSubject. This allows you to get failure messages which show diffs between the actual and expected elements (like you get with comparingElementsUsing) while still comparing them using object equality. (ae997be77)
  • Added null checks to StringSubject. (3481ab0af)
  • Included ASM as a dependency (non-<optional>) by default. It is still safe to exclude if you want to minimize dependencies, but by including it, you may see better failure messages. (aea78e81c)
  • Changed Checker Framework annotations from checker-qual to qual. (e71b57b9f)
  • Removed dependency on gwt-user. (b54e9ef50fe670bf93dd3b2b6851423be631b429)
  • API documentation for Truth classes is now easier to reach. For example, for StringSubject, visit truth.dev/StringSubject. Also, more easily access the index at truth.dev/api.
Commits

Updates `truth-java8-extension` from 1.0.1 to 1.1 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #207 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/207 from google:dependabot/maven/truth.version-1.1 5780a5f5c5e1629d63fbe3af3cbdd9b55f3d7384 PiperOrigin-RevId: 338252629 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d2f0a9d8..3691c4c9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.0.1 + 1.1 http://github.com/google/compile-testing From 2a47a5333134a3d0de68d8ddddf4d1b6e75f8012 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Wed, 21 Oct 2020 14:14:50 -0700 Subject: [PATCH 055/300] Update plugins. The update to maven-site-plugin fixes an error I saw during the release process: - java.lang.NoClassDefFoundError: org/apache/maven/doxia/siterenderer/DocumentContent The update to maven-javadoc-plugin does _not_ fix an error I saw during the release process: - package com.sun.tools.javac.api is declared in module jdk.compiler, which does not export it to the unnamed module So I worked around that one by building with JDK8 instead of JDK11. But we usually need to update maven-javadoc-plugin for some reason or another eventually, so let's just go with it. Now that these plugins are listed explicitly, Dependabot should keep them up to date for us. (Also, remove explicit specifications of "org.apache.maven.plugins." It is the default.) (I made these changes already in a release branch, but now I'm making them "for good." https://github.com/google/compile-testing/commits/compile-testing-0.19) RELNOTES=n/a PiperOrigin-RevId: 338337384 --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3691c4c9..f2280827 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,6 @@ - org.apache.maven.plugins maven-compiler-plugin 3.8.1 @@ -114,7 +113,6 @@ - org.apache.maven.plugins maven-release-plugin 2.5.3 @@ -123,10 +121,17 @@ - org.apache.maven.plugins maven-jar-plugin 3.2.0 + + maven-javadoc-plugin + 3.2.0 + + + maven-site-plugin + 3.9.1 + From cd2c0a8b86f079e68712f07a0e8cfdef1ab28ff4 Mon Sep 17 00:00:00 2001 From: Compile-Testing Team Date: Tue, 3 Nov 2020 17:02:20 -0800 Subject: [PATCH 056/300] Close JavaCompiler objects to avoid resource leaks RELNOTES=Close JavaCompiler objects to avoid resource leaks PiperOrigin-RevId: 340553115 --- .../com/google/testing/compile/Parser.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/testing/compile/Parser.java b/src/main/java/com/google/testing/compile/Parser.java index 849a9d2f..91dc36ab 100644 --- a/src/main/java/com/google/testing/compile/Parser.java +++ b/src/main/java/com/google/testing/compile/Parser.java @@ -34,6 +34,7 @@ import com.sun.source.util.TreeScanner; import com.sun.source.util.Trees; import com.sun.tools.javac.api.JavacTool; +import com.sun.tools.javac.util.Context; import java.io.IOException; import java.util.List; import java.util.Locale; @@ -56,6 +57,7 @@ static ParseResult parse(Iterable sources) { InMemoryJavaFileManager fileManager = new InMemoryJavaFileManager( compiler.getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8)); + Context context = new Context(); JavacTask task = ((JavacTool) compiler) .getTask( @@ -64,7 +66,8 @@ static ParseResult parse(Iterable sources) { diagnosticCollector, ImmutableSet.of(), ImmutableSet.of(), - sources); + sources, + context); try { Iterable parsedCompilationUnits = task.parse(); List> diagnostics = diagnosticCollector.getDiagnostics(); @@ -76,6 +79,8 @@ static ParseResult parse(Iterable sources) { sortDiagnosticsByKind(diagnostics), parsedCompilationUnits, Trees.instance(task)); } catch (IOException e) { throw new RuntimeException(e); + } finally { + DummyJavaCompilerSubclass.closeCompiler(context); } } @@ -175,4 +180,19 @@ Trees trees() { return trees; } } + + // JavaCompiler.compilerKey has protected access until Java 9, so this is a workaround. + private static final class DummyJavaCompilerSubclass extends com.sun.tools.javac.main.JavaCompiler { + private static void closeCompiler(Context context) { + com.sun.tools.javac.main.JavaCompiler compiler = context.get(compilerKey); + if (compiler != null) { + compiler.close(); + } + } + + private DummyJavaCompilerSubclass() { + // not instantiable + super(null); + } + } } From 80a9ee0c51eb169202efb4dd02d7a23ceb99d2f0 Mon Sep 17 00:00:00 2001 From: Compile-Testing Team Date: Mon, 30 Nov 2020 13:50:05 -0800 Subject: [PATCH 057/300] Added annotation processor path to Compiler RELNOTES=Add `withAnnotationProcessorPath()` to `Compiler`. PiperOrigin-RevId: 344881510 --- .../com/google/testing/compile/Compiler.java | 65 ++++++++++++++----- .../compile/AnnotationFileProcessor.java | 41 ++++++++++++ .../google/testing/compile/CompilerTest.java | 45 +++++++++++++ 3 files changed, 135 insertions(+), 16 deletions(-) create mode 100644 src/test/java/com/google/testing/compile/AnnotationFileProcessor.java diff --git a/src/main/java/com/google/testing/compile/Compiler.java b/src/main/java/com/google/testing/compile/Compiler.java index 4ebd657d..c716b602 100644 --- a/src/main/java/com/google/testing/compile/Compiler.java +++ b/src/main/java/com/google/testing/compile/Compiler.java @@ -59,7 +59,7 @@ public static Compiler javac() { /** Returns a {@link Compiler} that uses a given {@link JavaCompiler} instance. */ public static Compiler compiler(JavaCompiler javaCompiler) { return new AutoValue_Compiler( - javaCompiler, ImmutableList.of(), ImmutableList.of(), Optional.empty()); + javaCompiler, ImmutableList.of(), ImmutableList.of(), Optional.empty(), Optional.empty()); } abstract JavaCompiler javaCompiler(); @@ -73,6 +73,11 @@ public static Compiler compiler(JavaCompiler javaCompiler) { /** The compilation class path. If not present, the system class path is used. */ public abstract Optional> classPath(); + /** + * The annotation processor path. If not present, the system annotation processor path is used. + */ + public abstract Optional> annotationProcessorPath(); + /** * Uses annotation processors during compilation. These replace any previously specified. * @@ -92,7 +97,8 @@ public final Compiler withProcessors(Processor... processors) { * @return a new instance with the same options and the given processors */ public final Compiler withProcessors(Iterable processors) { - return copy(ImmutableList.copyOf(processors), options(), classPath()); + return copy( + ImmutableList.copyOf(processors), options(), classPath(), annotationProcessorPath()); } /** @@ -113,7 +119,8 @@ public final Compiler withOptions(Iterable options) { return copy( processors(), FluentIterable.from(options).transform(toStringFunction()).toList(), - classPath()); + classPath(), + annotationProcessorPath()); } /** @@ -128,12 +135,32 @@ public final Compiler withOptions(Iterable options) { */ @Deprecated public final Compiler withClasspathFrom(ClassLoader classloader) { - return copy(processors(), options(), Optional.of(getClasspathFromClassloader(classloader))); + return copy( + processors(), + options(), + Optional.of(getClasspathFromClassloader(classloader)), + annotationProcessorPath()); } /** Uses the given classpath for the compilation instead of the system classpath. */ public final Compiler withClasspath(Iterable classPath) { - return copy(processors(), options(), Optional.of(ImmutableList.copyOf(classPath))); + return copy( + processors(), + options(), + Optional.of(ImmutableList.copyOf(classPath)), + annotationProcessorPath()); + } + + /** + * Uses the given annotation processor path for the compilation instead of the system annotation + * processor path. + */ + public final Compiler withAnnotationProcessorPath(Iterable annotationProcessorPath) { + return copy( + processors(), + options(), + classPath(), + Optional.of(ImmutableList.copyOf(annotationProcessorPath))); } /** @@ -155,16 +182,10 @@ public final Compilation compile(Iterable files) { InMemoryJavaFileManager fileManager = new InMemoryJavaFileManager( javaCompiler().getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8)); - classPath() + classPath().ifPresent(path -> setLocation(fileManager, StandardLocation.CLASS_PATH, path)); + annotationProcessorPath() .ifPresent( - classPath -> { - try { - fileManager.setLocation(StandardLocation.CLASS_PATH, classPath); - } catch (IOException e) { - // impossible by specification - throw new UncheckedIOException(e); - } - }); + path -> setLocation(fileManager, StandardLocation.ANNOTATION_PROCESSOR_PATH, path)); CompilationTask task = javaCompiler() .getTask( @@ -247,10 +268,22 @@ private static ImmutableList getClasspathFromClassloader(ClassLoader curre return classpaths.stream().map(File::new).collect(toImmutableList()); } + private static void setLocation( + InMemoryJavaFileManager fileManager, StandardLocation location, ImmutableList path) { + try { + fileManager.setLocation(location, path); + } catch (IOException e) { + // impossible by specification + throw new UncheckedIOException(e); + } + } + private Compiler copy( ImmutableList processors, ImmutableList options, - Optional> classPath) { - return new AutoValue_Compiler(javaCompiler(), processors, options, classPath); + Optional> classPath, + Optional> annotationProcessorPath) { + return new AutoValue_Compiler( + javaCompiler(), processors, options, classPath, annotationProcessorPath); } } diff --git a/src/test/java/com/google/testing/compile/AnnotationFileProcessor.java b/src/test/java/com/google/testing/compile/AnnotationFileProcessor.java new file mode 100644 index 00000000..55f94774 --- /dev/null +++ b/src/test/java/com/google/testing/compile/AnnotationFileProcessor.java @@ -0,0 +1,41 @@ +package com.google.testing.compile; + +import com.google.common.collect.ImmutableSet; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.Filer; +import javax.annotation.processing.ProcessingEnvironment; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.TypeElement; +import javax.tools.StandardLocation; + +final class AnnotationFileProcessor extends AbstractProcessor { + + @Override + public synchronized void init(ProcessingEnvironment processingEnv) { + Filer filer = processingEnv.getFiler(); + try { + filer.getResource(StandardLocation.ANNOTATION_PROCESSOR_PATH, "", "tmp.txt"); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + @Override + public boolean process(Set annotations, RoundEnvironment roundEnv) { + return false; + } + + @Override + public Set getSupportedAnnotationTypes() { + return ImmutableSet.of("*"); + } + + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latestSupported(); + } +} diff --git a/src/test/java/com/google/testing/compile/CompilerTest.java b/src/test/java/com/google/testing/compile/CompilerTest.java index 126c719d..0b0a42a5 100644 --- a/src/test/java/com/google/testing/compile/CompilerTest.java +++ b/src/test/java/com/google/testing/compile/CompilerTest.java @@ -19,15 +19,19 @@ import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.Assert.assertThrows; import static org.junit.Assume.assumeTrue; import com.google.common.collect.ImmutableList; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; import java.util.Arrays; import java.util.Locale; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; import javax.annotation.processing.Processor; import javax.lang.model.SourceVersion; import javax.tools.JavaCompiler; @@ -198,6 +202,47 @@ public void classPath_customFiles_urlClassLoader() throws Exception { assertThat(compilation).succeeded(); } + @Test + public void annotationProcessorPath_empty() { + AnnotationFileProcessor processor = new AnnotationFileProcessor(); + Compiler compiler = + javac().withProcessors(processor).withAnnotationProcessorPath(ImmutableList.of()); + RuntimeException expected = + assertThrows( + RuntimeException.class, + () -> compiler.compile(JavaFileObjects.forSourceLines("Test", "class Test {}"))); + assumeTrue( + isJdk9OrLater()); // with JDK 8, NullPointerException is thrown instead of the expected + // exception, and this bug is fixed after JDK 8 + assertThat(expected).hasCauseThat().hasCauseThat().hasMessageThat().contains("tmp.txt"); + } + + @Test + public void annotationProcessorPath_customFiles() throws Exception { + AnnotationFileProcessor processor = new AnnotationFileProcessor(); + File jar = compileTestJar(); + // compile with only 'tmp.txt' on the annotation processor path + Compilation compilation = + javac() + .withProcessors(processor) + .withAnnotationProcessorPath(ImmutableList.of(jar)) + .compile(JavaFileObjects.forSourceLines("Test", "class Test {}")); + assertThat(compilation).succeeded(); + } + + /** + * Sets up a jar containing a single file 'tmp.txt', for use in annotation processor path tests. + */ + private static File compileTestJar() throws IOException { + File file = File.createTempFile("tmp", ".jar"); + try (ZipOutputStream zipOutput = new ZipOutputStream(new FileOutputStream(file))) { + ZipEntry entry = new ZipEntry("tmp.txt"); + zipOutput.putNextEntry(entry); + zipOutput.closeEntry(); + } + return file; + } + @Test public void releaseFlag() { assumeTrue(isJdk9OrLater()); From 68f3e81b9b823db65ba976708738eaf80eff143f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Dec 2020 10:37:34 -0800 Subject: [PATCH 058/300] Bump guava from 30.0-jre to 30.1-jre Bumps [guava](https://github.com/google/guava) from 30.0-jre to 30.1-jre.
Release notes

Sourced from guava's releases.

30.1

Maven

<dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
  <version>30.1-jre</version>
  <!-- or, for Android: -->
  <version>30.1-android</version>
</dependency>

Javadoc

JDiff

Changelog

  • Introduced a warning log message when running guava-android under a Java 7 VM. (Android VMs are unaffected.) This warning is not guaranteed to be logged when running under Java 7, so please don't rely on it as your only warning about future problems. If the warning itself causes you trouble, you can eliminate it by silencing the logger for com.google.common.base.MoreObjects$ToStringHelper (which is used only for this warning). This warning prepares for removing support for Java 7 in 2021. Please report any problems. We have tried to make the warning as safe as possible, but anytime a common library logs, there is the potential for NullPointerException or even deadlock. (To be clear, Guava will not log under Java 8 or Android, but it may log under Java 7.) (dc52e6e385)
  • base: Deprecated StandardSystemProperty.JAVA_EXT_DIRS. We do not plan to remove the API, but note that, under recent versions of Java, that property always has a value of null. (38abf07772)
  • net: Added HttpHeaders constants for Origin-Isolation and X-Request-ID. (a48fb4f724, 8319d201cd)
  • reflect: Added ClassInfo.isTopLevel(). (410627262b)
  • util.concurrent: Added ClosingFuture.submitAsync(AsyncClosingCallable). (c5e2d8d5cb)
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.guava:guava&package-manager=maven&previous-version=30.0-jre&new-version=30.1-jre)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #214 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/214 from google:dependabot/maven/com.google.guava-guava-30.1-jre 895cd4a393896047af2ca7efc8cd123904e76880 PiperOrigin-RevId: 347644495 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2280827..4828b6da 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 30.0-jre + 30.1-jre com.google.code.findbugs From cd5a3a2159a5344231821e50936488f3d503a52f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:21:57 -0800 Subject: [PATCH 059/300] Bump plexus-java from 1.0.5 to 1.0.6 Bumps [plexus-java](https://github.com/codehaus-plexus/plexus-languages) from 1.0.5 to 1.0.6.
Commits
  • 2937198 [maven-release-plugin] prepare release plexus-languages-1.0.6
  • e24c115 manage maven-javadoc-plugin version in root pom
  • 695c2ca Update maven-shared-resources for maven-checkstyle-plugin
  • 6473afc Bump guice from 4.1.0 to 4.2.3
  • 50a010b Bump actions/cache from v2.1.2 to v2.1.3
  • 4c4cb8a Bump release-drafter/release-drafter from v5.11.0 to v5.13.0
  • 9371442 Bump maven-enforcer-plugin from 3.0.0-M1 to 3.0.0-M3
  • bf4bb54 Bump plexus from 6.5 to 7
  • 1802e9f Bump sisu-maven-plugin from 0.3.3 to 0.3.4
  • eaba96a Bump maven-failsafe-plugin from 2.21.0 to 2.22.2
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=1.0.5&new-version=1.0.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #216 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/216 from google:dependabot/maven/org.codehaus.plexus-plexus-java-1.0.6 adf29d37d7cb5a5f565d92899beee4856427bac9 PiperOrigin-RevId: 351168574 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4828b6da..86bd1837 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ org.codehaus.plexus plexus-java - 1.0.5 + 1.0.6 From 01fd8027725fbc289a00488486817c928a49b071 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Jan 2021 07:07:24 -0800 Subject: [PATCH 060/300] Bump error_prone_annotations from 2.4.0 to 2.5.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.4.0 to 2.5.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.5.0

New checks:

... (truncated)

Commits
  • 45ad90d Prepare for 2.5.0 release
  • f7c5e6c Improve handling of type parameter names that start with _
  • 99968c5 Delete examples/
  • e5d52dd Don't crash for CaseKind.RULE in UnnecessaryDefaultInEnumSwitch
  • ec44083 Fix IntelliJ google-java-format config
  • 06fc8e8 Remove disabled-by-default ParameterNotNullable check
  • 92fd464 Move BanSerializableRead annotations to an internal package
  • ea7b968 Support Pattern.split in StringSplitter
  • 83ad9b6 Fix a crash on var in DefaultCharset
  • ea312c9 Don't make UnnecessarilyFullyQualified suggestions in package-infos
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.4.0&new-version=2.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #217 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/217 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.5.0 89e063acaf023c41d3abba3818b4a85faae74f4c PiperOrigin-RevId: 351578753 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 86bd1837..3539c7a2 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.errorprone error_prone_annotations - 2.4.0 + 2.5.0 provided From 8ea0cf59eed8c91075800244e65e19276cb41154 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 08:51:53 -0800 Subject: [PATCH 061/300] Bump error_prone_annotations from 2.5.0 to 2.5.1 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.5.0 to 2.5.1.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.5.1

Changes

  • Fixed crashes when running on JDK 8 (#2092, #2099)
  • False positive in DifferentNameButSame (#2094)
  • False positive in UnnecessaryOptionalGet (#2101)
  • False positive in UnnecessaryMethodReference (#2102)
  • Fixed a regression in JDK 16-EA support (#2105)
Commits
  • 5e733ac Release Error Prone 2.5.1
  • 4f69766 Support pre-JDK-8044853 early-desugaring of JCNewClass
  • 6861403 Don't set checks as disableable = false in external
  • a7f3413 Handle classes with explicit enclosing instances in DifferentNameButSame
  • 7a65117 Symbol.isLocal was renamed in JDK 16
  • fb6d049 Don't suggest private constructors for abstract classes
  • 7d93df4 Fix handling of super:: method references in UnnecessaryMethodReference
  • b1eaa17 Only report UnnecessaryOptionalGet findings if the receivers are identical
  • 144c760 Address a VisibleForTestingUsed finding
  • 0951985 Generate Javadoc in CI pipeline
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.5.0&new-version=2.5.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #218 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/218 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.5.1 56ae7f061e6cbbd687bc96d1e31c45075c57c553 PiperOrigin-RevId: 352017931 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3539c7a2..6a3c338f 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.errorprone error_prone_annotations - 2.5.0 + 2.5.1 provided From 6026e3a6916bbcb8ae884433353c8e2cc3ee7cf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Jan 2021 07:21:18 -0800 Subject: [PATCH 062/300] Bump truth.version from 1.1 to 1.1.1 Bumps `truth.version` from 1.1 to 1.1.1. Updates `truth` from 1.1 to 1.1.1
Release notes

Sourced from truth's releases.

1.1.1

  • Made it possible for users to exclude our JUnit 4 dependency and still use standard Truth assertions. (JUnit 4 is still required for some advanced features, like Expect, ExpectFailure, and TruthJUnit.assume().) (2d65326ec)
Commits

Updates `truth-java8-extension` from 1.1 to 1.1.1 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #219 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/219 from google:dependabot/maven/truth.version-1.1.1 80631393ae85fa20c0d30dc6417830a697493bfd PiperOrigin-RevId: 353236613 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a3c338f..4e763b75 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.1 + 1.1.1 http://github.com/google/compile-testing From b9dc6bca45bea49d4b5408fe393b33b7367aa62b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jan 2021 07:06:57 -0800 Subject: [PATCH 063/300] Bump truth.version from 1.1.1 to 1.1.2 Bumps `truth.version` from 1.1.1 to 1.1.2. Updates `truth` from 1.1.1 to 1.1.2
Release notes

Sourced from truth's releases.

1.1.2

This release completes the feature that I got wrong in 1.1.1 -- the ability to exclude our JUnit 4 dependency and still use standard Truth assertions.

  • Made it possible for users to exclude our JUnit 4 dependency and still use standard Truth assertions -- really this time, even in cases in which excluding the dependency failed under 1.1.1. (JUnit 4 is still required for some advanced features, like Expect, ExpectFailure, and TruthJUnit.assume().) (948f3edca)
  • When JUnit 4 is excluded from the classpath, the AssertionError Truth generates as a substitute for ComparisonFailure now includes the expected and actual values that were missing in 1.1.1. (6b0140730)
Commits

Updates `truth-java8-extension` from 1.1.1 to 1.1.2 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #220 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/220 from google:dependabot/maven/truth.version-1.1.2 0c0d677056771c38e212ea8376fbd2bfe9205250 PiperOrigin-RevId: 353639207 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e763b75..1d8c4783 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.1.1 + 1.1.2 http://github.com/google/compile-testing From 77a7df8e9608f8b776ba16e8780d1e5421ebf76b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Feb 2021 23:07:24 -0800 Subject: [PATCH 064/300] Bump junit from 4.13.1 to 4.13.2 Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2.
Release notes

Sourced from junit's releases.

JUnit 4.13.2

Please refer to the release notes for details.

Commits
  • 05fe2a6 [maven-release-plugin] prepare release r4.13.2
  • ff57344 Add build for JDK 17-ea
  • 02aaa01 Improve check that thread is stopped
  • e9a75f4 Merge test for exception type and message
  • d27ad52 Rename DelegateStatement to DelegatingStatement
  • b83dc2e Better name for test that stops statement
  • 527f3a3 Replace InfiniteLoop with RunForASecond
  • 2db6394 Tidy up FailOnTimeoutTest
  • 64634e1 Update 4.13.2 release notes to document pull 1654
  • f8ee412 Fix serialization of AssumptionViolatedException (#1654)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=junit:junit&package-manager=maven&previous-version=4.13.1&new-version=4.13.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #221 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/221 from google:dependabot/maven/junit-junit-4.13.2 5a63a12b56648790276e73206d771d7fa4ec0189 PiperOrigin-RevId: 357654068 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d8c4783..8a26f5a3 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ junit junit - 4.13.1 + 4.13.2 com.google.truth From 057d60a95ccf9aef4e552c72b14a6db29738f4d5 Mon Sep 17 00:00:00 2001 From: Colin Decker Date: Thu, 18 Mar 2021 12:25:58 -0700 Subject: [PATCH 065/300] Create GitHub Actions config for compile-testing. RELNOTES=n/a PiperOrigin-RevId: 363717271 --- .github/workflows/ci.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..9ad73fda --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,37 @@ +name: CI + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + test: + name: "JDK ${{ matrix.java }}" + strategy: + matrix: + java: [ 8, 11 ] + runs-on: ubuntu-latest + steps: + - name: 'Check out repository' + uses: actions/checkout@v2 + - name: 'Cache local Maven repository' + uses: actions/cache@v2.1.4 + with: + path: ~/.m2/repository + key: maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + maven- + - name: 'Set up JDK ${{ matrix.java }}' + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: 'Install' + shell: bash + run: mvn -B -U install clean --fail-never --quiet -DskipTests=true -Dinvoker.skip=true + - name: 'Test' + shell: bash + run: mvn -B verify From acad2ea3947ae10acf695b419f09622fe9e22549 Mon Sep 17 00:00:00 2001 From: Colin Decker Date: Thu, 18 Mar 2021 12:55:51 -0700 Subject: [PATCH 066/300] Remove Travis config for compile-testing. RELNOTES=n/a PiperOrigin-RevId: 363724532 --- .travis.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0f73e167..00000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: java -install: mvn -B -U install clean --fail-never --quiet -DskipTests=true -Dinvoker.skip=true -script: mvn -B verify - -jdk: - - openjdk8 - - openjdk11 - -notifications: - email: false - -branches: - only: - - master - - /^release.*$/ From e361a68f10ae390defda84da9fa716b01ae15769 Mon Sep 17 00:00:00 2001 From: Colin Decker Date: Thu, 18 Mar 2021 13:12:39 -0700 Subject: [PATCH 067/300] Update Build Status badge for compile-testing. RELNOTES=n/a PiperOrigin-RevId: 363728983 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index afbc0433..b604a819 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Compile Testing =============== -[![Build Status][travis-shield]][travis-link] +[![Build Status][ci-shield]][ci-link] [![Maven Release][maven-shield]][maven-link] [![Javadoc][javadoc-shield]][javadoc-link] @@ -24,8 +24,8 @@ License See the License for the specific language governing permissions and limitations under the License. -[travis-shield]: https://travis-ci.org/google/compile-testing.svg?branch=master -[travis-link]: https://travis-ci.org/google/compile-testing +[ci-shield]: https://github.com/google/compile-testing/actions/workflows/ci.yml/badge.svg?branch=master +[ci-link]: https://github.com/google/compile-testing/actions [maven-shield]: https://img.shields.io/maven-central/v/com.google.testing.compile/compile-testing.png [maven-link]: https://search.maven.org/artifact/com.google.testing.compile/compile-testing [javadoc-shield]: https://javadoc.io/badge/com.google.testing.compile/compile-testing.svg?color=blue From 4096df9c2e9f4cb62e041a8e40b86c65ff98373a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 07:03:33 -0700 Subject: [PATCH 068/300] Bump guava from 30.1-jre to 30.1.1-jre Bumps [guava](https://github.com/google/guava) from 30.1-jre to 30.1.1-jre.
Release notes

Sourced from guava's releases.

30.1.1

Maven

<dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
  <version>30.1.1-jre</version>
  <!-- or, for Android: -->
  <version>30.1.1-android</version>
</dependency>

Javadoc

JDiff

Changelog

  • Increased the aggressiveness of Guava 30.1's warning log message for running guava-android under a Java 7 VM. (Android VMs are unaffected.) If the warning itself causes you trouble, you can eliminate it by silencing the logger for com.google.common.base.Preconditions (which is used only for this warning). This warning prepares for removing support for Java 7 in 2021. Please report any problems. We have tried to make the warning as safe as possible, but anytime a common library logs, especially as aggressively as we do in this new release, there is the potential for NullPointerException or even deadlock. (To be clear, Guava will not log under Java 8 or Android, but it will under Java 7.) (00c25e9b11)
  • cache: Fixed compatibility between asMap().compute(...) and a load. (42bf4f4eb7)
  • cache: Added @CheckReturnValue to some APIs. (a5ef129ffc)
  • collect: Added @DoNotCall to the mutator methods on immutable types (6ae9532d11)
  • hash: Removed @Beta from HashCode. (2c9f161e10)
  • io: Removed @Beta from CountingOutputStream. (d394bac847)
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.guava:guava&package-manager=maven&previous-version=30.1-jre&new-version=30.1.1-jre)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #226 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/226 from google:dependabot/maven/com.google.guava-guava-30.1.1-jre dca31e656bf9035e83c35a512ff8ef2632791487 PiperOrigin-RevId: 364308346 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a26f5a3..d5f45daa 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 30.1-jre + 30.1.1-jre com.google.code.findbugs From 1142aec50b90d6c3b2d86c45276f58611e7f02c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Mar 2021 06:35:02 -0700 Subject: [PATCH 069/300] Bump auto-value from 1.7.4 to 1.7.5 Bumps [auto-value](https://github.com/google/auto) from 1.7.4 to 1.7.5.
Release notes

Sourced from auto-value's releases.

AutoValue 1.7.5

  • Added @ToPrettyString for generating pretty String versions for AutoValue types. (9e9be9fa)
  • AutoValue property builders can now have a single parameter which is passed to the constructor of the new builder. (f19117aa)
  • AutoValue now copies annotations from type parameters of an @AutoValue class to the subclass generated by the @Memoized extension. (77de95c3)
  • Avoid surprising behaviour when getters are prefixed and setters are not, and a property name begins with two capital letters. (1bfc3b53)
  • The methods returned by BuilderContext.buildMethod() and .toBuilderMethods() can be inherited. (f2cb2247)
  • Fixed a bug which could lead to the same AutoValue extension being run more than once. (f40317ae)
  • AutoAnnotationProcessor and AutoServiceProcessor no longer claim their annotations. (c27b527a)
  • @AutoAnnotation instances are now serializable. (7eb2d47a)
  • Fully qualify @Override to avoid name conflicts (85af4437)
  • AutoValue error messages now have short [tags] so they can be correlated by tools. (c6e35e68)
Commits
  • ec51378 Set version number for auto-value-parent to 1.7.5.
  • f14d633 Reduce the number of warnings from CompileWithEclipseTest.
  • e5368f7 Add a @CopyAnnotations to an AutoValueTest class to suppress warnings in ...
  • 59ca137 Bump guava from 30.1-jre to 30.1.1-jre in /factory
  • db49dd1 Bump guava.version from 30.1-jre to 30.1.1-jre in /common
  • 5267864 Bump guava.version from 30.1-jre to 30.1.1-jre in /service
  • 21c6334 Bump guava.version from 30.1-jre to 30.1.1-jre in /value
  • 6dd9ae5 Update a JUnit dependency version.
  • af23e84 Restructure PropertyBuilderClassifier to use more general types.
  • 89c0e53 Sync "How do I..." between builders.md and builders-howto.md.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.7.4&new-version=1.7.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #227 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/227 from google:dependabot/maven/com.google.auto.value-auto-value-1.7.5 f7392e3f4dad05f607da168155919941e8a7ae23 PiperOrigin-RevId: 364544918 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5f45daa..2ba4c590 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ com.google.auto.value auto-value - 1.7.4 + 1.7.5 com.google.auto From 95e749db88ef949fb29ca1348d96cf6583331885 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Tue, 23 Mar 2021 08:37:17 -0700 Subject: [PATCH 070/300] Allow sources being compiled to be read from annotation processors. Fixes #189. RELNOTES=Allow sources being compiled to be read from annotation processors. PiperOrigin-RevId: 364564477 --- .../com/google/testing/compile/Compiler.java | 1 + .../compile/InMemoryJavaFileManager.java | 76 ++++++++++++---- .../compile/CompilationSubjectTest.java | 6 +- .../google/testing/compile/CompilerTest.java | 54 ++++++++++- .../JarFileResourcesCompilationTest.java | 16 ++-- .../JavaSourcesSubjectFactoryTest.java | 91 +++++++++---------- .../{ => test}/HelloWorld-broken.java | 0 .../{ => test}/HelloWorld-different.java | 0 .../resources/{ => test}/HelloWorld-v2.java | 0 src/test/resources/{ => test}/HelloWorld.java | 0 10 files changed, 164 insertions(+), 80 deletions(-) rename src/test/resources/{ => test}/HelloWorld-broken.java (100%) rename src/test/resources/{ => test}/HelloWorld-different.java (100%) rename src/test/resources/{ => test}/HelloWorld-v2.java (100%) rename src/test/resources/{ => test}/HelloWorld.java (100%) diff --git a/src/main/java/com/google/testing/compile/Compiler.java b/src/main/java/com/google/testing/compile/Compiler.java index c716b602..296b7dc0 100644 --- a/src/main/java/com/google/testing/compile/Compiler.java +++ b/src/main/java/com/google/testing/compile/Compiler.java @@ -182,6 +182,7 @@ public final Compilation compile(Iterable files) { InMemoryJavaFileManager fileManager = new InMemoryJavaFileManager( javaCompiler().getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8)); + fileManager.addSourceFiles(files); classPath().ifPresent(path -> setLocation(fileManager, StandardLocation.CLASS_PATH, path)); annotationProcessorPath() .ifPresent( diff --git a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java index 94d4b360..b6e0d8a7 100644 --- a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java +++ b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java @@ -15,6 +15,8 @@ */ package com.google.testing.compile; +import static com.google.common.collect.MoreCollectors.toOptional; + import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; @@ -32,7 +34,8 @@ import java.io.Writer; import java.net.URI; import java.nio.charset.Charset; -import java.util.Map.Entry; +import java.util.HashMap; +import java.util.Map; import javax.tools.FileObject; import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; @@ -47,13 +50,17 @@ */ // TODO(gak): under java 1.7 this could all be done with a PathFileManager final class InMemoryJavaFileManager extends ForwardingStandardJavaFileManager { - private final LoadingCache inMemoryFileObjects = - CacheBuilder.newBuilder().build(new CacheLoader() { - @Override - public JavaFileObject load(URI key) { - return new InMemoryJavaFileObject(key); - } - }); + private final LoadingCache inMemoryOutputs = + CacheBuilder.newBuilder() + .build( + new CacheLoader() { + @Override + public JavaFileObject load(URI key) { + return new InMemoryJavaFileObject(key); + } + }); + + private final Map inMemoryInputs = new HashMap<>(); InMemoryJavaFileManager(StandardJavaFileManager fileManager) { super(fileManager); @@ -86,40 +93,64 @@ public boolean isSameFile(FileObject a, FileObject b) { public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException { if (location.isOutputLocation()) { - return inMemoryFileObjects.getIfPresent( - uriForFileObject(location, packageName, relativeName)); - } else { - return super.getFileForInput(location, packageName, relativeName); + return inMemoryOutputs.getIfPresent(uriForFileObject(location, packageName, relativeName)); } + Optional inMemoryInput = findInMemoryInput(packageName, relativeName); + if (inMemoryInput.isPresent()) { + return inMemoryInput.get(); + } + return super.getFileForInput(location, packageName, relativeName); } @Override public JavaFileObject getJavaFileForInput(Location location, String className, Kind kind) throws IOException { if (location.isOutputLocation()) { - return inMemoryFileObjects.getIfPresent(uriForJavaFileObject(location, className, kind)); - } else { - return super.getJavaFileForInput(location, className, kind); + return inMemoryOutputs.getIfPresent(uriForJavaFileObject(location, className, kind)); + } + Optional inMemoryInput = findInMemoryInput(className); + if (inMemoryInput.isPresent()) { + return inMemoryInput.get(); } + return super.getJavaFileForInput(location, className, kind); + } + + private Optional findInMemoryInput(String className) { + int lastDot = className.lastIndexOf('.'); + return findInMemoryInput( + lastDot == -1 ? "" : className.substring(0, lastDot - 1), + className.substring(lastDot + 1) + ".java"); + } + + private Optional findInMemoryInput(String packageName, String relativeName) { + // Assume each input file's URI ends with the package/relative name. It might have other parts + // to the left. + String suffix = + packageName.isEmpty() ? relativeName : packageName.replace('.', '/') + "/" + relativeName; + return Optional.fromJavaUtil( + inMemoryInputs.entrySet().stream() + .filter(entry -> entry.getKey().getPath().endsWith(suffix)) + .map(Map.Entry::getValue) + .collect(toOptional())); // Might have problems if more than one input file matches. } @Override public FileObject getFileForOutput(Location location, String packageName, String relativeName, FileObject sibling) throws IOException { URI uri = uriForFileObject(location, packageName, relativeName); - return inMemoryFileObjects.getUnchecked(uri); + return inMemoryOutputs.getUnchecked(uri); } @Override public JavaFileObject getJavaFileForOutput(Location location, String className, final Kind kind, FileObject sibling) throws IOException { URI uri = uriForJavaFileObject(location, className, kind); - return inMemoryFileObjects.getUnchecked(uri); + return inMemoryOutputs.getUnchecked(uri); } ImmutableList getGeneratedSources() { ImmutableList.Builder result = ImmutableList.builder(); - for (Entry entry : inMemoryFileObjects.asMap().entrySet()) { + for (Map.Entry entry : inMemoryOutputs.asMap().entrySet()) { if (entry.getKey().getPath().startsWith("/" + StandardLocation.SOURCE_OUTPUT.name()) && (entry.getValue().getKind() == Kind.SOURCE)) { result.add(entry.getValue()); @@ -129,7 +160,14 @@ ImmutableList getGeneratedSources() { } ImmutableList getOutputFiles() { - return ImmutableList.copyOf(inMemoryFileObjects.asMap().values()); + return ImmutableList.copyOf(inMemoryOutputs.asMap().values()); + } + + /** Adds files that should be available in the source path. */ + void addSourceFiles(Iterable files) { + for (JavaFileObject file : files) { + inMemoryInputs.put(file.toUri(), file); + } } private static final class InMemoryJavaFileObject extends SimpleJavaFileObject diff --git a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java index ae38a16a..01dc2fe8 100644 --- a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java +++ b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java @@ -77,13 +77,13 @@ public class CompilationSubjectTest { "}"); private static final JavaFileObject HELLO_WORLD_RESOURCE = - JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObjects.forResource("test/HelloWorld.java"); private static final JavaFileObject HELLO_WORLD_BROKEN_RESOURCE = - JavaFileObjects.forResource("HelloWorld-broken.java"); + JavaFileObjects.forResource("test/HelloWorld-broken.java"); private static final JavaFileObject HELLO_WORLD_DIFFERENT_RESOURCE = - JavaFileObjects.forResource("HelloWorld-different.java"); + JavaFileObjects.forResource("test/HelloWorld-different.java"); @RunWith(JUnit4.class) public static class StatusTest { diff --git a/src/test/java/com/google/testing/compile/CompilerTest.java b/src/test/java/com/google/testing/compile/CompilerTest.java index 0b0a42a5..272cf2db 100644 --- a/src/test/java/com/google/testing/compile/CompilerTest.java +++ b/src/test/java/com/google/testing/compile/CompilerTest.java @@ -23,17 +23,27 @@ import static org.junit.Assume.assumeTrue; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.io.UncheckedIOException; import java.net.URL; import java.net.URLClassLoader; import java.util.Arrays; import java.util.Locale; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.Filer; +import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.Processor; +import javax.annotation.processing.RoundEnvironment; import javax.lang.model.SourceVersion; +import javax.lang.model.element.TypeElement; +import javax.tools.FileObject; import javax.tools.JavaCompiler; import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject; @@ -52,7 +62,8 @@ public final class CompilerTest { @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder(); - private static final JavaFileObject HELLO_WORLD = JavaFileObjects.forResource("HelloWorld.java"); + private static final JavaFileObject HELLO_WORLD = + JavaFileObjects.forResource("test/HelloWorld.java"); @Test public void options() { @@ -230,6 +241,47 @@ public void annotationProcessorPath_customFiles() throws Exception { assertThat(compilation).succeeded(); } + @Test // See https://github.com/google/compile-testing/issues/189 + public void readInputFile() throws IOException { + AtomicReference content = new AtomicReference<>(); + Compilation compilation = + javac() + .withProcessors( + new AbstractProcessor() { + @Override + public synchronized void init(ProcessingEnvironment processingEnv) { + Filer filer = processingEnv.getFiler(); + try { + FileObject helloWorld = + filer.getResource( + StandardLocation.SOURCE_PATH, "test", "HelloWorld.java"); + content.set(helloWorld.getCharContent(true).toString()); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + @Override + public boolean process( + Set annotations, RoundEnvironment roundEnv) { + return false; + } + + @Override + public ImmutableSet getSupportedAnnotationTypes() { + return ImmutableSet.of("*"); + } + + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latestSupported(); + } + }) + .compile(HELLO_WORLD); + assertThat(compilation).succeeded(); + assertThat(content.get()).isEqualTo(HELLO_WORLD.getCharContent(true).toString()); + } + /** * Sets up a jar containing a single file 'tmp.txt', for use in annotation processor path tests. */ diff --git a/src/test/java/com/google/testing/compile/JarFileResourcesCompilationTest.java b/src/test/java/com/google/testing/compile/JarFileResourcesCompilationTest.java index 6b29fd05..62502b73 100644 --- a/src/test/java/com/google/testing/compile/JarFileResourcesCompilationTest.java +++ b/src/test/java/com/google/testing/compile/JarFileResourcesCompilationTest.java @@ -19,20 +19,18 @@ import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource; import com.google.common.io.Resources; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * An integration test to ensure that testing works when resources are in jar files. @@ -52,7 +50,7 @@ public void createJarFile() throws IOException { JarOutputStream out = new JarOutputStream(new FileOutputStream(jarFile)); JarEntry helloWorldEntry = new JarEntry("test/HelloWorld.java"); out.putNextEntry(helloWorldEntry); - out.write(Resources.toByteArray(Resources.getResource("HelloWorld.java"))); + out.write(Resources.toByteArray(Resources.getResource("test/HelloWorld.java"))); out.close(); } diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java index 114a5c29..9da6bdf5 100644 --- a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java +++ b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java @@ -25,9 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.ByteSource; -import com.google.common.io.Resources; import com.google.common.truth.ExpectFailure; -import com.google.common.truth.Truth; import java.util.Arrays; import javax.tools.Diagnostic; import javax.tools.JavaFileObject; @@ -43,7 +41,9 @@ */ @RunWith(JUnit4.class) public class JavaSourcesSubjectFactoryTest { - @Rule public final ExpectFailure expectFailure = new ExpectFailure(); + + private static final JavaFileObject HELLO_WORLD_RESOURCE = + JavaFileObjects.forResource("test/HelloWorld.java"); private static final JavaFileObject HELLO_WORLD = JavaFileObjects.forSourceLines( @@ -70,11 +70,11 @@ public class JavaSourcesSubjectFactoryTest { " Bar noSuchClass;", "}"); + @Rule public final ExpectFailure expectFailure = new ExpectFailure(); + @Test public void compilesWithoutError() { - assertAbout(javaSource()) - .that(JavaFileObjects.forResource(Resources.getResource("HelloWorld.java"))) - .compilesWithoutError(); + assertAbout(javaSource()).that(HELLO_WORLD_RESOURCE).compilesWithoutError(); assertAbout(javaSource()) .that( JavaFileObjects.forSourceLines( @@ -142,7 +142,7 @@ public void compilesWithoutError_noWarning() { @Test public void compilesWithoutError_warningNotInFile() { - JavaFileObject otherSource = JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObject otherSource = HELLO_WORLD_RESOURCE; expectFailure .whenTesting() .about(javaSource()) @@ -254,7 +254,7 @@ public void compilesWithoutError_noNote() { @Test public void compilesWithoutError_noteNotInFile() { - JavaFileObject otherSource = JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObject otherSource = HELLO_WORLD_RESOURCE; expectFailure .whenTesting() .about(javaSource()) @@ -334,7 +334,7 @@ public void compilesWithoutError_failureReportsFiles() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource(Resources.getResource("HelloWorld.java"))) + .that(HELLO_WORLD_RESOURCE) .processedWith(new FailingGeneratingProcessor()) .compilesWithoutError(); AssertionError expected = expectFailure.getFailure(); @@ -348,7 +348,7 @@ public void compilesWithoutError_throws() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld-broken.java")) + .that(JavaFileObjects.forResource("test/HelloWorld-broken.java")) .compilesWithoutError(); AssertionError expected = expectFailure.getFailure(); assertThat(expected) @@ -361,8 +361,8 @@ public void compilesWithoutError_throws() { public void compilesWithoutError_exceptionCreatedOrPassedThrough() { RuntimeException e = new RuntimeException(); try { - Truth.assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + assertAbout(javaSource()) + .that(HELLO_WORLD_RESOURCE) .processedWith(new ThrowingProcessor(e)) .compilesWithoutError(); fail(); @@ -377,7 +377,7 @@ public void compilesWithoutError_exceptionCreatedOrPassedThrough() { @Test public void parsesAs() { assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .parsesAs( JavaFileObjects.forSourceLines( "test.HelloWorld", @@ -393,9 +393,9 @@ public void parsesAs() { @Test public void parsesAs_expectedFileFailsToParse() { try { - Truth.assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .parsesAs(JavaFileObjects.forResource("HelloWorld-broken.java")); + assertAbout(javaSource()) + .that(HELLO_WORLD_RESOURCE) + .parsesAs(JavaFileObjects.forResource("test/HelloWorld-broken.java")); fail(); } catch (IllegalStateException expected) { assertThat(expected.getMessage()).startsWith("error while parsing:"); @@ -405,9 +405,9 @@ public void parsesAs_expectedFileFailsToParse() { @Test public void parsesAs_actualFileFailsToParse() { try { - Truth.assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld-broken.java")) - .parsesAs(JavaFileObjects.forResource("HelloWorld.java")); + assertAbout(javaSource()) + .that(JavaFileObjects.forResource("test/HelloWorld-broken.java")) + .parsesAs(HELLO_WORLD_RESOURCE); fail(); } catch (IllegalStateException expected) { assertThat(expected.getMessage()).startsWith("error while parsing:"); @@ -416,11 +416,7 @@ public void parsesAs_actualFileFailsToParse() { @Test public void failsToCompile_throws() { - expectFailure - .whenTesting() - .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) - .failsToCompile(); + expectFailure.whenTesting().about(javaSource()).that(HELLO_WORLD_RESOURCE).failsToCompile(); AssertionError expected = expectFailure.getFailure(); assertThat(expected.getMessage()) .contains("Compilation was expected to fail, but contained no errors"); @@ -432,7 +428,7 @@ public void failsToCompile_throwsNoMessage() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new ErrorProcessor()) .failsToCompile() .withErrorContaining("some error"); @@ -445,8 +441,8 @@ public void failsToCompile_throwsNoMessage() { @Test public void failsToCompile_throwsNotInFile() { - JavaFileObject fileObject = JavaFileObjects.forResource("HelloWorld.java"); - JavaFileObject otherFileObject = JavaFileObjects.forResource("HelloWorld-different.java"); + JavaFileObject fileObject = HELLO_WORLD_RESOURCE; + JavaFileObject otherFileObject = JavaFileObjects.forResource("test/HelloWorld-different.java"); expectFailure .whenTesting() .about(javaSource()) @@ -462,12 +458,11 @@ public void failsToCompile_throwsNotInFile() { "Expected an error containing \"expected error!\" in %s", otherFileObject.getName())); assertThat(expected.getMessage()).contains(fileObject.getName()); - // "(no associated file)"))); } @Test public void failsToCompile_throwsNotOnLine() { - JavaFileObject fileObject = JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObject fileObject = HELLO_WORLD_RESOURCE; expectFailure .whenTesting() .about(javaSource()) @@ -489,7 +484,7 @@ public void failsToCompile_throwsNotOnLine() { @Test public void failsToCompile_throwsNotAtColumn() { - JavaFileObject fileObject = JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObject fileObject = HELLO_WORLD_RESOURCE; expectFailure .whenTesting() .about(javaSource()) @@ -512,7 +507,7 @@ public void failsToCompile_throwsNotAtColumn() { @Test public void failsToCompile_wrongErrorCount() { - JavaFileObject fileObject = JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObject fileObject = HELLO_WORLD_RESOURCE; expectFailure .whenTesting() .about(javaSource()) @@ -543,7 +538,7 @@ public void failsToCompile_noWarning() { @Test public void failsToCompile_warningNotInFile() { - JavaFileObject otherSource = JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObject otherSource = HELLO_WORLD_RESOURCE; expectFailure .whenTesting() .about(javaSource()) @@ -636,7 +631,7 @@ public void failsToCompile_noNote() { @Test public void failsToCompile_noteNotInFile() { - JavaFileObject otherSource = JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObject otherSource = HELLO_WORLD_RESOURCE; expectFailure .whenTesting() .about(javaSource()) @@ -712,7 +707,7 @@ public void failsToCompile_wrongNoteCount() { @Test public void failsToCompile() { - JavaFileObject brokenFileObject = JavaFileObjects.forResource("HelloWorld-broken.java"); + JavaFileObject brokenFileObject = JavaFileObjects.forResource("test/HelloWorld-broken.java"); assertAbout(javaSource()) .that(brokenFileObject) .failsToCompile() @@ -723,7 +718,7 @@ public void failsToCompile() { .and() .withErrorCount(4); - JavaFileObject happyFileObject = JavaFileObjects.forResource("HelloWorld.java"); + JavaFileObject happyFileObject = HELLO_WORLD_RESOURCE; assertAbout(javaSource()) .that(happyFileObject) .processedWith(new ErrorProcessor()) @@ -737,7 +732,7 @@ public void failsToCompile() { @Test public void generatesSources() { assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -752,7 +747,7 @@ public void generatesSources_failOnUnexpected() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -770,7 +765,7 @@ public void generatesSources_failOnExtraExpected() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -793,7 +788,7 @@ public void generatesSources_failOnExtraActual() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -817,7 +812,7 @@ public void generatesSources_failWithNoCandidates() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -834,7 +829,7 @@ public void generatesSources_failWithNoGeneratedSources() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new NonGeneratingProcessor()) .compilesWithoutError() .and() @@ -849,7 +844,7 @@ public void generatesSources_failWithNoGeneratedSources() { @Test public void generatesFileNamed() { assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -862,7 +857,7 @@ public void generatesFileNamed_failOnFileExistence() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -880,7 +875,7 @@ public void generatesFileNamed_failOnFileContents() { expectFailure .whenTesting() .about(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -894,7 +889,7 @@ public void generatesFileNamed_failOnFileContents() { @Test public void withStringContents() { assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(new GeneratingProcessor()) .compilesWithoutError() .and() @@ -906,7 +901,7 @@ public void withStringContents() { public void passesOptions() { NoOpProcessor processor = new NoOpProcessor(); assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .withCompilerOptions("-Aa=1") .withCompilerOptions(ImmutableList.of("-Ab=2", "-Ac=3")) .processedWith(processor) @@ -924,7 +919,7 @@ public void invokesMultipleProcesors() { assertThat(noopProcessor1.invoked).isFalse(); assertThat(noopProcessor2.invoked).isFalse(); assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(noopProcessor1, noopProcessor2) .compilesWithoutError(); assertThat(noopProcessor1.invoked).isTrue(); @@ -938,7 +933,7 @@ public void invokesMultipleProcesors_asIterable() { assertThat(noopProcessor1.invoked).isFalse(); assertThat(noopProcessor2.invoked).isFalse(); assertAbout(javaSource()) - .that(JavaFileObjects.forResource("HelloWorld.java")) + .that(HELLO_WORLD_RESOURCE) .processedWith(Arrays.asList(noopProcessor1, noopProcessor2)) .compilesWithoutError(); assertThat(noopProcessor1.invoked).isTrue(); diff --git a/src/test/resources/HelloWorld-broken.java b/src/test/resources/test/HelloWorld-broken.java similarity index 100% rename from src/test/resources/HelloWorld-broken.java rename to src/test/resources/test/HelloWorld-broken.java diff --git a/src/test/resources/HelloWorld-different.java b/src/test/resources/test/HelloWorld-different.java similarity index 100% rename from src/test/resources/HelloWorld-different.java rename to src/test/resources/test/HelloWorld-different.java diff --git a/src/test/resources/HelloWorld-v2.java b/src/test/resources/test/HelloWorld-v2.java similarity index 100% rename from src/test/resources/HelloWorld-v2.java rename to src/test/resources/test/HelloWorld-v2.java diff --git a/src/test/resources/HelloWorld.java b/src/test/resources/test/HelloWorld.java similarity index 100% rename from src/test/resources/HelloWorld.java rename to src/test/resources/test/HelloWorld.java From a959de19a010f0fef98e65859a95648135977b89 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Tue, 23 Mar 2021 08:50:33 -0700 Subject: [PATCH 071/300] Replace use of Guava's `Optional` with the JDK's. Use a few lambdas where we can. A few other code cleanups. RELNOTES=n/a PiperOrigin-RevId: 364567071 --- .../compile/InMemoryJavaFileManager.java | 15 ++-- .../testing/compile/JavaSourcesSubject.java | 76 ++++++++----------- .../com/google/testing/compile/MoreTrees.java | 58 +++++++------- .../google/testing/compile/TreeDiffer.java | 15 ++-- 4 files changed, 75 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java index b6e0d8a7..5754a55a 100644 --- a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java +++ b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java @@ -18,7 +18,6 @@ import static com.google.common.collect.MoreCollectors.toOptional; import com.google.common.base.MoreObjects; -import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -36,6 +35,7 @@ import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import javax.tools.FileObject; import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; @@ -127,11 +127,10 @@ private Optional findInMemoryInput(String packageName, String re // to the left. String suffix = packageName.isEmpty() ? relativeName : packageName.replace('.', '/') + "/" + relativeName; - return Optional.fromJavaUtil( - inMemoryInputs.entrySet().stream() - .filter(entry -> entry.getKey().getPath().endsWith(suffix)) - .map(Map.Entry::getValue) - .collect(toOptional())); // Might have problems if more than one input file matches. + return inMemoryInputs.entrySet().stream() + .filter(entry -> entry.getKey().getPath().endsWith(suffix)) + .map(Map.Entry::getValue) + .collect(toOptional()); // Might have problems if more than one input file matches. } @Override @@ -173,7 +172,7 @@ void addSourceFiles(Iterable files) { private static final class InMemoryJavaFileObject extends SimpleJavaFileObject implements JavaFileObject { private long lastModified = 0L; - private Optional data = Optional.absent(); + private Optional data = Optional.empty(); InMemoryJavaFileObject(URI uri) { super(uri, JavaFileObjects.deduceKind(uri)); @@ -239,7 +238,7 @@ public long getLastModified() { @Override public boolean delete() { - this.data = Optional.absent(); + this.data = Optional.empty(); this.lastModified = 0L; return true; } diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 0163614a..f3439a13 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -21,17 +21,13 @@ import static com.google.testing.compile.Compiler.javac; import static com.google.testing.compile.JavaSourcesSubjectFactory.javaSources; -import com.google.common.base.Function; import com.google.common.base.Joiner; -import com.google.common.base.Optional; -import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.common.io.ByteSource; import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; @@ -39,6 +35,16 @@ import com.google.testing.compile.CompilationSubject.DiagnosticAtColumn; import com.google.testing.compile.CompilationSubject.DiagnosticInFile; import com.google.testing.compile.CompilationSubject.DiagnosticOnLine; +import com.google.testing.compile.CompileTester.ChainingClause; +import com.google.testing.compile.CompileTester.CleanCompilationClause; +import com.google.testing.compile.CompileTester.ColumnClause; +import com.google.testing.compile.CompileTester.CompilationWithWarningsClause; +import com.google.testing.compile.CompileTester.FileClause; +import com.google.testing.compile.CompileTester.GeneratedPredicateClause; +import com.google.testing.compile.CompileTester.LineClause; +import com.google.testing.compile.CompileTester.SuccessfulCompilationClause; +import com.google.testing.compile.CompileTester.SuccessfulFileClause; +import com.google.testing.compile.CompileTester.UnsuccessfulCompilationClause; import com.google.testing.compile.Parser.ParseResult; import com.sun.source.tree.CompilationUnitTree; import java.io.File; @@ -48,6 +54,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Optional; import javax.annotation.Nullable; import javax.annotation.processing.Processor; import javax.tools.Diagnostic; @@ -65,7 +72,7 @@ public final class JavaSourcesSubject extends Subject implements CompileTester, ProcessedCompileTesterFactory { private final Iterable actual; - private final List options = new ArrayList(Arrays.asList("-Xlint")); + private final List options = new ArrayList<>(Arrays.asList("-Xlint")); @Nullable private ClassLoader classLoader; @Nullable private ImmutableList classPath; @@ -142,7 +149,7 @@ private final class CompilationClause implements CompileTester { private final ImmutableSet processors; private CompilationClause() { - this(ImmutableSet.of()); + this(ImmutableSet.of()); } private CompilationClause(Iterable processors) { @@ -175,38 +182,23 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { final FluentIterable expectedTrees = FluentIterable.from(expectedResult.compilationUnits()); - Function> getTypesFunction = - new Function>() { - @Override - public ImmutableSet apply(CompilationUnitTree compilationUnit) { - return TypeEnumerator.getTopLevelTypes(compilationUnit); - } - }; - final ImmutableMap> expectedTreeTypes = - Maps.toMap(expectedTrees, getTypesFunction); + expectedTrees.toMap(TypeEnumerator::getTopLevelTypes); + final ImmutableMap> actualTreeTypes = - Maps.toMap(actualTrees, getTypesFunction); + actualTrees.toMap(TypeEnumerator::getTopLevelTypes); + final ImmutableMap> matchedTrees = - Maps.toMap( - expectedTrees, - new Function>() { - @Override - public Optional apply( - final CompilationUnitTree expectedTree) { - return Iterables.tryFind( - actualTrees, - new Predicate() { - @Override - public boolean apply(CompilationUnitTree actualTree) { - return expectedTreeTypes - .get(expectedTree) - .equals(actualTreeTypes.get(actualTree)); - } - }); - } - }); + expectedTrees.toMap( + expectedTree -> + actualTrees.stream() + .filter( + actualTree -> + expectedTreeTypes + .get(expectedTree) + .equals(actualTreeTypes.get(actualTree))) + .findFirst()); for (Map.Entry> matchedTreePair : matchedTrees.entrySet()) { @@ -239,15 +231,11 @@ private void failNoCandidates( .join( actualTrees .transform( - new Function() { - @Override - public String apply(CompilationUnitTree generated) { - return String.format( + generated -> + String.format( "- %s in <%s>", actualTypes.get(generated), - generated.getSourceFile().toUri().getPath()); - } - }) + generated.getSourceFile().toUri().getPath())) .toList()); failWithoutActual( simpleFact( @@ -350,8 +338,8 @@ private CompilationClause newCompilationClause(Iterable pro /** * Base implementation of {@link CompilationWithWarningsClause}. * - * @param T the type parameter for {@link CompilationWithWarningsClause}. {@code this} must be an - * instance of {@code T}; otherwise some calls will throw {@link ClassCastException}. + * @param the type parameter for {@link CompilationWithWarningsClause}. {@code this} must be + * an instance of {@code T}; otherwise some calls will throw {@link ClassCastException}. */ abstract class CompilationWithWarningsBuilder implements CompilationWithWarningsClause { protected final Compilation compilation; @@ -463,7 +451,7 @@ public ChainingClause atColumn(long columnNumber) { * Base implementation of {@link GeneratedPredicateClause GeneratedPredicateClause} and {@link * ChainingClause ChainingClause>}. * - * @param T the type parameter to {@link GeneratedPredicateClause}. {@code this} must be an + * @param the type parameter to {@link GeneratedPredicateClause}. {@code this} must be an * instance of {@code T}. */ private abstract class GeneratedCompilationBuilder extends CompilationWithWarningsBuilder diff --git a/src/main/java/com/google/testing/compile/MoreTrees.java b/src/main/java/com/google/testing/compile/MoreTrees.java index a7ff86a1..931dc687 100644 --- a/src/main/java/com/google/testing/compile/MoreTrees.java +++ b/src/main/java/com/google/testing/compile/MoreTrees.java @@ -15,7 +15,6 @@ */ package com.google.testing.compile; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -35,6 +34,7 @@ import com.sun.source.util.TreePath; import com.sun.source.util.TreePathScanner; import java.util.Arrays; +import java.util.Optional; import javax.annotation.Nullable; /** @@ -70,7 +70,7 @@ static ParseResult parseLines(Iterable source) { /** * Finds the first instance of the given {@link Tree.Kind} that is a subtree of the root provided. * - * @throw IllegalArgumentException if no such subtree exists. + * @throws IllegalArgumentException if no such subtree exists. */ static Tree findSubtree(CompilationUnitTree root, Tree.Kind treeKind) { return findSubtree(root, treeKind, null); @@ -82,10 +82,10 @@ static Tree findSubtree(CompilationUnitTree root, Tree.Kind treeKind) { * *

See the doc on {@link #findSubtreePath} for details on the identifier param. * - * @throw IllegalArgumentException if no such subtree exists. + * @throws IllegalArgumentException if no such subtree exists. */ - static Tree findSubtree(CompilationUnitTree root, Tree.Kind treeKind, - @Nullable String identifier) { + static Tree findSubtree( + CompilationUnitTree root, Tree.Kind treeKind, @Nullable String identifier) { return findSubtreePath(root, treeKind, identifier).getLeaf(); } @@ -93,7 +93,7 @@ static Tree findSubtree(CompilationUnitTree root, Tree.Kind treeKind, * Finds a path to the first instance of the given {@link Tree.Kind} that is a subtree of the root * provided. * - * @throw IllegalArgumentException if no such subtree exists. + * @throws IllegalArgumentException if no such subtree exists. */ static TreePath findSubtreePath(CompilationUnitTree root, Tree.Kind treeKind) { return findSubtreePath(root, treeKind, null); @@ -121,8 +121,7 @@ static TreePath findSubtreePath(CompilationUnitTree root, Tree.Kind treeKind) { */ static TreePath findSubtreePath(CompilationUnitTree root, Tree.Kind treeKind, @Nullable String identifier) { - SearchScanner subtreeFinder = new SearchScanner(treeKind, - (identifier == null) ? Optional.absent() : Optional.of(identifier)); + SearchScanner subtreeFinder = new SearchScanner(treeKind, Optional.ofNullable(identifier)); Optional res = subtreeFinder.scan(root, null); Preconditions.checkArgument(res.isPresent(), "Couldn't find any subtree matching the given " + "criteria. Root: %s, Class: %s, Identifier: %s", root, treeKind, identifier); @@ -152,8 +151,7 @@ private boolean isMatch(Tree node, Optional idValue) { } else if (!idValue.isPresent()) { idsMatch = false; } else { - idsMatch = (idValue.get() == null && identifier.get() == null) - || identifier.get().equals(idValue.get().toString()); + idsMatch = identifier.get().equals(idValue.get().toString()); } return kindSought.equals(node.getKind()) && idsMatch; } @@ -163,7 +161,7 @@ private boolean isMatch(Tree node, Optional idValue) { * and kind sought. */ private boolean isMatch(Tree node, Object idValue) { - return isMatch(node, Optional.fromNullable(idValue)); + return isMatch(node, Optional.ofNullable(idValue)); } /** Returns a TreePath that includes the current path plus the node provided */ @@ -172,27 +170,27 @@ private Optional currentPathPlus(Tree node) { } /** - * Returns the {@code Optional} value given, or {@code Optional.absent()} if the value given - * was {@code null}. + * Returns the {@code Optional} value given, or {@code Optional.empty()} if the value given was + * {@code null}. */ private Optional absentIfNull(Optional ret) { - return (ret != null) ? ret : Optional.absent(); + return (ret != null) ? ret : Optional.empty(); } @Override public Optional scan(Tree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } - return isMatch(node, Optional.absent()) - ? currentPathPlus(node) : absentIfNull(super.scan(node, v)); + return isMatch(node, Optional.empty()) + ? currentPathPlus(node) + : absentIfNull(super.scan(node, v)); } @Override public Optional scan(Iterable nodes, Void v) { - Optional ret = super.scan(nodes, v); - return (ret != null) ? ret : Optional.absent(); + return absentIfNull(super.scan(nodes, v)); } /** Returns the first present value. If both values are absent, then returns absent .*/ @@ -204,16 +202,16 @@ public Optional reduce(Optional t1, Optional t2) { @Override public Optional visitBreak(@Nullable BreakTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } - return isMatch(node, node.getLabel()) ? currentPathPlus(node) : Optional.absent(); + return isMatch(node, node.getLabel()) ? currentPathPlus(node) : Optional.empty(); } @Override public Optional visitClass(@Nullable ClassTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getSimpleName())) { return currentPathPlus(node); } @@ -224,7 +222,7 @@ public Optional visitClass(@Nullable ClassTree node, Void v) { @Override public Optional visitContinue(@Nullable ContinueTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getLabel())) { return currentPathPlus(node); } @@ -235,7 +233,7 @@ public Optional visitContinue(@Nullable ContinueTree node, Void v) { @Override public Optional visitIdentifier(@Nullable IdentifierTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getName())) { return currentPathPlus(node); } @@ -246,7 +244,7 @@ public Optional visitIdentifier(@Nullable IdentifierTree node, Void v) @Override public Optional visitLabeledStatement(@Nullable LabeledStatementTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getLabel())) { return currentPathPlus(node); } @@ -257,7 +255,7 @@ public Optional visitLabeledStatement(@Nullable LabeledStatementTree n @Override public Optional visitLiteral(@Nullable LiteralTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getValue())) { return currentPathPlus(node); } @@ -268,7 +266,7 @@ public Optional visitLiteral(@Nullable LiteralTree node, Void v) { @Override public Optional visitMethod(@Nullable MethodTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getName())) { return currentPathPlus(node); } @@ -279,7 +277,7 @@ public Optional visitMethod(@Nullable MethodTree node, Void v) { @Override public Optional visitMemberSelect(@Nullable MemberSelectTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getIdentifier())) { return currentPathPlus(node); } @@ -290,7 +288,7 @@ public Optional visitMemberSelect(@Nullable MemberSelectTree node, Voi @Override public Optional visitTypeParameter(@Nullable TypeParameterTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getName())) { return currentPathPlus(node); } @@ -301,7 +299,7 @@ public Optional visitTypeParameter(@Nullable TypeParameterTree node, V @Override public Optional visitVariable(@Nullable VariableTree node, Void v) { if (node == null) { - return Optional.absent(); + return Optional.empty(); } else if (isMatch(node, node.getName())) { return currentPathPlus(node); } diff --git a/src/main/java/com/google/testing/compile/TreeDiffer.java b/src/main/java/com/google/testing/compile/TreeDiffer.java index f047ab25..d74699c3 100644 --- a/src/main/java/com/google/testing/compile/TreeDiffer.java +++ b/src/main/java/com/google/testing/compile/TreeDiffer.java @@ -24,9 +24,9 @@ import com.google.common.base.Equivalence; import com.google.common.base.Joiner; import com.google.common.base.Objects; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import com.google.errorprone.annotations.FormatMethod; import com.sun.source.tree.AnnotationTree; import com.sun.source.tree.ArrayAccessTree; import com.sun.source.tree.ArrayTypeTree; @@ -84,6 +84,7 @@ import com.sun.source.util.Trees; import java.util.HashSet; import java.util.Iterator; +import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; import javax.lang.model.element.Name; @@ -145,14 +146,13 @@ private static TreeDifference createDiff( } /** - * Returns a {@link TreeDifference} describing the difference between the two - * sub-{@code Tree}s. The trees diffed are the leaves of the {@link TreePath}s - * provided. + * Returns a {@link TreeDifference} describing the difference between the two sub-{@code Tree}s. + * The trees diffed are the leaves of the {@link TreePath}s provided. * *

Used for testing. */ - static final TreeDifference diffSubtrees(@Nullable TreePath pathToExpected, - @Nullable TreePath pathToActual) { + static TreeDifference diffSubtrees( + @Nullable TreePath pathToExpected, @Nullable TreePath pathToActual) { TreeDifference.Builder diffBuilder = new TreeDifference.Builder(); DiffVisitor diffVisitor = new DiffVisitor(diffBuilder, TreeFilter.KEEP_ALL, pathToExpected, pathToActual); @@ -202,6 +202,7 @@ public void addTypeMismatch(Tree expected, Tree actual) { * Adds a {@code TwoWayDiff} if the predicate given evaluates to false. The {@code TwoWayDiff} * is parameterized by the {@code Tree}s and message format provided. */ + @FormatMethod private void checkForDiff(boolean p, String message, Object... formatArgs) { if (!p) { diffBuilder.addDifferingNodes(expectedPath, actualPath, String.format(message, formatArgs)); @@ -986,7 +987,7 @@ private Optional checkTypeAndCast(T expected, Tree actual) { T treeAsExpectedType = (T) actual; return Optional.of(treeAsExpectedType); } else { - return Optional.absent(); + return Optional.empty(); } } } From 1f8424662cfa31efbae2d2fb81de2adfedbce8e4 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Tue, 23 Mar 2021 14:06:44 -0700 Subject: [PATCH 072/300] Remove references to Guava code that isn't in the Android flavor in case the Android flavor is in the classpath at runtime. This shouldn't happen but can when annotation processors depend on Android-specific code. RELNOTES=n/a PiperOrigin-RevId: 364639679 --- .../testing/compile/JavaSourcesSubject.java | 26 ++++++++++--------- .../com/google/testing/compile/Parser.java | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index f3439a13..f82cf579 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -20,14 +20,15 @@ import static com.google.testing.compile.CompilationSubject.compilations; import static com.google.testing.compile.Compiler.javac; import static com.google.testing.compile.JavaSourcesSubjectFactory.javaSources; +import static java.util.stream.Collectors.toList; import com.google.common.base.Joiner; -import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.io.ByteSource; import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; @@ -177,20 +178,21 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { return; } final ParseResult expectedResult = Parser.parse(Lists.asList(first, rest)); - final FluentIterable actualTrees = - FluentIterable.from(actualResult.compilationUnits()); - final FluentIterable expectedTrees = - FluentIterable.from(expectedResult.compilationUnits()); + final ImmutableList actualTrees = + actualResult.compilationUnits(); + final ImmutableList expectedTrees = + expectedResult.compilationUnits(); final ImmutableMap> expectedTreeTypes = - expectedTrees.toMap(TypeEnumerator::getTopLevelTypes); + Maps.toMap(expectedTrees, TypeEnumerator::getTopLevelTypes); final ImmutableMap> actualTreeTypes = - actualTrees.toMap(TypeEnumerator::getTopLevelTypes); + Maps.toMap(actualTrees, TypeEnumerator::getTopLevelTypes); final ImmutableMap> matchedTrees = - expectedTrees.toMap( + Maps.toMap( + expectedTrees, expectedTree -> actualTrees.stream() .filter( @@ -225,18 +227,18 @@ private void failNoCandidates( ImmutableSet expectedTypes, CompilationUnitTree expectedTree, final ImmutableMap> actualTypes, - FluentIterable actualTrees) { + ImmutableList actualTrees) { String generatedTypesReport = Joiner.on('\n') .join( - actualTrees - .transform( + actualTrees.stream() + .map( generated -> String.format( "- %s in <%s>", actualTypes.get(generated), generated.getSourceFile().toUri().getPath())) - .toList()); + .collect(toList())); failWithoutActual( simpleFact( Joiner.on('\n') diff --git a/src/main/java/com/google/testing/compile/Parser.java b/src/main/java/com/google/testing/compile/Parser.java index 91dc36ab..e5ad76ac 100644 --- a/src/main/java/com/google/testing/compile/Parser.java +++ b/src/main/java/com/google/testing/compile/Parser.java @@ -172,7 +172,7 @@ static final class ParseResult { return diagnostics; } - Iterable compilationUnits() { + ImmutableList compilationUnits() { return compilationUnits; } From 4ca394b4ef83bcf21510de3c8bd93daee4600563 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Mar 2021 07:21:19 -0700 Subject: [PATCH 073/300] Bump plexus-java from 1.0.6 to 1.0.7 Bumps [plexus-java](https://github.com/codehaus-plexus/plexus-languages) from 1.0.6 to 1.0.7.

Commits
  • 1b9a665 [maven-release-plugin] prepare release plexus-languages-1.0.7
  • 781600e [maven-release-plugin] rollback the release of plexus-languages-1.0.7
  • 22b6e96 [maven-release-plugin] prepare release plexus-languages-1.0.7
  • d317fa1 Bump release-drafter/release-drafter from v5.13.0 to v5.15.0
  • 83921e4 Bump actions/cache from v2.1.3 to v2.1.4
  • 40f57c7 Bump junit from 4.13.1 to 4.13.2
  • fbe5951 #70 Jars of which modulename extraction cause an exception should end up on t...
  • 249f8bd #64 BinaryModuleInfoParser.parse does not take toolchain into account
  • a1b61e0 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=1.0.6&new-version=1.0.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #231 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/231 from google:dependabot/maven/org.codehaus.plexus-plexus-java-1.0.7 1d9c1ede013846a7fed798dd15fe7a041580420f PiperOrigin-RevId: 365568660 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ba4c590..9f5504c4 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ org.codehaus.plexus plexus-java - 1.0.6 + 1.0.7 From 4d6ac1b2c98d16a354822b3d29883e27ccee41d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 06:53:22 -0700 Subject: [PATCH 074/300] Bump error_prone_annotations from 2.5.1 to 2.6.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.5.1 to 2.6.0.
Commits
  • 86f8e23 Add TimeUnit APIs to ReturnValueIgnored.
  • c5e1687 Disable BanSerializableRead by default
  • 3d64250 Improve ConstantPatternCompile fixes
  • 553603f Add a missing @Nullable annotation.
  • 3e14f54 Generalize ConstantPatternCompile
  • 456dcf0 Rename isNull and isNonNull matchers to make it
  • ed55201 Inet4Address and Inet6Address are immutable
  • 91951e3 Remove deprecated attributes from @RestrictedApi
  • 2b10575 Rethrow ReflectiveOperationException as LinkageError instead of AssertionError.
  • fc7cca8 Expand ImmutableMemberCollection to convert private final member collection...
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.5.1&new-version=2.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #233 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/233 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.6.0 8ef65349fca14d8044ed874edbabe08d7b92a27c PiperOrigin-RevId: 366242630 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f5504c4..54aef6dc 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.errorprone error_prone_annotations - 2.5.1 + 2.6.0 provided From 8eaef92f42ea1625cce6d024bce5101eff522cff Mon Sep 17 00:00:00 2001 From: Colin Decker Date: Tue, 6 Apr 2021 13:13:42 -0700 Subject: [PATCH 075/300] Update CI to cancel previous runs and to use v2 of setup-java. RELNOTES=n/a PiperOrigin-RevId: 367070554 --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ad73fda..78cde4e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,11 @@ jobs: java: [ 8, 11 ] runs-on: ubuntu-latest steps: + # Cancel any previous runs for the same branch that are still running. + - name: 'Cancel previous runs' + uses: styfle/cancel-workflow-action@0.8.0 + with: + access_token: ${{ github.token }} - name: 'Check out repository' uses: actions/checkout@v2 - name: 'Cache local Maven repository' @@ -26,9 +31,10 @@ jobs: restore-keys: | maven- - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} + distribution: 'zulu' - name: 'Install' shell: bash run: mvn -B -U install clean --fail-never --quiet -DskipTests=true -Dinvoker.skip=true From b04ce11a23a492fafda5eb040eb2b839da6a43ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 06:32:34 -0700 Subject: [PATCH 076/300] Bump auto-value from 1.7.5 to 1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [auto-value](https://github.com/google/auto) from 1.7.5 to 1.8.
Release notes

Sourced from auto-value's releases.

AutoValue 1.8

  • The parameter of equals(Object) is annotated with @Nullable if any method signature mentions @Nullable. (4d01ce62)
  • If an @AutoOneOf class has a serialVersionUID this is now copied to its generated subclasses. THIS BREAKS SERIAL COMPATIBILITY for @AutoOneOf classes with explicit serialVersionUID declarations, though those were already liable to be broken by arbitrary changes to the generated AutoOneOf code. (71d81210)
Commits
  • 6527ac9 Set version number for auto-value-parent to 1.8.
  • 322cdae Update dependencies on AutoService from 1.0-rc7 to 1.0.
  • 24c9861 Update CI to cancel previous runs and to use v2 of setup-java.
  • 89189f0 Update dependencies on Auto Common from 0.11 to 1.0.
  • 0f1dcc9 Have AutoBuilder determine property names and types from the parameters of th...
  • 09ec190 Use ${project.version} as suggested by @​tbroyer.
  • a2f647f When building AutoValue, pick up AutoService via \<annotationProcessorPaths>.
  • 2b5d8b8 Move knowledge of getter methods from BuilderMethodClassifier to a new subc...
  • 79d7e9c Move the AutoBuilder tests for Kotlin data classes to a separate test class.
  • 0076afb Initial prototype of @AutoBuilder.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.7.5&new-version=1.8)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #237 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/237 from google:dependabot/maven/com.google.auto.value-auto-value-1.8 71cf887c43fb8783071fb20f34ef86395b576ff3 PiperOrigin-RevId: 367208011 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54aef6dc..0f154cfb 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ com.google.auto.value auto-value - 1.7.5 + 1.8 com.google.auto From 22538146a0d64573799307848448e24e0cab8b62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 10:01:04 -0700 Subject: [PATCH 077/300] Bump auto-common from 0.11 to 1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [auto-common](https://github.com/google/auto) from 0.11 to 1.0.
Release notes

Sourced from auto-common's releases.

Auto Common 1.0

This has only cosmetic differences from Auto Common 0.11, but we are updating the version number to indicate stability.

AutoService 1.0

  • @AutoService classes can now reference generic services and still pass -Averify=true. (afe607c3)
  • AutoServiceProcessor no longer claims the @AutoService annotation. (c27b527a)

AutoService 1.0-rc7

  • Use CLASS retention to support Gradle aggregating incremental annotation processors (28a2c79)
  • Set an Automatic-Module-Name. (61256c3)

AutoService 1.0-rc6

  • Actually support Gradle's incremental annotation processing

AutoService 1.0-rc5

  • @AutoService now has a separate artifact (auto-service-annotations) from the annotation processor (still auto-service) (af1e5da)
  • Gradle's incremental compilation is now supported (thanks to @​tbroyer for this work!). (a5673d0)
    • Update: this didn't actually work. It was added in 1.0-rc6

AutoService release 1.0-rc4

AutoFactory 1.0-beta9

  • AutoFactory type annotations are now placed correctly even for nested types. (f26d2df)
  • @AutoFactory constructors can now declare checked exceptions. The same exceptions will be declared on the generated create method. (3141e79)
  • google-java-format is no longer referenced in pom.xml. (aa47801)

AutoFactory 1.0-beta8

  • Fix a problem with references to Factory classes in other packages. (e62e0ab)
  • Better error message for failed factory write. (79c9d15)

AutoFactory 1.0-beta7

  • Prevent stack overflow caused by self referencing types (ex: E extends Enum). (c35f5c3)
  • Add support for generics to @​AutoFactory (e63019a)
  • Gradle: @AutoFactory is now an isolating annotation processor (2a52c55)

Auto Factory 1.0-beta6

  • Do not prepend outer classnames to the generated @AutoFactory class name if a class name has been explicitly specified. (b79c170296466e6b19b2d61ea5ee4a4f302d4947)
  • Java 9 support
  • Add support for type-annotations and CheckerFramework nullable types to @AutoFactory (4d6df145e34a6db1e9ac23aac3e974e13e8cb4e2)

@​AutoFactory release 1.0-beta4

This version of AutoFactory adds support for @Nullable and varargs parameters on @AutoFactory constructors as well as Provider<> parameters to a create() method.

Commits
  • c36dbb5 [release] bump version to 1.0 final
  • 959c539 [release] prepare for release auto-value-1.0-rc4
  • 8a62b9b Depend on release version of truth.
  • cc0e81f Ignore dependency-reduced pom spam
  • 8052c5b Use truth snapshot until truth >.24 is released
  • 17d6826 Check whether an @​AutoValue class contains an @​AutoValue.Builder class or int...
  • 4577a71 Actually test what the previous code intended to test but didn't (as far as I...
  • c19e02d In the AutoValue README, document the newish behaviour whereby a method calle...
  • dab1eee In AutoValue, add a test that checks that having a non-abstract method that i...
  • 1a098d9 Migrate assert_() users to new Truth shortcut:
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto:auto-common&package-manager=maven&previous-version=0.11&new-version=1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #238 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/238 from google:dependabot/maven/com.google.auto-auto-common-1.0 7cc341b1010e04f9e879bd14f32e5eb89a003a7f PiperOrigin-RevId: 367241510 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f154cfb..88316399 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ com.google.auto auto-common - 0.11 + 1.0 From 9a6ede02f0c492ac16828e149a6e1372b4120a61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 07:31:38 -0700 Subject: [PATCH 078/300] Bump styfle/cancel-workflow-action from 0.8.0 to 0.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.8.0 to 0.9.0.
Release notes

Sourced from styfle/cancel-workflow-action's releases.

0.9.0

Minor Changes

  • Add all_but_latest flag - cancel all workflows but the latest: #35
  • Cleanup all_but_latest: #67

Credits

Huge thanks to @​thomwiggers for helping!

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #240 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/240 from google:dependabot/github_actions/styfle/cancel-workflow-action-0.9.0 1028a532acc4a8afe4d1d32769e070b664c93dda PiperOrigin-RevId: 367999058 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78cde4e5..e2d3ccd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: # Cancel any previous runs for the same branch that are still running. - name: 'Cancel previous runs' - uses: styfle/cancel-workflow-action@0.8.0 + uses: styfle/cancel-workflow-action@0.9.0 with: access_token: ${{ github.token }} - name: 'Check out repository' From 36982eb0a3f843a0ae23f22b7cc0faae93474fa6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 08:03:40 -0700 Subject: [PATCH 079/300] Bump actions/cache from v2.1.4 to v2.1.5 Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5.
Release notes

Sourced from actions/cache's releases.

v2.1.5

  • Fix permissions error seen when extracting caches with GNU tar that were previously created using BSD tar (actions/cache#527)
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #241 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/241 from google:dependabot/github_actions/actions/cache-v2.1.5 ee1a096471cddfc7cd034cbf0372797ce131ee69 PiperOrigin-RevId: 368215427 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2d3ccd0..5ca78fa0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@v2 - name: 'Cache local Maven repository' - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: ~/.m2/repository key: maven-${{ hashFiles('**/pom.xml') }} From a2702efedcae9da8598f0c163f73b89514a924b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 06:52:33 -0700 Subject: [PATCH 080/300] Bump auto-value from 1.8 to 1.8.1 Bumps [auto-value](https://github.com/google/auto) from 1.8 to 1.8.1.
Release notes

Sourced from auto-value's releases.

AutoValue 1.8.1

  • Fixed Gradle incremental compilation. (8f17e4c4)
Commits
  • 4df6476 Set version number for auto-value-parent to 1.8.1.
  • c8a5c19 Add a test for Gradle incremental compilation with AutoValue.
  • 20ab154 Document AutoBuilder.
  • 79d07c5 MoreTypes.isTypeOf returns false for ErrorType rather than throwing.
  • 02cd653 Move the correct incap dependency to the AutoFactory annotationProcessorPath.
  • 8f17e4c Fix Gradle incremental compilation for AutoValue and AutoFactory.
  • ad8add1 Fix Gradle incremental compilation. Fixes https://github.com/google/auto/issu...
  • 4bdd64b Update the AutoBuilder documentation about stability
  • a722616 Respect @Nullable annotations when determining required properties in AutoB...
  • 15b7ec2 Allow more general kinds of method in callMethod.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.8&new-version=1.8.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #242 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/242 from google:dependabot/maven/com.google.auto.value-auto-value-1.8.1 d7e5f88ba94e0c5bf4a9a6e435bc7b8938704bac PiperOrigin-RevId: 369861655 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88316399..a034aff5 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ com.google.auto.value auto-value - 1.8 + 1.8.1 com.google.auto From cb6486c955c412462943493629cdb7a5ee6275dc Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Wed, 28 Apr 2021 15:42:43 -0700 Subject: [PATCH 081/300] Update `TreeDiffer` to scan resource variables RELNOTES=Fix false negative when comparing source files that differ only in try-with-resources specifications. PiperOrigin-RevId: 371001119 --- .../google/testing/compile/TreeDiffer.java | 1 + .../testing/compile/TreeDifferTest.java | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/src/main/java/com/google/testing/compile/TreeDiffer.java b/src/main/java/com/google/testing/compile/TreeDiffer.java index d74699c3..67b7d6e2 100644 --- a/src/main/java/com/google/testing/compile/TreeDiffer.java +++ b/src/main/java/com/google/testing/compile/TreeDiffer.java @@ -831,6 +831,7 @@ public Void visitTry(TryTree expected, Tree actual) { return null; } + parallelScan(expected.getResources(), other.get().getResources()); scan(expected.getBlock(), other.get().getBlock()); parallelScan(expected.getCatches(), other.get().getCatches()); scan(expected.getFinallyBlock(), other.get().getFinallyBlock()); diff --git a/src/test/java/com/google/testing/compile/TreeDifferTest.java b/src/test/java/com/google/testing/compile/TreeDifferTest.java index f70579b1..47ce4f0e 100644 --- a/src/test/java/com/google/testing/compile/TreeDifferTest.java +++ b/src/test/java/com/google/testing/compile/TreeDifferTest.java @@ -155,6 +155,22 @@ public class TreeDifferTest { " };", "}"); + private static final CompilationUnitTree TRY_WITH_RESOURCES_1 = + MoreTrees.parseLinesToTree("package test;", + "final class TestClass {", + " void f() {", + " try (Resource1 r = new Resource1()) {}", + " }", + "}"); + + private static final CompilationUnitTree TRY_WITH_RESOURCES_2 = + MoreTrees.parseLinesToTree("package test;", + "final class TestClass {", + " void f() {", + " try (Resource2 r = new Resource2()) {}", + " }", + "}"); + @Test public void scan_differingCompilationUnits() { TreeDifference diff = TreeDiffer.diffCompilationUnits(EXPECTED_TREE, ACTUAL_TREE); @@ -284,6 +300,20 @@ public void scan_testLambdaVersusAnonymousClass() { assertThat(diff.isEmpty()).isFalse(); } + @Test + public void scan_testTryWithResources() { + TreeDifference diff = + TreeDiffer.diffCompilationUnits(TRY_WITH_RESOURCES_1, TRY_WITH_RESOURCES_1); + assertThat(diff.isEmpty()).isTrue(); + } + + @Test + public void scan_testTryWithResourcesDifferent() { + TreeDifference diff = + TreeDiffer.diffCompilationUnits(TRY_WITH_RESOURCES_1, TRY_WITH_RESOURCES_2); + assertThat(diff.isEmpty()).isFalse(); + } + @Test public void matchCompilationUnits() { ParseResult actual = From 0285249c40b89ce553d79004c4a2e6b1dd303d38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 10:23:01 -0700 Subject: [PATCH 082/300] Bump maven-gpg-plugin from 1.6 to 3.0.1 Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 1.6 to 3.0.1.
Commits
  • 5255080 [maven-release-plugin] prepare release maven-gpg-plugin-3.0.1
  • e4dc062 [MGPG-79] fix handling of external pinentry programs in case the passphrase i...
  • 5902b2b deps: update JUnit
  • 12fbd63 Merge pull request #10 from Syquel/bugfix/MGPG-66
  • 4da6921 [MGPG-66] fix handling of excluded files on linux
  • 4016721 Merge pull request #12 from Syquel/bugfix/MGPG-80_equality
  • fba2c39 [MGPG-66] add test for handling of excluded files
  • 26aa5b3 [MGPG-66] fix handling of excluded files
  • 7438b37 [MGPG-80] implement GpgVersion equality in adherence to comparibility
  • b38c638 Merge pull request #11 from Syquel/bugfix/MGPG-80
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-gpg-plugin&package-manager=maven&previous-version=1.6&new-version=3.0.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #244 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/244 from google:dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.0.1 d9076d2af4487ef0517f9e6f95a407b3858c6f7d PiperOrigin-RevId: 372957609 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a034aff5..1e7e62a0 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts From 1db6d7ddf83f453dde08dbf599d4db1a9c33d4ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 07:44:17 -0700 Subject: [PATCH 083/300] Bump actions/checkout from 2 to 2.3.4 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 2.3.4.
Release notes

Sourced from actions/checkout's releases.

v2.3.4

v2.3.3

v2.3.2

Add Third Party License Information to Dist Files

v2.3.1

Fix default branch resolution for .wiki and when using SSH

v2.3.0

Fallback to the default branch

v2.2.0

Fetch all history for all tags and branches when fetch-depth=0

v2.1.1

Changes to support GHES (here and here)

v2.1.0

Changelog

Sourced from actions/checkout's changelog.

Changelog

v2.3.1

v2.3.0

v2.2.0

v2.1.1

  • Changes to support GHES (here and here)

v2.1.0

v2.0.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=2&new-version=2.3.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #245 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/245 from google:dependabot/github_actions/actions/checkout-2.3.4 302c7fd0d694df6b77c6bfeffebdeed8fbc77488 PiperOrigin-RevId: 373367976 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ca78fa0..811e8d35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@v2 + uses: actions/checkout@v2.3.4 - name: 'Cache local Maven repository' uses: actions/cache@v2.1.5 with: From 8199e4593a9254ace5a49f8081bc81af6c8a7ce8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 08:31:55 -0700 Subject: [PATCH 084/300] Bump error_prone_annotations from 2.6.0 to 2.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.6.0 to 2.7.1.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.7.1

Everything in Error Prone 2.7.0, plus an additional fix for JDK 17.

Error Prone 2.7.0

Changes

New checks:

Closed issues: #2257, #2260, #2282, #2301, #2322, #2323, #2324

Commits
  • 09262b8 Release Error Prone 2.7.1
  • ff07935 Improve JDK 17 support
  • 65a75c9 Enable ReturnValueIgnored-checking of Collection, Iterable, and `Iterat...
  • 0c6a76d Fix a JDK 17 incompatibility
  • 1846d94 Add tests for method invocation bug with the Inliner.
  • 8c6f73c Fix a JDK 16-only test
  • 62d1bf7 Internal refactoring.
  • 5913d86 Update Error Prone CI to use JDK 16 as latest, and add 17-ea
  • f6761ee Fix a JDK 16 incompatibility
  • 51b5c4d Fix some crashes involving records
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.6.0&new-version=2.7.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #246 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/246 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.7.1 ff13eea8135a28a797c9489a28454bb9236ef680 PiperOrigin-RevId: 374202015 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e7e62a0..16f45be9 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.errorprone error_prone_annotations - 2.6.0 + 2.7.1 provided From b6b54cd9f0b3375b05549dd4078e79e040a9be15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 May 2021 07:06:53 -0700 Subject: [PATCH 085/300] Bump maven-javadoc-plugin from 3.2.0 to 3.3.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.2.0 to 3.3.0.
Commits
  • aa3e12c [maven-release-plugin] prepare release maven-javadoc-plugin-3.3.0
  • 55982df [MJAVADOC-584] excludePackageNames is not working as documented anymore
  • e9729ce [MJAVADOC-453] Using Alternate Doclet documentation example snippet is out of...
  • 9f98af7 [MJAVADOC-592] detectJavaApiLink should also respect maven.compiler.source pr...
  • 1028afc [MJAVADOC-592] Prepare integration tests
  • 1963ee8 Bump actions/checkout from 2 to 2.3.4
  • f27c99d [MJAVADOC-590] Setting nooverview option always causes a build failure
  • d5b80c0 Revert "(doc) enable streamLogsOnFailure"
  • 3926bd4 [MJAVADOC-619] Maven Javadoc bottom claims copyright for future years
  • 15a02d6 (doc) enable streamLogsOnFailure
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.2.0&new-version=3.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #247 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/247 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.3.0 4d092dcc4f39e126429a728b829f51d59fb1e74b PiperOrigin-RevId: 375469263 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 16f45be9..3e9128f6 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ maven-javadoc-plugin - 3.2.0 + 3.3.0 maven-site-plugin @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 attach-docs From c46b1b68bfe9946d0ad2427603365e2f1e70bc1a Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Mon, 24 May 2021 13:10:43 -0700 Subject: [PATCH 086/300] Fix bug where testing a `package-info.java` file with `parsesAs()` threw an NPE. Fixes #85. RELNOTES=Fixed bug where testing `package-info.java` with `parsesAs()` threw an NPE. PiperOrigin-RevId: 375541051 --- .../testing/compile/TypeEnumerator.java | 4 +-- .../compile/CompilationSubjectTest.java | 10 ++++++ .../testing/compile/GeneratingProcessor.java | 36 ++++++++++++------- .../JavaSourcesSubjectFactoryTest.java | 13 +++++++ 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/google/testing/compile/TypeEnumerator.java b/src/main/java/com/google/testing/compile/TypeEnumerator.java index 6ec4e95f..646d1e8d 100644 --- a/src/main/java/com/google/testing/compile/TypeEnumerator.java +++ b/src/main/java/com/google/testing/compile/TypeEnumerator.java @@ -21,7 +21,6 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - import com.sun.source.tree.ClassTree; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.ExpressionStatementTree; @@ -29,7 +28,6 @@ import com.sun.source.tree.MemberSelectTree; import com.sun.source.tree.Tree; import com.sun.source.util.TreeScanner; - import java.util.Set; /** @@ -100,7 +98,7 @@ public Set visitCompilationUnit(CompilationUnitTree reference, Void v) { "package identifier. Found " + packageSet); } final String packageName = packageSet.isEmpty() ? "" : packageSet.iterator().next(); - Set typeDeclSet = scan(reference.getTypeDecls(), v); + Set typeDeclSet = firstNonNull(scan(reference.getTypeDecls(), v), ImmutableSet.of()); return FluentIterable.from(typeDeclSet) .transform(new Function() { @Override public String apply(String typeName) { diff --git a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java index 01dc2fe8..63ab78ed 100644 --- a/src/test/java/com/google/testing/compile/CompilationSubjectTest.java +++ b/src/test/java/com/google/testing/compile/CompilationSubjectTest.java @@ -808,6 +808,16 @@ public void generatedSourceFile() { GeneratingProcessor.GENERATED_CLASS_NAME, GeneratingProcessor.GENERATED_SOURCE)); } + @Test + public void generatedSourceFile_packageInfo() { + GeneratingProcessor generatingProcessor = new GeneratingProcessor("test"); + assertThat(javac().withProcessors(generatingProcessor).compile(HELLO_WORLD_RESOURCE)) + .generatedSourceFile("test.package-info") + .hasSourceEquivalentTo( + JavaFileObjects.forSourceString( + "test.package-info", generatingProcessor.generatedPackageInfoSource())); + } + @Test public void generatedSourceFile_fail() { expectFailure diff --git a/src/test/java/com/google/testing/compile/GeneratingProcessor.java b/src/test/java/com/google/testing/compile/GeneratingProcessor.java index ff1c2e37..1e5a46b9 100644 --- a/src/test/java/com/google/testing/compile/GeneratingProcessor.java +++ b/src/test/java/com/google/testing/compile/GeneratingProcessor.java @@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableSet; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.io.IOException; +import java.io.UncheckedIOException; import java.io.Writer; import java.util.Set; import javax.annotation.processing.AbstractProcessor; @@ -29,6 +30,7 @@ import javax.annotation.processing.RoundEnvironment; import javax.lang.model.SourceVersion; import javax.lang.model.element.TypeElement; +import javax.tools.FileObject; final class GeneratingProcessor extends AbstractProcessor { static final String GENERATED_CLASS_NAME = "Blah"; @@ -50,31 +52,33 @@ final class GeneratingProcessor extends AbstractProcessor { @Override public synchronized void init(ProcessingEnvironment processingEnv) { Filer filer = processingEnv.getFiler(); - try (Writer writer = filer.createSourceFile(generatedClassName()).openWriter()) { - writer.write(GENERATED_SOURCE); - } catch (IOException e) { - throw new RuntimeException(e); - } + try { + write(filer.createSourceFile(generatedClassName()), GENERATED_SOURCE); + write( + filer.createResource( + CLASS_OUTPUT, getClass().getPackage().getName(), GENERATED_RESOURCE_NAME), + GENERATED_RESOURCE); - try (Writer writer = - filer - .createResource( - CLASS_OUTPUT, getClass().getPackage().getName(), GENERATED_RESOURCE_NAME) - .openWriter()) { - writer.write(GENERATED_RESOURCE); + if (!packageName.isEmpty()) { + write(filer.createSourceFile(packageName + ".package-info"), generatedPackageInfoSource()); + } } catch (IOException e) { - throw new RuntimeException(e); + throw new UncheckedIOException(e); } } String packageName() { return packageName; } - + String generatedClassName() { return packageName.isEmpty() ? GENERATED_CLASS_NAME : packageName + "." + GENERATED_CLASS_NAME; } + String generatedPackageInfoSource() { + return "package " + packageName + ";\n"; + } + @CanIgnoreReturnValue @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { @@ -90,4 +94,10 @@ public Set getSupportedAnnotationTypes() { public SourceVersion getSupportedSourceVersion() { return SourceVersion.latestSupported(); } + + private static void write(FileObject file, String contents) throws IOException { + try (Writer writer = file.openWriter()) { + writer.write(contents); + } + } } diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java index 9da6bdf5..f140fd72 100644 --- a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java +++ b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java @@ -741,6 +741,19 @@ public void generatesSources() { GeneratingProcessor.GENERATED_CLASS_NAME, GeneratingProcessor.GENERATED_SOURCE)); } + @Test + public void generatesSources_packageInfo() { + GeneratingProcessor generatingProcessor = new GeneratingProcessor("test.generated"); + assertAbout(javaSource()) + .that(HELLO_WORLD_RESOURCE) + .processedWith(generatingProcessor) + .compilesWithoutError() + .and() + .generatesSources( + JavaFileObjects.forSourceString( + "test.generated.package-info", generatingProcessor.generatedPackageInfoSource())); + } + @Test public void generatesSources_failOnUnexpected() { String failingExpectationSource = "abstract class Blah {}"; From 21cafe7b693375d0c3f98468beee9b1a98803c5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 07:31:29 -0700 Subject: [PATCH 087/300] Bump truth.version from 1.1.2 to 1.1.3 Bumps `truth.version` from 1.1.2 to 1.1.3. Updates `truth` from 1.1.2 to 1.1.3
Release notes

Sourced from truth's releases.

1.1.3

  • Fixed a bug in how comparingExpectedFieldsOnly() handles oneof fields. (f27208428)
  • Improved comparingExpectedFieldsOnly to work when required fields are absent. (f27208428)
  • Changed Subject.toString() to throw UnsupportedOperationException. (fa4c7b512)
Commits

Updates `truth-java8-extension` from 1.1.2 to 1.1.3 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #249 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/249 from google:dependabot/maven/truth.version-1.1.3 173edf9cb862cae057b06f362cea685b0de795b4 PiperOrigin-RevId: 375938870 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3e9128f6..4ad8170b 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.1.2 + 1.1.3 http://github.com/google/compile-testing From 8f2c8b2855e2813d0a73249238e0f4b58da88af7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 08:13:59 -0700 Subject: [PATCH 088/300] Bump actions/cache from 2.1.5 to 2.1.6 Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
Release notes

Sourced from actions/cache's releases.

v2.1.6

  • Catch unhandled "bad file descriptor" errors that sometimes occurs when the cache server returns non-successful response (actions/cache#596)
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/cache&package-manager=github_actions&previous-version=2.1.5&new-version=2.1.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #250 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/250 from google:dependabot/github_actions/actions/cache-2.1.6 29456380bc3c9b2dffece0564c71f12ad5ec0174 PiperOrigin-RevId: 376835639 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 811e8d35..a3e6cb94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@v2.3.4 - name: 'Cache local Maven repository' - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: ~/.m2/repository key: maven-${{ hashFiles('**/pom.xml') }} From bcad50d46aceac8933b680e1c1726c857d3d1363 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Tue, 1 Jun 2021 12:08:23 -0700 Subject: [PATCH 089/300] Internal change RELNOTES=n/a PiperOrigin-RevId: 376888706 --- src/main/java/com/google/testing/compile/TreeDiffer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/google/testing/compile/TreeDiffer.java b/src/main/java/com/google/testing/compile/TreeDiffer.java index 67b7d6e2..662496fc 100644 --- a/src/main/java/com/google/testing/compile/TreeDiffer.java +++ b/src/main/java/com/google/testing/compile/TreeDiffer.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; +import static com.google.common.collect.Iterables.isEmpty; import com.google.auto.common.MoreTypes; import com.google.auto.value.AutoValue; @@ -268,17 +269,13 @@ private void parallelScan( } else if (expectedsIterator.hasNext() && !actualsIterator.hasNext()) { diffBuilder.addExtraExpectedNode(expectedPathPlus(expectedsIterator.next())); } - } else if (expecteds == null && !isEmptyOrNull(actuals)) { + } else if (expecteds == null && actuals != null && !isEmpty(actuals)) { diffBuilder.addExtraActualNode(actualPathPlus(actuals.iterator().next())); - } else if (actuals == null && !isEmptyOrNull(expecteds)) { + } else if (actuals == null && expecteds != null && !isEmpty(expecteds)) { diffBuilder.addExtraExpectedNode(expectedPathPlus(expecteds.iterator().next())); } } - private boolean isEmptyOrNull(Iterable iterable) { - return iterable == null || !iterable.iterator().hasNext(); - } - @Override public Void visitAnnotation(AnnotationTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); From 77d0886587ca3eb0c23ecc30bc38c5c195e8dc6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Jun 2021 09:41:56 -0700 Subject: [PATCH 090/300] Bump auto-common from 1.0 to 1.0.1 Bumps [auto-common](https://github.com/google/auto) from 1.0 to 1.0.1.
Release notes

Sourced from auto-common's releases.

AutoFactory 1.0.1

  • Fixed Gradle incremental compilation. (8f17e4c4)

AutoCommon 1.0.1

  • Added some methods to allow annotation processors to use Streams functionality that is present in mainline Guava but not Android Guava. This can be useful if Android Guava might be on the processor path.
Commits
  • e057b8b Set version number for auto-common to 1.0.1.
  • 15d49d9 Replace server Guava API usage with Android compatible alternatives.
  • 64b9ecc Bump actions/cache from 2.1.5 to 2.1.6
  • 7d3aa66 Implicitly exclude Kotlin @Metadata annotations from @CopyAnnotations
  • 2b77e44 Bump kotlin.version from 1.5.0 to 1.5.10 in /value
  • acb0765 Bump truth from 1.1.2 to 1.1.3 in /factory
  • 7f8bd35 Bump truth from 1.1.2 to 1.1.3 in /common
  • d482097 Bump truth from 1.1.2 to 1.1.3 in /service
  • 31eeb67 Bump truth.version from 1.1.2 to 1.1.3 in /value
  • 54baeb3 Update an AutoValue test to the newer compile-testing API.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto:auto-common&package-manager=maven&previous-version=1.0&new-version=1.0.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #252 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/252 from google:dependabot/maven/com.google.auto-auto-common-1.0.1 8ad38dc0c3461fef262c0f51e13e82c4e358a8f7 PiperOrigin-RevId: 377079105 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ad8170b..3c6bfc56 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ com.google.auto auto-common - 1.0 + 1.0.1 From 620d236503e82ea4d6db4732050cadd5896758dd Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 7 Jun 2021 09:37:20 -0700 Subject: [PATCH 091/300] Satisfy the nullness checker. PiperOrigin-RevId: 377936658 --- .../com/google/testing/compile/JavaSourcesSubject.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index f82cf579..1a35f428 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -20,6 +20,7 @@ import static com.google.testing.compile.CompilationSubject.compilations; import static com.google.testing.compile.Compiler.javac; import static com.google.testing.compile.JavaSourcesSubjectFactory.javaSources; +import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; import com.google.common.base.Joiner; @@ -197,8 +198,13 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { actualTrees.stream() .filter( actualTree -> - expectedTreeTypes - .get(expectedTree) + /* + * requireNonNull is safe -- that is, expectedTree must be a key + * of expectedTreeTypes: expectedTreeTypes was constructed from + * the expectedTrees list, the same collection that expectedTree + * came from. + */ + requireNonNull(expectedTreeTypes.get(expectedTree)) .equals(actualTreeTypes.get(actualTree))) .findFirst()); From 6260258cbfe962f191ff64537a0cd4f955bae916 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 17 Jun 2021 14:15:45 -0700 Subject: [PATCH 092/300] Use `@Nullable` from the Checker Framework and fix a few null-correctness issues. RELNOTES= Use `@Nullable` from the Checker Framework and fix a few null-correctness issues. PiperOrigin-RevId: 380043179 --- pom.xml | 11 +- .../com/google/testing/compile/Compiler.java | 13 +- .../compile/InMemoryJavaFileManager.java | 9 +- .../compile/JavaFileObjectSubject.java | 3 +- .../testing/compile/JavaSourcesSubject.java | 8 +- .../com/google/testing/compile/MoreTrees.java | 34 +-- .../ProcessedCompileTesterFactory.java | 2 - .../google/testing/compile/TreeDiffer.java | 239 +++++++++--------- .../testing/compile/TreeDifference.java | 4 +- .../testing/compile/TypeEnumerator.java | 23 +- .../google/testing/compile/package-info.java | 16 +- 11 files changed, 186 insertions(+), 176 deletions(-) diff --git a/pom.xml b/pom.xml index 3c6bfc56..1ef72255 100644 --- a/pom.xml +++ b/pom.xml @@ -68,12 +68,6 @@ guava 30.1.1-jre - - com.google.code.findbugs - jsr305 - 3.0.2 - true - com.google.errorprone error_prone_annotations @@ -90,6 +84,11 @@ auto-common 1.0.1 + + org.checkerframework + checker-qual + 3.14.0 + diff --git a/src/main/java/com/google/testing/compile/Compiler.java b/src/main/java/com/google/testing/compile/Compiler.java index 296b7dc0..7d457f81 100644 --- a/src/main/java/com/google/testing/compile/Compiler.java +++ b/src/main/java/com/google/testing/compile/Compiler.java @@ -44,6 +44,7 @@ import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject; import javax.tools.StandardLocation; +import org.checkerframework.checker.nullness.qual.Nullable; /** An object that can {@link #compile} Java source files. */ @AutoValue @@ -211,9 +212,10 @@ public final Compilation compile(Iterable files) { return compilation; } - @VisibleForTesting static final ClassLoader platformClassLoader = getPlatformClassLoader(); + @VisibleForTesting + static final @Nullable ClassLoader platformClassLoader = getPlatformClassLoader(); - private static ClassLoader getPlatformClassLoader() { + private static @Nullable ClassLoader getPlatformClassLoader() { try { // JDK >= 9 return (ClassLoader) ClassLoader.class.getMethod("getPlatformClassLoader").invoke(null); @@ -229,12 +231,14 @@ private static ClassLoader getPlatformClassLoader() { * @throws IllegalArgumentException if the given classloader had classpaths which we could not * determine or use for compilation. */ - private static ImmutableList getClasspathFromClassloader(ClassLoader currentClassloader) { + private static ImmutableList getClasspathFromClassloader(ClassLoader classloader) { ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader(); // Concatenate search paths from all classloaders in the hierarchy 'till the system classloader. Set classpaths = new LinkedHashSet<>(); - while (true) { + for (ClassLoader currentClassloader = classloader; + ; + currentClassloader = currentClassloader.getParent()) { if (currentClassloader == systemClassLoader) { Iterables.addAll( classpaths, @@ -263,7 +267,6 @@ private static ImmutableList getClasspathFromClassloader(ClassLoader curre + "since %s is not an instance of URLClassloader", currentClassloader)); } - currentClassloader = currentClassloader.getParent(); } return classpaths.stream().map(File::new).collect(toImmutableList()); diff --git a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java index 5754a55a..c50e7817 100644 --- a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java +++ b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java @@ -42,6 +42,7 @@ import javax.tools.SimpleJavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A file manager implementation that stores all output in memory. @@ -90,8 +91,8 @@ public boolean isSameFile(FileObject a, FileObject b) { } @Override - public FileObject getFileForInput(Location location, String packageName, - String relativeName) throws IOException { + public @Nullable FileObject getFileForInput( + Location location, String packageName, String relativeName) throws IOException { if (location.isOutputLocation()) { return inMemoryOutputs.getIfPresent(uriForFileObject(location, packageName, relativeName)); } @@ -103,8 +104,8 @@ public FileObject getFileForInput(Location location, String packageName, } @Override - public JavaFileObject getJavaFileForInput(Location location, String className, Kind kind) - throws IOException { + public @Nullable JavaFileObject getJavaFileForInput( + Location location, String className, Kind kind) throws IOException { if (location.isOutputLocation()) { return inMemoryOutputs.getIfPresent(uriForJavaFileObject(location, className, kind)); } diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index 22f25b8e..b0b26971 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -33,8 +33,8 @@ import java.io.IOException; import java.nio.charset.Charset; import java.util.function.BiFunction; -import javax.annotation.Nullable; import javax.tools.JavaFileObject; +import org.checkerframework.checker.nullness.qual.Nullable; /** Assertions about {@link JavaFileObject}s. */ public final class JavaFileObjectSubject extends Subject { @@ -72,6 +72,7 @@ protected String actualCustomStringRepresentation() { public void isEqualTo(@Nullable Object other) { if (!(other instanceof JavaFileObject)) { super.isEqualTo(other); + return; } JavaFileObject otherFile = (JavaFileObject) other; diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 1a35f428..26a1d37c 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -57,12 +57,12 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.annotation.Nullable; import javax.annotation.processing.Processor; import javax.tools.Diagnostic; import javax.tools.Diagnostic.Kind; import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A Truth {@link Subject} that evaluates the result @@ -213,7 +213,11 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { final CompilationUnitTree expectedTree = matchedTreePair.getKey(); if (!matchedTreePair.getValue().isPresent()) { failNoCandidates( - expectedTreeTypes.get(expectedTree), expectedTree, actualTreeTypes, actualTrees); + // see comment above + requireNonNull(expectedTreeTypes.get(expectedTree)), + expectedTree, + actualTreeTypes, + actualTrees); } else { CompilationUnitTree actualTree = matchedTreePair.getValue().get(); TreeDifference treeDifference = TreeDiffer.diffCompilationUnits(expectedTree, actualTree); diff --git a/src/main/java/com/google/testing/compile/MoreTrees.java b/src/main/java/com/google/testing/compile/MoreTrees.java index 931dc687..6be48865 100644 --- a/src/main/java/com/google/testing/compile/MoreTrees.java +++ b/src/main/java/com/google/testing/compile/MoreTrees.java @@ -35,7 +35,7 @@ import com.sun.source.util.TreePathScanner; import java.util.Arrays; import java.util.Optional; -import javax.annotation.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A class containing methods which are useful for gaining access to {@code Tree} instances from @@ -128,10 +128,8 @@ static TreePath findSubtreePath(CompilationUnitTree root, Tree.Kind treeKind, return res.get(); } - /** - * A {@link TreePathScanner} to power the subtree searches in this class - */ - static final class SearchScanner extends TreePathScanner, Void> { + /** A {@link TreePathScanner} to power the subtree searches in this class */ + static final class SearchScanner extends TreePathScanner, @Nullable Void> { private final Optional identifier; private final Tree.Kind kindSought; @@ -178,7 +176,7 @@ private Optional absentIfNull(Optional ret) { } @Override - public Optional scan(Tree node, Void v) { + public Optional scan(Tree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } @@ -189,7 +187,7 @@ public Optional scan(Tree node, Void v) { } @Override - public Optional scan(Iterable nodes, Void v) { + public Optional scan(Iterable nodes, @Nullable Void v) { return absentIfNull(super.scan(nodes, v)); } @@ -200,7 +198,7 @@ public Optional reduce(Optional t1, Optional t2) { } @Override - public Optional visitBreak(@Nullable BreakTree node, Void v) { + public Optional visitBreak(@Nullable BreakTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } @@ -209,7 +207,7 @@ public Optional visitBreak(@Nullable BreakTree node, Void v) { } @Override - public Optional visitClass(@Nullable ClassTree node, Void v) { + public Optional visitClass(@Nullable ClassTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getSimpleName())) { @@ -220,7 +218,7 @@ public Optional visitClass(@Nullable ClassTree node, Void v) { } @Override - public Optional visitContinue(@Nullable ContinueTree node, Void v) { + public Optional visitContinue(@Nullable ContinueTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getLabel())) { @@ -231,7 +229,7 @@ public Optional visitContinue(@Nullable ContinueTree node, Void v) { } @Override - public Optional visitIdentifier(@Nullable IdentifierTree node, Void v) { + public Optional visitIdentifier(@Nullable IdentifierTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getName())) { @@ -242,7 +240,8 @@ public Optional visitIdentifier(@Nullable IdentifierTree node, Void v) } @Override - public Optional visitLabeledStatement(@Nullable LabeledStatementTree node, Void v) { + public Optional visitLabeledStatement( + @Nullable LabeledStatementTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getLabel())) { @@ -253,7 +252,7 @@ public Optional visitLabeledStatement(@Nullable LabeledStatementTree n } @Override - public Optional visitLiteral(@Nullable LiteralTree node, Void v) { + public Optional visitLiteral(@Nullable LiteralTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getValue())) { @@ -264,7 +263,7 @@ public Optional visitLiteral(@Nullable LiteralTree node, Void v) { } @Override - public Optional visitMethod(@Nullable MethodTree node, Void v) { + public Optional visitMethod(@Nullable MethodTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getName())) { @@ -275,7 +274,7 @@ public Optional visitMethod(@Nullable MethodTree node, Void v) { } @Override - public Optional visitMemberSelect(@Nullable MemberSelectTree node, Void v) { + public Optional visitMemberSelect(@Nullable MemberSelectTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getIdentifier())) { @@ -286,7 +285,8 @@ public Optional visitMemberSelect(@Nullable MemberSelectTree node, Voi } @Override - public Optional visitTypeParameter(@Nullable TypeParameterTree node, Void v) { + public Optional visitTypeParameter( + @Nullable TypeParameterTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getName())) { @@ -297,7 +297,7 @@ public Optional visitTypeParameter(@Nullable TypeParameterTree node, V } @Override - public Optional visitVariable(@Nullable VariableTree node, Void v) { + public Optional visitVariable(@Nullable VariableTree node, @Nullable Void v) { if (node == null) { return Optional.empty(); } else if (isMatch(node, node.getName())) { diff --git a/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java b/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java index 7082656f..30b7eeb3 100644 --- a/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java +++ b/src/main/java/com/google/testing/compile/ProcessedCompileTesterFactory.java @@ -16,7 +16,6 @@ package com.google.testing.compile; import java.io.File; -import javax.annotation.CheckReturnValue; import javax.annotation.processing.Processor; /** @@ -25,7 +24,6 @@ * * @author Gregory Kick */ -@CheckReturnValue public interface ProcessedCompileTesterFactory { /** diff --git a/src/main/java/com/google/testing/compile/TreeDiffer.java b/src/main/java/com/google/testing/compile/TreeDiffer.java index 662496fc..726abccb 100644 --- a/src/main/java/com/google/testing/compile/TreeDiffer.java +++ b/src/main/java/com/google/testing/compile/TreeDiffer.java @@ -19,6 +19,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.collect.Iterables.isEmpty; +import static java.util.Objects.requireNonNull; import com.google.auto.common.MoreTypes; import com.google.auto.value.AutoValue; @@ -87,10 +88,10 @@ import java.util.Iterator; import java.util.Optional; import java.util.Set; -import javax.annotation.Nullable; import javax.lang.model.element.Name; import javax.lang.model.type.TypeMirror; import javax.tools.JavaFileObject; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A class for determining how two compilation {@code Tree}s differ from each other. @@ -152,8 +153,7 @@ private static TreeDifference createDiff( * *

Used for testing. */ - static TreeDifference diffSubtrees( - @Nullable TreePath pathToExpected, @Nullable TreePath pathToActual) { + static TreeDifference diffSubtrees(TreePath pathToExpected, TreePath pathToActual) { TreeDifference.Builder diffBuilder = new TreeDifference.Builder(); DiffVisitor diffVisitor = new DiffVisitor(diffBuilder, TreeFilter.KEEP_ALL, pathToExpected, pathToActual); @@ -163,12 +163,12 @@ static TreeDifference diffSubtrees( /** * A {@code SimpleTreeVisitor} that traverses a {@link Tree} and an argument {@link Tree}, - * verifying equality along the way. Appends each diff it finds to a - * {@link TreeDifference.Builder}. + * verifying equality along the way. Appends each diff it finds to a {@link + * TreeDifference.Builder}. */ - static final class DiffVisitor extends SimpleTreeVisitor { - private TreePath expectedPath; - private TreePath actualPath; + static final class DiffVisitor extends SimpleTreeVisitor<@Nullable Void, Tree> { + private @Nullable TreePath expectedPath; + private @Nullable TreePath actualPath; private final TreeDifference.Builder diffBuilder; private final TreeFilter filter; @@ -177,12 +177,12 @@ static final class DiffVisitor extends SimpleTreeVisitor { this(diffBuilder, filter, null, null); } - /** - * Constructs a DiffVisitor whose {@code TreePath}s are initialized with the paths - * provided. - */ - private DiffVisitor(TreeDifference.Builder diffBuilder, TreeFilter filter, - TreePath pathToExpected, TreePath pathToActual) { + /** Constructs a DiffVisitor whose {@code TreePath}s are initialized with the paths provided. */ + private DiffVisitor( + TreeDifference.Builder diffBuilder, + TreeFilter filter, + @Nullable TreePath pathToExpected, + @Nullable TreePath pathToActual) { this.diffBuilder = diffBuilder; this.filter = filter; expectedPath = pathToExpected; @@ -206,7 +206,10 @@ public void addTypeMismatch(Tree expected, Tree actual) { @FormatMethod private void checkForDiff(boolean p, String message, Object... formatArgs) { if (!p) { - diffBuilder.addDifferingNodes(expectedPath, actualPath, String.format(message, formatArgs)); + diffBuilder.addDifferingNodes( + requireNonNull(expectedPath), + requireNonNull(actualPath), + String.format(message, formatArgs)); } } @@ -221,13 +224,13 @@ private TreePath expectedPathPlus(Tree expected) { } /** - * Pushes the {@code expected} and {@code actual} {@link Tree}s onto their respective - * {@link TreePath}s and recurses with {@code expected.accept(this, actual)}, popping the - * stack when the call completes. + * Pushes the {@code expected} and {@code actual} {@link Tree}s onto their respective {@link + * TreePath}s and recurses with {@code expected.accept(this, actual)}, popping the stack when + * the call completes. * *

This should be the ONLY place where either {@link TreePath} is mutated. */ - private Void pushPathAndAccept(Tree expected, Tree actual) { + private @Nullable Void pushPathAndAccept(Tree expected, Tree actual) { TreePath prevExpectedPath = expectedPath; TreePath prevActualPath = actualPath; expectedPath = expectedPathPlus(expected); @@ -277,7 +280,7 @@ private void parallelScan( } @Override - public Void visitAnnotation(AnnotationTree expected, Tree actual) { + public @Nullable Void visitAnnotation(AnnotationTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -290,7 +293,7 @@ public Void visitAnnotation(AnnotationTree expected, Tree actual) { } @Override - public Void visitMethodInvocation(MethodInvocationTree expected, Tree actual) { + public @Nullable Void visitMethodInvocation(MethodInvocationTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -304,7 +307,7 @@ public Void visitMethodInvocation(MethodInvocationTree expected, Tree actual) { } @Override - public Void visitLambdaExpression(LambdaExpressionTree expected, Tree actual) { + public @Nullable Void visitLambdaExpression(LambdaExpressionTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -317,7 +320,7 @@ public Void visitLambdaExpression(LambdaExpressionTree expected, Tree actual) { } @Override - public Void visitMemberReference(MemberReferenceTree expected, Tree actual) { + public @Nullable Void visitMemberReference(MemberReferenceTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -333,7 +336,7 @@ public Void visitMemberReference(MemberReferenceTree expected, Tree actual) { } @Override - public Void visitAssert(AssertTree expected, Tree actual) { + public @Nullable Void visitAssert(AssertTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -346,7 +349,7 @@ public Void visitAssert(AssertTree expected, Tree actual) { } @Override - public Void visitAssignment(AssignmentTree expected, Tree actual) { + public @Nullable Void visitAssignment(AssignmentTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -359,7 +362,7 @@ public Void visitAssignment(AssignmentTree expected, Tree actual) { } @Override - public Void visitCompoundAssignment(CompoundAssignmentTree expected, Tree actual) { + public @Nullable Void visitCompoundAssignment(CompoundAssignmentTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -372,7 +375,7 @@ public Void visitCompoundAssignment(CompoundAssignmentTree expected, Tree actual } @Override - public Void visitBinary(BinaryTree expected, Tree actual) { + public @Nullable Void visitBinary(BinaryTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -385,7 +388,7 @@ public Void visitBinary(BinaryTree expected, Tree actual) { } @Override - public Void visitBlock(BlockTree expected, Tree actual) { + public @Nullable Void visitBlock(BlockTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -401,7 +404,7 @@ public Void visitBlock(BlockTree expected, Tree actual) { } @Override - public Void visitBreak(BreakTree expected, Tree actual) { + public @Nullable Void visitBreak(BreakTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -415,7 +418,7 @@ public Void visitBreak(BreakTree expected, Tree actual) { } @Override - public Void visitCase(CaseTree expected, Tree actual) { + public @Nullable Void visitCase(CaseTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -428,7 +431,7 @@ public Void visitCase(CaseTree expected, Tree actual) { } @Override - public Void visitCatch(CatchTree expected, Tree actual) { + public @Nullable Void visitCatch(CatchTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -441,7 +444,7 @@ public Void visitCatch(CatchTree expected, Tree actual) { } @Override - public Void visitClass(ClassTree expected, Tree actual) { + public @Nullable Void visitClass(ClassTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -465,7 +468,8 @@ public Void visitClass(ClassTree expected, Tree actual) { } @Override - public Void visitConditionalExpression(ConditionalExpressionTree expected, Tree actual) { + public @Nullable Void visitConditionalExpression( + ConditionalExpressionTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -479,7 +483,7 @@ public Void visitConditionalExpression(ConditionalExpressionTree expected, Tree } @Override - public Void visitContinue(ContinueTree expected, Tree actual) { + public @Nullable Void visitContinue(ContinueTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -493,7 +497,7 @@ public Void visitContinue(ContinueTree expected, Tree actual) { } @Override - public Void visitDoWhileLoop(DoWhileLoopTree expected, Tree actual) { + public @Nullable Void visitDoWhileLoop(DoWhileLoopTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -506,7 +510,7 @@ public Void visitDoWhileLoop(DoWhileLoopTree expected, Tree actual) { } @Override - public Void visitErroneous(ErroneousTree expected, Tree actual) { + public @Nullable Void visitErroneous(ErroneousTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -518,7 +522,7 @@ public Void visitErroneous(ErroneousTree expected, Tree actual) { } @Override - public Void visitExpressionStatement(ExpressionStatementTree expected, Tree actual) { + public @Nullable Void visitExpressionStatement(ExpressionStatementTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -530,7 +534,7 @@ public Void visitExpressionStatement(ExpressionStatementTree expected, Tree actu } @Override - public Void visitEnhancedForLoop(EnhancedForLoopTree expected, Tree actual) { + public @Nullable Void visitEnhancedForLoop(EnhancedForLoopTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -544,7 +548,7 @@ public Void visitEnhancedForLoop(EnhancedForLoopTree expected, Tree actual) { } @Override - public Void visitForLoop(ForLoopTree expected, Tree actual) { + public @Nullable Void visitForLoop(ForLoopTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -559,7 +563,7 @@ public Void visitForLoop(ForLoopTree expected, Tree actual) { } @Override - public Void visitIdentifier(IdentifierTree expected, Tree actual) { + public @Nullable Void visitIdentifier(IdentifierTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -573,7 +577,7 @@ public Void visitIdentifier(IdentifierTree expected, Tree actual) { } @Override - public Void visitIf(IfTree expected, Tree actual) { + public @Nullable Void visitIf(IfTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -587,7 +591,7 @@ public Void visitIf(IfTree expected, Tree actual) { } @Override - public Void visitImport(ImportTree expected, Tree actual) { + public @Nullable Void visitImport(ImportTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -604,7 +608,7 @@ public Void visitImport(ImportTree expected, Tree actual) { } @Override - public Void visitArrayAccess(ArrayAccessTree expected, Tree actual) { + public @Nullable Void visitArrayAccess(ArrayAccessTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -617,7 +621,7 @@ public Void visitArrayAccess(ArrayAccessTree expected, Tree actual) { } @Override - public Void visitLabeledStatement(LabeledStatementTree expected, Tree actual) { + public @Nullable Void visitLabeledStatement(LabeledStatementTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -633,7 +637,7 @@ public Void visitLabeledStatement(LabeledStatementTree expected, Tree actual) { } @Override - public Void visitLiteral(LiteralTree expected, Tree actual) { + public @Nullable Void visitLiteral(LiteralTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -647,7 +651,7 @@ public Void visitLiteral(LiteralTree expected, Tree actual) { } @Override - public Void visitMethod(MethodTree expected, Tree actual) { + public @Nullable Void visitMethod(MethodTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -669,7 +673,7 @@ public Void visitMethod(MethodTree expected, Tree actual) { } @Override - public Void visitModifiers(ModifiersTree expected, Tree actual) { + public @Nullable Void visitModifiers(ModifiersTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -685,7 +689,7 @@ public Void visitModifiers(ModifiersTree expected, Tree actual) { } @Override - public Void visitNewArray(NewArrayTree expected, Tree actual) { + public @Nullable Void visitNewArray(NewArrayTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -699,7 +703,7 @@ public Void visitNewArray(NewArrayTree expected, Tree actual) { } @Override - public Void visitNewClass(NewClassTree expected, Tree actual) { + public @Nullable Void visitNewClass(NewClassTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -715,7 +719,7 @@ public Void visitNewClass(NewClassTree expected, Tree actual) { } @Override - public Void visitParenthesized(ParenthesizedTree expected, Tree actual) { + public @Nullable Void visitParenthesized(ParenthesizedTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -727,7 +731,7 @@ public Void visitParenthesized(ParenthesizedTree expected, Tree actual) { } @Override - public Void visitReturn(ReturnTree expected, Tree actual) { + public @Nullable Void visitReturn(ReturnTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -739,7 +743,7 @@ public Void visitReturn(ReturnTree expected, Tree actual) { } @Override - public Void visitMemberSelect(MemberSelectTree expected, Tree actual) { + public @Nullable Void visitMemberSelect(MemberSelectTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -755,7 +759,7 @@ public Void visitMemberSelect(MemberSelectTree expected, Tree actual) { } @Override - public Void visitEmptyStatement(EmptyStatementTree expected, Tree actual) { + public @Nullable Void visitEmptyStatement(EmptyStatementTree expected, Tree actual) { if (!checkTypeAndCast(expected, actual).isPresent()) { addTypeMismatch(expected, actual); return null; @@ -764,7 +768,7 @@ public Void visitEmptyStatement(EmptyStatementTree expected, Tree actual) { } @Override - public Void visitSwitch(SwitchTree expected, Tree actual) { + public @Nullable Void visitSwitch(SwitchTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -777,7 +781,7 @@ public Void visitSwitch(SwitchTree expected, Tree actual) { } @Override - public Void visitSynchronized(SynchronizedTree expected, Tree actual) { + public @Nullable Void visitSynchronized(SynchronizedTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -790,7 +794,7 @@ public Void visitSynchronized(SynchronizedTree expected, Tree actual) { } @Override - public Void visitThrow(ThrowTree expected, Tree actual) { + public @Nullable Void visitThrow(ThrowTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -802,7 +806,7 @@ public Void visitThrow(ThrowTree expected, Tree actual) { } @Override - public Void visitCompilationUnit(CompilationUnitTree expected, Tree actual) { + public @Nullable Void visitCompilationUnit(CompilationUnitTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -821,7 +825,7 @@ public Void visitCompilationUnit(CompilationUnitTree expected, Tree actual) { } @Override - public Void visitTry(TryTree expected, Tree actual) { + public @Nullable Void visitTry(TryTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -836,7 +840,7 @@ public Void visitTry(TryTree expected, Tree actual) { } @Override - public Void visitParameterizedType(ParameterizedTypeTree expected, Tree actual) { + public @Nullable Void visitParameterizedType(ParameterizedTypeTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -849,7 +853,7 @@ public Void visitParameterizedType(ParameterizedTypeTree expected, Tree actual) } @Override - public Void visitArrayType(ArrayTypeTree expected, Tree actual) { + public @Nullable Void visitArrayType(ArrayTypeTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -861,7 +865,7 @@ public Void visitArrayType(ArrayTypeTree expected, Tree actual) { } @Override - public Void visitTypeCast(TypeCastTree expected, Tree actual) { + public @Nullable Void visitTypeCast(TypeCastTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -874,7 +878,7 @@ public Void visitTypeCast(TypeCastTree expected, Tree actual) { } @Override - public Void visitPrimitiveType(PrimitiveTypeTree expected, Tree actual) { + public @Nullable Void visitPrimitiveType(PrimitiveTypeTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -888,7 +892,7 @@ public Void visitPrimitiveType(PrimitiveTypeTree expected, Tree actual) { } @Override - public Void visitTypeParameter(TypeParameterTree expected, Tree actual) { + public @Nullable Void visitTypeParameter(TypeParameterTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -904,7 +908,7 @@ public Void visitTypeParameter(TypeParameterTree expected, Tree actual) { } @Override - public Void visitInstanceOf(InstanceOfTree expected, Tree actual) { + public @Nullable Void visitInstanceOf(InstanceOfTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -917,7 +921,7 @@ public Void visitInstanceOf(InstanceOfTree expected, Tree actual) { } @Override - public Void visitUnary(UnaryTree expected, Tree actual) { + public @Nullable Void visitUnary(UnaryTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -929,7 +933,7 @@ public Void visitUnary(UnaryTree expected, Tree actual) { } @Override - public Void visitVariable(VariableTree expected, Tree actual) { + public @Nullable Void visitVariable(VariableTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -947,7 +951,7 @@ public Void visitVariable(VariableTree expected, Tree actual) { } @Override - public Void visitWhileLoop(WhileLoopTree expected, Tree actual) { + public @Nullable Void visitWhileLoop(WhileLoopTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -960,7 +964,7 @@ public Void visitWhileLoop(WhileLoopTree expected, Tree actual) { } @Override - public Void visitWildcard(WildcardTree expected, Tree actual) { + public @Nullable Void visitWildcard(WildcardTree expected, Tree actual) { Optional other = checkTypeAndCast(expected, actual); if (!other.isPresent()) { addTypeMismatch(expected, actual); @@ -972,7 +976,7 @@ public Void visitWildcard(WildcardTree expected, Tree actual) { } @Override - public Void visitOther(Tree expected, Tree actual) { + public @Nullable Void visitOther(Tree expected, Tree actual) { throw new UnsupportedOperationException("cannot compare unknown trees"); } @@ -1048,21 +1052,21 @@ public ImmutableList filterActualMembers( Set patternMethods = new HashSet<>(); for (Tree patternTree : patternMembers) { patternTree.accept( - new SimpleTreeVisitor() { + new SimpleTreeVisitor<@Nullable Void, @Nullable Void>() { @Override - public Void visitVariable(VariableTree variable, Void p) { + public @Nullable Void visitVariable(VariableTree variable, @Nullable Void p) { patternVariableNames.add(variable.getName().toString()); return null; } @Override - public Void visitMethod(MethodTree method, Void p) { + public @Nullable Void visitMethod(MethodTree method, @Nullable Void p) { patternMethods.add(MethodSignature.create(pattern, method, patternTrees)); return null; } @Override - public Void visitClass(ClassTree clazz, Void p) { + public @Nullable Void visitClass(ClassTree clazz, @Nullable Void p) { patternNestedTypeNames.add(clazz.getSimpleName().toString()); return null; } @@ -1072,37 +1076,39 @@ public Void visitClass(ClassTree clazz, Void p) { ImmutableList.Builder filteredActualTrees = ImmutableList.builder(); for (Tree actualTree : actualMembers) { - actualTree.accept(new SimpleTreeVisitor(){ - @Override - public Void visitVariable(VariableTree variable, Void p) { - if (patternVariableNames.contains(variable.getName().toString())) { - filteredActualTrees.add(actualTree); - } - return null; - } + actualTree.accept( + new SimpleTreeVisitor<@Nullable Void, @Nullable Void>() { + @Override + public @Nullable Void visitVariable(VariableTree variable, @Nullable Void p) { + if (patternVariableNames.contains(variable.getName().toString())) { + filteredActualTrees.add(actualTree); + } + return null; + } - @Override - public Void visitMethod(MethodTree method, Void p) { - if (patternMethods.contains(MethodSignature.create(actual, method, actualTrees))) { - filteredActualTrees.add(method); - } - return null; - } + @Override + public @Nullable Void visitMethod(MethodTree method, @Nullable Void p) { + if (patternMethods.contains(MethodSignature.create(actual, method, actualTrees))) { + filteredActualTrees.add(method); + } + return null; + } - @Override - public Void visitClass(ClassTree clazz, Void p) { - if (patternNestedTypeNames.contains(clazz.getSimpleName().toString())) { - filteredActualTrees.add(clazz); - } - return null; - } + @Override + public @Nullable Void visitClass(ClassTree clazz, @Nullable Void p) { + if (patternNestedTypeNames.contains(clazz.getSimpleName().toString())) { + filteredActualTrees.add(clazz); + } + return null; + } - @Override - protected Void defaultAction(Tree tree, Void p) { - filteredActualTrees.add(tree); - return null; - } - }, null); + @Override + protected @Nullable Void defaultAction(Tree tree, @Nullable Void p) { + filteredActualTrees.add(tree); + return null; + } + }, + null); } return filteredActualTrees.build(); } @@ -1125,22 +1131,23 @@ private String fullyQualifiedImport(ImportTree importTree) { } } - private static final TreeVisitor> IMPORT_NAMES_ACCUMULATOR = - new SimpleTreeVisitor>() { - @Override - public Void visitMemberSelect( - MemberSelectTree memberSelectTree, ImmutableList.Builder names) { - names.add(memberSelectTree.getIdentifier()); - return memberSelectTree.getExpression().accept(this, names); - } + private static final TreeVisitor<@Nullable Void, ImmutableList.Builder> + IMPORT_NAMES_ACCUMULATOR = + new SimpleTreeVisitor<@Nullable Void, ImmutableList.Builder>() { + @Override + public @Nullable Void visitMemberSelect( + MemberSelectTree memberSelectTree, ImmutableList.Builder names) { + names.add(memberSelectTree.getIdentifier()); + return memberSelectTree.getExpression().accept(this, names); + } - @Override - public Void visitIdentifier( - IdentifierTree identifierTree, ImmutableList.Builder names) { - names.add(identifierTree.getName()); - return null; - } - }; + @Override + public @Nullable Void visitIdentifier( + IdentifierTree identifierTree, ImmutableList.Builder names) { + names.add(identifierTree.getName()); + return null; + } + }; @AutoValue abstract static class MethodSignature { diff --git a/src/main/java/com/google/testing/compile/TreeDifference.java b/src/main/java/com/google/testing/compile/TreeDifference.java index aa6d7667..1170bbfd 100644 --- a/src/main/java/com/google/testing/compile/TreeDifference.java +++ b/src/main/java/com/google/testing/compile/TreeDifference.java @@ -20,11 +20,9 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; - import com.sun.source.tree.Tree; import com.sun.source.util.TreePath; - -import javax.annotation.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A data structure describing the set of syntactic differences between two {@link Tree}s. diff --git a/src/main/java/com/google/testing/compile/TypeEnumerator.java b/src/main/java/com/google/testing/compile/TypeEnumerator.java index 646d1e8d..a385ac75 100644 --- a/src/main/java/com/google/testing/compile/TypeEnumerator.java +++ b/src/main/java/com/google/testing/compile/TypeEnumerator.java @@ -29,10 +29,10 @@ import com.sun.source.tree.Tree; import com.sun.source.util.TreeScanner; import java.util.Set; +import org.checkerframework.checker.nullness.qual.Nullable; /** - * Provides information about the set of types that are declared by a - * {@code CompilationUnitTree}. + * Provides information about the set of types that are declared by a {@code CompilationUnitTree}. * * @author Stephen Pratt */ @@ -48,13 +48,11 @@ static ImmutableSet getTopLevelTypes(CompilationUnitTree t) { return ImmutableSet.copyOf(nameVisitor.scan(t, null)); } - /** - * A {@link TreeScanner} for determining type declarations - */ + /** A {@link TreeScanner} for determining type declarations */ @SuppressWarnings("restriction") // Sun APIs usage intended - static final class TypeScanner extends TreeScanner, Void> { + static final class TypeScanner extends TreeScanner, @Nullable Void> { @Override - public Set scan(Tree node, Void v) { + public Set scan(Tree node, @Nullable Void v) { return firstNonNull(super.scan(node, v), ImmutableSet.of()); } @@ -64,22 +62,23 @@ public Set reduce(Set r1, Set r2) { } @Override - public Set visitClass(ClassTree reference, Void v) { + public Set visitClass(ClassTree reference, @Nullable Void v) { return ImmutableSet.of(reference.getSimpleName().toString()); } @Override - public Set visitExpressionStatement(ExpressionStatementTree reference, Void v) { + public Set visitExpressionStatement( + ExpressionStatementTree reference, @Nullable Void v) { return scan(reference.getExpression(), v); } @Override - public Set visitIdentifier(IdentifierTree reference, Void v) { + public Set visitIdentifier(IdentifierTree reference, @Nullable Void v) { return ImmutableSet.of(reference.getName().toString()); } @Override - public Set visitMemberSelect(MemberSelectTree reference, Void v) { + public Set visitMemberSelect(MemberSelectTree reference, @Nullable Void v) { Set expressionSet = scan(reference.getExpression(), v); if (expressionSet.size() != 1) { throw new AssertionError("Internal error in NameFinder. Expected to find exactly one " @@ -90,7 +89,7 @@ public Set visitMemberSelect(MemberSelectTree reference, Void v) { } @Override - public Set visitCompilationUnit(CompilationUnitTree reference, Void v) { + public Set visitCompilationUnit(CompilationUnitTree reference, @Nullable Void v) { Set packageSet = reference.getPackageName() == null ? ImmutableSet.of("") : scan(reference.getPackageName(), v); if (packageSet.size() != 1) { diff --git a/src/main/java/com/google/testing/compile/package-info.java b/src/main/java/com/google/testing/compile/package-info.java index a750743c..dd055836 100644 --- a/src/main/java/com/google/testing/compile/package-info.java +++ b/src/main/java/com/google/testing/compile/package-info.java @@ -21,13 +21,13 @@ * projects. * *

    - *
  • {@link Compiler} lets you choose command-line options, annotation processors, and source - * files to compile. - *
  • {@link Compilation} represents the immutable result of compiling source files: diagnostics - * and generated files. - *
  • {@link CompilationSubject} lets you make assertions about {@link Compilation} objects. - *
  • {@link JavaFileObjectSubject} lets you make assertions about {@link - * javax.tools.JavaFileObject} objects. + *
  • {@link Compiler} lets you choose command-line options, annotation processors, and source + * files to compile. + *
  • {@link Compilation} represents the immutable result of compiling source files: diagnostics + * and generated files. + *
  • {@link CompilationSubject} lets you make assertions about {@link Compilation} objects. + *
  • {@link JavaFileObjectSubject} lets you make assertions about {@link + * javax.tools.JavaFileObject} objects. *
* *

A simple example that tests that compiling a source file succeeded is: @@ -85,4 +85,4 @@ @CheckReturnValue package com.google.testing.compile; -import javax.annotation.CheckReturnValue; +import com.google.errorprone.annotations.CheckReturnValue; From 93d95e841eb5c4352ec48806c01f6eca49ab4abf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 08:11:59 -0700 Subject: [PATCH 093/300] Bump checker-qual from 3.14.0 to 3.15.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.14.0 to 3.15.0.

Release notes

Sourced from checker-qual's releases.

Checker Framework 3.15.0

Version 3.15.0 (June 18, 2021)

User-visible changes:

The Resource Leak Checker ensures that certain methods are called on an object before it is de-allocated. By default, it enforces that close() is called on any expression whose compile-time type implements java.io.Closeable.

Implementation details:

Method renamings (the old methods remain but are deprecated):

  • AnnotatedDeclaredType#wasRaw => isUnderlyingTypeRaw
  • AnnotatedDeclaredType#setWasRaw => setIsUnderlyingTypeRaw

Closed issues: #4549, #4646, #4684, and #4699.

Changelog

Sourced from checker-qual's changelog.

Version 3.15.0 (June 18, 2021)

User-visible changes:

The Resource Leak Checker ensures that certain methods are called on an object before it is de-allocated. By default, it enforces that close() is called on any expression whose compile-time type implements java.io.Closeable.

Implementation details:

Method renamings (the old methods remain but are deprecated):

  • AnnotatedDeclaredType#wasRaw => isUnderlyingTypeRaw
  • AnnotatedDeclaredType#setWasRaw => setIsUnderlyingTypeRaw

Closed issues: #4549, #4646, #4684, and #4699.

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.14.0&new-version=3.15.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #255 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/255 from google:dependabot/maven/org.checkerframework-checker-qual-3.15.0 d18e9706be674a132ed3cf000629a5775ef43fd4 PiperOrigin-RevId: 380580524 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ef72255..f7741d82 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.14.0 + 3.15.0 From 3b9095d698e47f5c9c0ec0872f4057d595a5ed02 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Mon, 21 Jun 2021 08:23:11 -0700 Subject: [PATCH 094/300] Simplify by using an AutoValue type instead of maps. RELNOTES=n/a PiperOrigin-RevId: 380582497 --- .../testing/compile/JavaSourcesSubject.java | 123 ++++++++---------- 1 file changed, 55 insertions(+), 68 deletions(-) diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 26a1d37c..5b0ef18b 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -15,14 +15,16 @@ */ package com.google.testing.compile; +import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.truth.Fact.simpleFact; import static com.google.common.truth.Truth.assertAbout; import static com.google.testing.compile.CompilationSubject.compilations; import static com.google.testing.compile.Compiler.javac; import static com.google.testing.compile.JavaSourcesSubjectFactory.javaSources; -import static java.util.Objects.requireNonNull; +import static com.google.testing.compile.TypeEnumerator.getTopLevelTypes; import static java.util.stream.Collectors.toList; +import com.google.auto.value.AutoValue; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -37,16 +39,6 @@ import com.google.testing.compile.CompilationSubject.DiagnosticAtColumn; import com.google.testing.compile.CompilationSubject.DiagnosticInFile; import com.google.testing.compile.CompilationSubject.DiagnosticOnLine; -import com.google.testing.compile.CompileTester.ChainingClause; -import com.google.testing.compile.CompileTester.CleanCompilationClause; -import com.google.testing.compile.CompileTester.ColumnClause; -import com.google.testing.compile.CompileTester.CompilationWithWarningsClause; -import com.google.testing.compile.CompileTester.FileClause; -import com.google.testing.compile.CompileTester.GeneratedPredicateClause; -import com.google.testing.compile.CompileTester.LineClause; -import com.google.testing.compile.CompileTester.SuccessfulCompilationClause; -import com.google.testing.compile.CompileTester.SuccessfulFileClause; -import com.google.testing.compile.CompileTester.UnsuccessfulCompilationClause; import com.google.testing.compile.Parser.ParseResult; import com.sun.source.tree.CompilationUnitTree; import java.io.File; @@ -55,7 +47,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.Optional; import javax.annotation.processing.Processor; import javax.tools.Diagnostic; @@ -178,66 +169,51 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { failWithoutActual(simpleFact(message.toString())); return; } - final ParseResult expectedResult = Parser.parse(Lists.asList(first, rest)); - final ImmutableList actualTrees = - actualResult.compilationUnits(); - final ImmutableList expectedTrees = - expectedResult.compilationUnits(); - - final ImmutableMap> expectedTreeTypes = - Maps.toMap(expectedTrees, TypeEnumerator::getTopLevelTypes); - - final ImmutableMap> actualTreeTypes = - Maps.toMap(actualTrees, TypeEnumerator::getTopLevelTypes); - - final ImmutableMap> - matchedTrees = - Maps.toMap( - expectedTrees, - expectedTree -> - actualTrees.stream() - .filter( - actualTree -> - /* - * requireNonNull is safe -- that is, expectedTree must be a key - * of expectedTreeTypes: expectedTreeTypes was constructed from - * the expectedTrees list, the same collection that expectedTree - * came from. - */ - requireNonNull(expectedTreeTypes.get(expectedTree)) - .equals(actualTreeTypes.get(actualTree))) - .findFirst()); - - for (Map.Entry> - matchedTreePair : matchedTrees.entrySet()) { - final CompilationUnitTree expectedTree = matchedTreePair.getKey(); - if (!matchedTreePair.getValue().isPresent()) { - failNoCandidates( - // see comment above - requireNonNull(expectedTreeTypes.get(expectedTree)), - expectedTree, - actualTreeTypes, - actualTrees); - } else { - CompilationUnitTree actualTree = matchedTreePair.getValue().get(); - TreeDifference treeDifference = TreeDiffer.diffCompilationUnits(expectedTree, actualTree); - if (!treeDifference.isEmpty()) { - String diffReport = - treeDifference.getDiffReport( - new TreeContext(expectedTree, expectedResult.trees()), - new TreeContext(actualTree, actualResult.trees())); - failWithCandidate(expectedTree.getSourceFile(), actualTree.getSourceFile(), diffReport); - } - } - } + ParseResult expectedResult = Parser.parse(Lists.asList(first, rest)); + ImmutableList actualTrees = + actualResult.compilationUnits().stream() + .map(TypedCompilationUnit::create) + .collect(toImmutableList()); + ImmutableList expectedTrees = + expectedResult.compilationUnits().stream() + .map(TypedCompilationUnit::create) + .collect(toImmutableList()); + + ImmutableMap> matchedTrees = + Maps.toMap( + expectedTrees, + expectedTree -> + actualTrees.stream() + .filter(actualTree -> expectedTree.types().equals(actualTree.types())) + .findFirst()); + + matchedTrees.forEach( + (expectedTree, maybeActualTree) -> { + if (!maybeActualTree.isPresent()) { + failNoCandidates(expectedTree.types(), expectedTree.tree(), actualTrees); + return; + } + TypedCompilationUnit actualTree = maybeActualTree.get(); + TreeDifference treeDifference = + TreeDiffer.diffCompilationUnits(expectedTree.tree(), actualTree.tree()); + if (!treeDifference.isEmpty()) { + String diffReport = + treeDifference.getDiffReport( + new TreeContext(expectedTree.tree(), expectedResult.trees()), + new TreeContext(actualTree.tree(), actualResult.trees())); + failWithCandidate( + expectedTree.tree().getSourceFile(), + actualTree.tree().getSourceFile(), + diffReport); + } + }); } /** Called when the {@code generatesSources()} verb fails with no diff candidates. */ private void failNoCandidates( ImmutableSet expectedTypes, CompilationUnitTree expectedTree, - final ImmutableMap> actualTypes, - ImmutableList actualTrees) { + ImmutableList actualTrees) { String generatedTypesReport = Joiner.on('\n') .join( @@ -246,8 +222,8 @@ private void failNoCandidates( generated -> String.format( "- %s in <%s>", - actualTypes.get(generated), - generated.getSourceFile().toUri().getPath())) + generated.types(), + generated.tree().getSourceFile().toUri().getPath())) .collect(toList())); failWithoutActual( simpleFact( @@ -339,6 +315,17 @@ private Compilation compilation() { } } + @AutoValue + abstract static class TypedCompilationUnit { + abstract CompilationUnitTree tree(); + + abstract ImmutableSet types(); + + static TypedCompilationUnit create(CompilationUnitTree tree) { + return new AutoValue_JavaSourcesSubject_TypedCompilationUnit(tree, getTopLevelTypes(tree)); + } + } + /** * A helper method for {@link SingleSourceAdapter} to ensure that the inner class is created * correctly. From fd1e44afcf367f8365583650e72a0cb2b290942c Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Mon, 21 Jun 2021 15:34:31 -0700 Subject: [PATCH 095/300] Avoid using Guava's `toImmutableList()` collector, since some compilation tests incorrectly pull in Android dependencies. RELNOTES=n/a PiperOrigin-RevId: 380679008 --- .../com/google/testing/compile/JavaSourcesSubject.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 5b0ef18b..f55276fe 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -15,13 +15,13 @@ */ package com.google.testing.compile; -import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.truth.Fact.simpleFact; import static com.google.common.truth.Truth.assertAbout; import static com.google.testing.compile.CompilationSubject.compilations; import static com.google.testing.compile.Compiler.javac; import static com.google.testing.compile.JavaSourcesSubjectFactory.javaSources; import static com.google.testing.compile.TypeEnumerator.getTopLevelTypes; +import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; import com.google.auto.value.AutoValue; @@ -48,6 +48,7 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +import java.util.stream.Collector; import javax.annotation.processing.Processor; import javax.tools.Diagnostic; import javax.tools.Diagnostic.Kind; @@ -579,6 +580,10 @@ public static JavaSourcesSubject assertThat( .build()); } + private static Collector> toImmutableList() { + return collectingAndThen(toList(), ImmutableList::copyOf); + } + public static final class SingleSourceAdapter extends Subject implements CompileTester, ProcessedCompileTesterFactory { private final JavaSourcesSubject delegate; From 1fee4c366434bf0bf49b2932f95b14bc0511d200 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Wed, 30 Jun 2021 03:30:10 -0700 Subject: [PATCH 096/300] Annotate `collect` static utilities for nullness. RELNOTES=n/a PiperOrigin-RevId: 382268713 --- .../java/com/google/testing/compile/CompilationSubject.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 1bf8b64a..04a5aba3 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Iterables.size; -import static com.google.common.collect.Streams.mapWithIndex; import static com.google.common.truth.Fact.fact; import static com.google.common.truth.Fact.simpleFact; import static com.google.common.truth.Truth.assertAbout; @@ -37,6 +36,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import com.google.common.collect.Streams; import com.google.common.truth.Fact; import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; @@ -55,6 +55,7 @@ import javax.tools.JavaFileManager.Location; import javax.tools.JavaFileObject; import javax.tools.StandardLocation; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link Truth} subject for a {@link Compilation}. */ public final class CompilationSubject extends Subject { @@ -510,8 +511,9 @@ public void onLineContaining(String expectedLineSubstring) { * expectedLineSubstring} */ private long findLineContainingSubstring(String expectedLineSubstring) { + // The explicit type arguments below are needed by our nullness checker. ImmutableSet matchingLines = - mapWithIndex( + Streams.mapWithIndex( linesInFile.linesInFile().stream(), (line, index) -> line.contains(expectedLineSubstring) ? index : null) .filter(notNull()) From ee9301e76dedfcd6b324926e285707d44e54d8a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jul 2021 07:21:19 -0700 Subject: [PATCH 097/300] Internal change PiperOrigin-RevId: 383406555 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7741d82..489670e3 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ com.google.auto auto-common - 1.0.1 + 1.1 org.checkerframework From 55f6f7bfb0359372c1844a3d5de61e123efb180c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Jul 2021 07:55:35 -0700 Subject: [PATCH 098/300] Bump checker-qual from 3.15.0 to 3.16.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.15.0 to 3.16.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.16.0

Version 3.16.0 (July 13, 2021)

User-visible changes:

You can run the Checker Framework on a JDK 16 JVM. You can pass the --release 16 command-line argument to the compiler. New syntax, such as records and switch expressions, is not yet supported or type-checked; that will be added in a future release. Thanks to Neil Brown for the JDK 16 support.

The Lock Checker supports a new type, @NewObject, for the result of a constructor invocation.

The -Ainfer command-line argument now outputs purity annotations even if neither -AsuggestPureMethods nor AcheckPurityAnnotations is supplied on the command line.

Implementation details:

Method renamings (the old methods remain but are deprecated):

  • AnnotationFileElementTypes.getDeclAnnotation => getDeclAnnotations

Method renamings (the old methods were removed):

  • AnnotatedTypeMirror.clearAnnotations => clearPrimaryAnnotations`

Method renamings in DefaultTypeHierarchy (the old methods were removed):

  • visitIntersectionSupertype => visitIntersectionSupertype
  • visitIntersectionSubtype => visitIntersection_Type
  • visitUnionSubtype => visitUnion_Type
  • visitTypevarSubtype => visitTypevar_Type
  • visitTypevarSupertype => visitType_Typevar
  • visitWildcardSubtype => visitWildcard_Type
  • visitWildcardSupertype => visitType_Wildcard

Method renamings in AnnotatedTypes (the old methods were removed):

  • expandVarArgs => expandVarArgsParameters
  • expandVarArgsFromTypes => expandVarArgsParametersFromTypes

Closed issues: #3013, #3754, #3791, #3845, #4523, #4767.

Changelog

Sourced from checker-qual's changelog.

Version 3.16.0 (July 13, 2021)

User-visible changes:

You can run the Checker Framework on a JDK 16 JVM. You can pass the --release 16 command-line argument to the compiler. New syntax, such as records and switch expressions, is not yet supported or type-checked; that will be added in a future release. Thanks to Neil Brown for the JDK 16 support.

The Lock Checker supports a new type, @NewObject, for the result of a constructor invocation.

The -Ainfer command-line argument now outputs purity annotations even if neither -AsuggestPureMethods nor -AcheckPurityAnnotations is supplied on the command line.

Implementation details:

Method renamings (the old methods remain but are deprecated):

  • AnnotationFileElementTypes.getDeclAnnotation => getDeclAnnotations

Method renamings (the old methods were removed):

  • AnnotatedTypeMirror.clearAnnotations => clearPrimaryAnnotations`

Method renamings in DefaultTypeHierarchy (the old methods were removed):

  • visitIntersectionSupertype => visitIntersectionSupertype
  • visitIntersectionSubtype => visitIntersection_Type
  • visitUnionSubtype => visitUnion_Type
  • visitTypevarSubtype => visitTypevar_Type
  • visitTypevarSupertype => visitType_Typevar
  • visitWildcardSubtype => visitWildcard_Type
  • visitWildcardSupertype => visitType_Wildcard

Method renamings in AnnotatedTypes (the old methods were removed):

  • expandVarArgs => expandVarArgsParameters
  • expandVarArgsFromTypes => expandVarArgsParametersFromTypes

Closed issues: #3013, #3754, #3791, #3845, #4523, #4767.

Commits
  • b46af74 new release 3.16.0
  • fa9d62e Fix allJavadocJar task.
  • 9d8d350 Clarify changelog
  • 22b7997 Update version number.
  • 01024ce Add closed issues.
  • 4ee263f JDK 16 compatibility (#4677)
  • 8475fd7 Implement capture conversion
  • 74c8e2c Use updated versions of wpi-many test repos that should build on Java 16
  • 6218bbf Under JDK 8, don't compile options; under JDK 11, do compile require-javadoc
  • e24c8a2 Show output if command fails
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.15.0&new-version=3.16.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #260 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/260 from google:dependabot/maven/org.checkerframework-checker-qual-3.16.0 97844ee8d33a3f3354a0b9c7845032c0e700f365 PiperOrigin-RevId: 384698608 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 489670e3..0bcf95f7 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.15.0 + 3.16.0 From b748f6f7bc6b585920d63d3941176df15b9b395b Mon Sep 17 00:00:00 2001 From: cpovirk Date: Thu, 15 Jul 2021 07:42:18 -0700 Subject: [PATCH 099/300] "Annotate" `withOptions` to require non-null objects. (`?` means "anything"; `? extends Object` means "anything non-null.") The nullness checker catches this once I annotate `FluentIterable` in CL 384698326. After that change, it can see that `from` creates a `FluentIterable<@Nullable Object>` rather than a `FluentIterable`\[*\]. Given that, it knows that `toStringFunction` (which rejects nulls -- probably the right behavior here) is not safe. \[*\]: OK, technically, both of those are probably `T1-capture-of-Object` or whatever, rather than plain `Object`? Whatever :) RELNOTES=n/a PiperOrigin-RevId: 384924172 --- src/main/java/com/google/testing/compile/Compiler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/testing/compile/Compiler.java b/src/main/java/com/google/testing/compile/Compiler.java index 7d457f81..0ae8bf03 100644 --- a/src/main/java/com/google/testing/compile/Compiler.java +++ b/src/main/java/com/google/testing/compile/Compiler.java @@ -116,7 +116,7 @@ public final Compiler withOptions(Object... options) { * * @return a new instance with the same processors and the given options */ - public final Compiler withOptions(Iterable options) { + public final Compiler withOptions(Iterable options) { return copy( processors(), FluentIterable.from(options).transform(toStringFunction()).toList(), From 206445605c4f515d6aaac57775747bf5ecdd03f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jul 2021 08:19:07 -0700 Subject: [PATCH 100/300] Bump auto-value from 1.8.1 to 1.8.2 Bumps [auto-value](https://github.com/google/auto) from 1.8.1 to 1.8.2.
Release notes

Sourced from auto-value's releases.

AutoValue 1.8.2

  • Fixed a bug with AutoBuilder and property builder methods. (05ea1356)
  • Generated builder code is now slightly friendly to null-analysis. (f00c32a5)
  • Fixed a problem where @SerializableAutoValue could generate incorrect code for complex types. (689c8d49)
  • Implicitly exclude Kotlin @Metadata annotations from @CopyAnnotations (7d3aa66e)
Commits
  • 19a86d6 Set version number for auto-value-parent to 1.8.2.
  • 04ebf9c Bump kotlin.version from 1.5.20 to 1.5.21 in /value
  • f09743c Annotate com.google.auto.factory for null hygiene.
  • 895a4d5 Internal change
  • e72fc7b Internal change
  • 4f6f782 Internal change
  • 3b1f449 Avoid wildcards, which confuse our nullness checker.
  • 9d79ce1 Annotate auto-common for nullness.
  • 2ee7f62 Rewrite some references to JSpecify @Nullable to prevent their being rewrit...
  • c68b2ff Use more fluent streams constructs.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.8.1&new-version=1.8.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #262 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/262 from google:dependabot/maven/com.google.auto.value-auto-value-1.8.2 0480fc83789160771b27990e51c2b6cde079ea4d PiperOrigin-RevId: 385558252 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0bcf95f7..1c7b1b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.auto.value auto-value - 1.8.1 + 1.8.2 com.google.auto From 5a19283a9fc26490dde7cb4d31fda110af97dc73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Jul 2021 06:38:32 -0700 Subject: [PATCH 101/300] Bump error_prone_annotations from 2.7.1 to 2.8.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.7.1 to 2.8.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.8.0

New Checks:

Fixes #1652, #2122, #2122, #2366, #2404, #2411

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.7.1&new-version=2.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #263 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/263 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.8.0 ee10429230b87c17bdfed5719c5624ce67e889e1 PiperOrigin-RevId: 386444230 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c7b1b1c..92be943c 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.7.1 + 2.8.0 provided From 2e0e5055a8882d01c9a2c006aca7a01a84ed7da7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 08:48:01 -0700 Subject: [PATCH 102/300] Bump auto-common from 1.1 to 1.1.2 Bumps [auto-common](https://github.com/google/auto) from 1.1 to 1.1.2.
Release notes

Sourced from auto-common's releases.

AutoCommon 1.1.2

  • Add AnnotationMirrors.toString and AnnotationValues.toString (00cb81ed)

(The AutoCommon 1.1.1 release was incorrect and should not be used.)

Commits
  • 3cd32f8 Set version number for auto-common to 1.1.2.
  • 3e1a318 Bump errorprone.version from 2.7.1 to 2.8.0 in /value
  • bc250f6 Simplify old GWT-handling code in AutoValue.
  • df56d18 Add explicit casts to deficient numeric types
  • 22db69d Bump auto-value-annotations from 1.8.1 to 1.8.2 in /factory
  • e3a8b2b Mark non-static non-abstract methods as final in the examples.
  • 00cb81e Add support for printing AnnotationValues and AnnotationMirrors
  • 04ebf9c Bump kotlin.version from 1.5.20 to 1.5.21 in /value
  • f09743c Annotate com.google.auto.factory for null hygiene.
  • 895a4d5 Internal change
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto:auto-common&package-manager=maven&previous-version=1.1&new-version=1.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #264 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/264 from google:dependabot/maven/com.google.auto-auto-common-1.1.2 c338dc7032b90439853066a4fa500c2694a01b01 PiperOrigin-RevId: 387118335 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92be943c..95c36df5 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ com.google.auto auto-common - 1.1 + 1.1.2 org.checkerframework From af8fdd4f7729b0e54076e03dcf0d95d5efc6604b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Jul 2021 07:06:24 -0700 Subject: [PATCH 103/300] Bump styfle/cancel-workflow-action from 0.9.0 to 0.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.9.0 to 0.9.1.
Release notes

Sourced from styfle/cancel-workflow-action's releases.

0.9.1

Patches

  • Fix: cancelling jobs from different repos where two branches have the same name: #105
  • Fix: use getBooleanInput instead of getInput: #92
  • Chore: add permissions configuration in the README.md: #96
  • Chore: add prettier config, format file, add lint workflow: #63
  • Chore: create dependabot.yml: #68
  • Bump typescript from 4.1.5 to 4.2.4: #71
  • Bump actions/setup-node requirement to v2.1.5: #69
  • Bump @​vercel/ncc to 0.28.3: #73
  • Bump @​actions/core from 1.2.6 to 1.2.7: #74
  • Bump @​vercel/ncc from 0.28.3 to 0.28.5: #81
  • Bump @​actions/core from 1.2.7 to 1.3.0: #90
  • Bump prettier from 2.2.1 to 2.3.0: #85
  • Bump @​vercel/ncc from 0.28.5 to 0.28.6: #95
  • Bump typescript from 4.2.4 to 4.3.2: #94
  • Bump prettier from 2.3.0 to 2.3.1: #97
  • Bump typescript from 4.3.2 to 4.3.4: #99
  • Bump prettier from 2.3.1 to 2.3.2: #100
  • Bump typescript from 4.3.4 to 4.3.5: #101
  • Bump husky from 6.0.0 to 7.0.0: #102
  • Bump husky from 7.0.0 to 7.0.1: #103

Credits

Huge thanks to @​mikehardy, @​MichaelDeBoey, @​Warashi, @​adrienbernede, and @​spaceface777 for helping!

Commits
  • a40b884 0.9.1
  • a66ae1f fix cancelling jobs from different repos where two branches have the same nam...
  • b54f1a5 Bump husky from 7.0.0 to 7.0.1 (#103)
  • cc6225c Bump husky from 6.0.0 to 7.0.0 (#102)
  • c94109d Bump typescript from 4.3.4 to 4.3.5 (#101)
  • fc3581b Bump prettier from 2.3.1 to 2.3.2 (#100)
  • 6f9f8b4 Bump typescript from 4.3.2 to 4.3.4 (#99)
  • 6135c0f Bump prettier from 2.3.0 to 2.3.1 (#97)
  • 531a036 chore: add permissions configuration in the README.md (#96)
  • 1f10757 Bump typescript from 4.2.4 to 4.3.2 (#94)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=styfle/cancel-workflow-action&package-manager=github_actions&previous-version=0.9.0&new-version=0.9.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #265 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/265 from google:dependabot/github_actions/styfle/cancel-workflow-action-0.9.1 9d659a00ca9bdff414cabcad54493ba04fd434e4 PiperOrigin-RevId: 387796852 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3e6cb94..830c4a0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: # Cancel any previous runs for the same branch that are still running. - name: 'Cancel previous runs' - uses: styfle/cancel-workflow-action@0.9.0 + uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} - name: 'Check out repository' From 320ff8df6d889f1b3b5f7f0e711e45d5fd251a2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 11:06:57 -0700 Subject: [PATCH 104/300] Bump checker-qual from 3.16.0 to 3.17.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.16.0 to 3.17.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.17.0

Version 3.17.0 (August 2, 2021)

User-visible changes:

-Ainfer can now infer postcondition annotations that reference formal parameters (e.g. "[#1](https://github.com/typetools/checker-framework/issues/1)", "[#2](https://github.com/typetools/checker-framework/issues/2)") and the receiver ("this").

Implementation details:

Method renamings and signature changes (old methods are removed) in GenericAnnotatedTypeFactory:

  • getPreconditionAnnotation(VariableElement, AnnotatedTypeMirror) => getPreconditionAnnotations(String, AnnotatedTypeMirror, AnnotatedTypeMirror)
  • getPostconditionAnnotation(VariableElement, AnnotatedTypeMirror, List<AnnotationMirror>) => getPostconditionAnnotations(String, AnnotatedTypeMirror, AnnotatedTypeMirror, List<AnnotationMirror>)
  • getPreOrPostconditionAnnotation(VariableElement, AnnotatedTypeMirror, Analysis.BeforeOrAfter, List<AnnotationMirror>) => getPreOrPostconditionAnnotations(String, AnnotatedTypeMirror, AnnotatedTypeMirror, Analysis.BeforeOrAfter, List<AnnotationMirror>)
  • requiresOrEnsuresQualifierAnno(VariableElement, AnnotationMirror, Analysis.BeforeOrAfter) => createRequiresOrEnsuresQualifier(String, AnnotationMirror, AnnotatedTypeMirror, Analysis.BeforeOrAfter, List<AnnotationMirror>)

Method renamings and signature changes (old method is removed) in WholeProgramInferenceStorage:

  • getPreOrPostconditionsForField(Analysis.BeforeOrAfter, ExecutableElement, VariableElement, AnnotatedTypeFactory) => getPreOrPostconditions(Analysis.BeforeOrAfter, ExecutableElement, String, AnnotatedTypeMirror, AnnotatedTypeFactory)

Method renamings:

  • CFAbstractAnalysis.getFieldValues => getFieldInitialValues

The following methods no longer take a fieldValues parameter:

  • GenericAnnotatedTypeFactory#createFlowAnalysis
  • CFAnalysis constructor
  • CFAbstractAnalysis#performAnalysis
  • CFAbstractAnalysis constructors

Closed issues: #4685, #4689, #4785, #4805, #4806, #4815, #4829, #4849.

Changelog

Sourced from checker-qual's changelog.

Version 3.17.0 (August 2, 2021)

User-visible changes:

-Ainfer can now infer postcondition annotations that reference formal parameters (e.g. "[#1](https://github.com/typetools/checker-framework/issues/1)", "[#2](https://github.com/typetools/checker-framework/issues/2)") and the receiver ("this").

Implementation details:

Method renamings and signature changes (old methods are removed) in GenericAnnotatedTypeFactory:

  • getPreconditionAnnotation(VariableElement, AnnotatedTypeMirror) => getPreconditionAnnotations(String, AnnotatedTypeMirror, AnnotatedTypeMirror)
  • getPostconditionAnnotation(VariableElement, AnnotatedTypeMirror, List<AnnotationMirror>) => getPostconditionAnnotations(String, AnnotatedTypeMirror, AnnotatedTypeMirror, List<AnnotationMirror>)
  • getPreOrPostconditionAnnotation(VariableElement, AnnotatedTypeMirror, Analysis.BeforeOrAfter, List<AnnotationMirror>) => getPreOrPostconditionAnnotations(String, AnnotatedTypeMirror, AnnotatedTypeMirror, Analysis.BeforeOrAfter, List<AnnotationMirror>)
  • requiresOrEnsuresQualifierAnno(VariableElement, AnnotationMirror, Analysis.BeforeOrAfter) => createRequiresOrEnsuresQualifier(String, AnnotationMirror, AnnotatedTypeMirror, Analysis.BeforeOrAfter, List<AnnotationMirror>)

Method renamings and signature changes (old method is removed) in WholeProgramInferenceStorage:

  • getPreOrPostconditionsForField(Analysis.BeforeOrAfter, ExecutableElement, VariableElement, AnnotatedTypeFactory) => getPreOrPostconditions(Analysis.BeforeOrAfter, ExecutableElement, String, AnnotatedTypeMirror, AnnotatedTypeFactory)

Method renamings:

  • CFAbstractAnalysis.getFieldValues => getFieldInitialValues

The following methods no longer take a fieldValues parameter:

  • GenericAnnotatedTypeFactory#createFlowAnalysis
  • CFAnalysis construtor
  • CFAbstractAnalysis#performAnalysis
  • CFAbstractAnalysis constructors

Closed issues: #4685, #4689, #4785, #4805, #4806, #4815, #4829, #4849.

Commits
  • 9d0f498 new release 3.17.0
  • 2e17d53 Prep for release.
  • 11ad15d Initializes all fields of newly created ATM before substituting type vars
  • ecc03e6 Add a task to print a list of java files
  • 313e5c8 Documentation tweaks
  • 127b2af Handle enum fields specially in getFieldAnnotations()
  • 594fe9c Make the return type of getFakeOverride() more specific
  • 0f9b90a Remove unneeded formal parameter
  • 9fe9c72 Rename getTypeFactory() to createTypeFactoryForProcessor
  • 77a7c93 Validate return types correctly. (#4844)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.16.0&new-version=3.17.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #266 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/266 from google:dependabot/maven/org.checkerframework-checker-qual-3.17.0 50e68dd30f07aeade89468e385527354bf5f1750 PiperOrigin-RevId: 388498050 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95c36df5..6e9216fb 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.16.0 + 3.17.0 From 8200e996da71d64b9c0ad4a582e73f5da6336410 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 09:31:13 -0700 Subject: [PATCH 105/300] Bump error_prone_annotations from 2.8.0 to 2.9.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.8.0 to 2.9.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.9.0

Release Error Prone 2.9.0

New checks:

  • DeprecatedVariable
  • PublicApiNamedStreamShouldReturnStream

Fixes #2124, #2371, #2393, #2470

Error Prone 2.8.1

This release adds a new check (LoopOverCharArray), and a handful of other small improvements (https://github.com/google/error-prone/compare/v2.8.0...v2.8.1).

Commits
  • 0cfe2ad Release Error Prone 2.9.0
  • b6e5831 Work around another javac bug in InvalidLink
  • 7b03871 Fix crashes / wrong suggestions in FloggerStringConcatenation
  • 43d34de Add ReadableInstant.getMillis() and ReadableDuration.getMillis() to `Retu...
  • 1511398 Updating the BugPattern summary for ConstantField to "Field name is CONSTANT_...
  • 9e37e5c Add Map.Entry APIs to ReturnValueIgnored (currently flagged off).
  • 7844fe4 When generating docs, remove pages for deleted checkers
  • 4aad239 Discourage public Foo stream() where Foo does not end with "Stream"
  • ba12995 Recognize orElseThrow() in some checks that handle get()
  • 10ae8a1 Remove DISALLOW_ARGUMENT_REUSE flag for InlineMe - we won't support re-using a
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.8.0&new-version=2.9.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #268 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/268 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.9.0 40c43a9064713e0d4fe2f83b483b56af3c40fdb6 PiperOrigin-RevId: 392007988 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e9216fb..a00dce2b 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.8.0 + 2.9.0 provided From 4278efb76ffc0c0402b0797f105a7b820bc3f9e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Aug 2021 10:31:03 -0700 Subject: [PATCH 106/300] Bump plexus-java from 1.0.7 to 1.1.0 Bumps [plexus-java](https://github.com/codehaus-plexus/plexus-languages) from 1.0.7 to 1.1.0.
Commits
  • abcd162 [maven-release-plugin] prepare release plexus-languages-1.1.0
  • 868b3d7 Support requires static transitive
  • 1c91b4f Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0
  • 5bfae5f Bump plexus from 7 to 8
  • cee4f63 Require Java 8
  • 3473197 Update CI setup
  • 5cadf50 Removed outdated java versions from CI
  • b8baee4 Bump actions/setup-java from 2.1.0 to 2.2.0
  • 7cd361b Bump mockito-core from 3.11.2 to 3.12.1
  • c9c9cfe update search.maven.org url
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=1.0.7&new-version=1.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #269 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/269 from google:dependabot/maven/org.codehaus.plexus-plexus-java-1.1.0 d2279d2cdc5a4e6281ca488b640ffbe968df6ff5 PiperOrigin-RevId: 392694861 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a00dce2b..00972be8 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ org.codehaus.plexus plexus-java - 1.0.7 + 1.1.0 From 6202be1decc8fb97893a5a7bbef0f9b50f242b91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 09:30:48 -0700 Subject: [PATCH 107/300] Bump checker-qual from 3.17.0 to 3.18.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.17.0 to 3.18.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.18.0

Version 3.18.0 (September 1, 2021)

User-visible changes:

Java records are type-checked. Thanks to Neil Brown.

Closed issues: #4838, #4843, #4852, #4853, #4861, #4876, #4877, #4878, #4878, #4889, #4889.

Changelog

Sourced from checker-qual's changelog.

Version 3.18.0 (September 1, 2021)

User-visible changes:

Java records are type-checked. Thanks to Neil Brown.

Closed issues: #4838, #4843, #4852, #4853, #4861, #4876, #4877, #4878, #4878, #4889, #4889.

Commits
  • 9649097 new release 3.18.0
  • 37f50ce Update change log for release.
  • 5f569ea Use Error Prone version 2.9.0
  • fddc34a Warn if JAVA_HOME is set to a non-existent directory
  • c354410 Disable shellcheck warnings
  • 5ad082d Tweak discussion of old versions of Error Prone
  • e072376 Finish records support (#4871)
  • 8fb6f74 improve error message text for the RLC (#4896)
  • 4480e55 Test case for issue #4889
  • bf79d96 Test that demonstrates the unsoundness that can occur if Lombok and the Check...
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.17.0&new-version=3.18.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #270 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/270 from google:dependabot/maven/org.checkerframework-checker-qual-3.18.0 80a8a214b5cb868bdbd494b0c1fb55f8db5799cb PiperOrigin-RevId: 394479107 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00972be8..d5090785 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.17.0 + 3.18.0 From acad89da101782daaec31ff409660263d9a438fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 07:26:19 -0700 Subject: [PATCH 108/300] Bump maven-javadoc-plugin from 3.3.0 to 3.3.1 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.0 to 3.3.1.
Commits
  • 2d22cca [maven-release-plugin] prepare release maven-javadoc-plugin-3.3.1
  • 7b7813e [MJAVADOC-450] Artifacts with a classifier are ignored when looking for resou...
  • 0d0e0cc [MJAVADOC-618] Goal javadoc:aggregate fails with submodules packaged as war
  • a2acaa2 [MJAVADOC-137] transform verify script from bsh to groovy
  • 16ca119 Clean up slf4j-simple
  • 87dbfb2 [MJAVADOC-677] Using "requires static transitive" makes javadoc goal fail
  • d770460 [MJAVADOC-680] JDK 16+: Error fetching link: ...\target\javadoc-bundle-option...
  • 292ebb7 Bump slf4j-simple from 1.7.30 to 1.7.32
  • fe6d738 Bump mockito-core from 3.9.0 to 3.12.0
  • d2dd532 [MJAVADOC-679] "Unable to compute stale date" in a directory with accent char...
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.3.0&new-version=3.3.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #271 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/271 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.3.1 04d3942a3ba2cd472db83b85745e998d25e6c9dd PiperOrigin-RevId: 395468668 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d5090785..40d559a8 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ maven-javadoc-plugin - 3.3.0 + 3.3.1 maven-site-plugin @@ -206,7 +206,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 attach-docs From cb37fe61368e71a061f56cf410bc60628590aa73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 07:50:40 -0700 Subject: [PATCH 109/300] Bump guava from 30.1.1-jre to 31.0-jre Bumps [guava](https://github.com/google/guava) from 30.1.1-jre to 31.0-jre.
Release notes

Sourced from guava's releases.

31.0

Maven

<dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
  <version>31.0-jre</version>
  <!-- or, for Android: -->
  <version>31.0-android</version>
</dependency>

Jar files

Guava requires one runtime dependency, which you can download here:

Javadoc

JDiff

Changelog

  • Changed guava-android to generate Java 8 bytecode. We still restrict ourselves to using APIs available on Ice Cream Sandwich. So, as long as you have enabled Java 8 language features for your Android build, this change should have no effect on Android projects. This change does drop support for Java 7 JREs, as announced last year.
  • Annotated Guava much more thoroughly for nullness. For details, see the bottom of the release notes.
  • base: Changed Functions.forSupplier and Predicates.instanceOf to accept an additional type argument to specify the input type for the returned Function/Predicate. The flexibility we're adding should typically not be necessary if users follow the PECS principle, but it can be useful in some cases, particularly around nullness analysis. Note that this change may require updates to callers' source code (to specify an additional type argument). Still, it maintains binary compatibility. (75110e936d)
  • collect: Added ImmutableMap.ofEntries, like Map.ofEntries but for ImmutableMap. (cd3b4197fb)
  • collect: Added overloads of ImmutableMap.of, ImmutableBiMap.of, and ImmutableSortedMap.of for up to 10 entries. (d5c30e3f19)
  • collect: Renamed ImmutableMap.Builder.build() to buildOrThrow(). The existing build() method will continue to exist but may be deprecated, and the new name should be used in new code. (4bbe12c4e0)
  • collect: Removed @Beta from Interner and Interners. (cf31f3a31d)
  • collect: Added @InlineMe to Streams.stream(Optional) and friends. (a176cd60f1)
  • graph: Made EndpointPair.adjacentNode require an N instead of accept any Object. (b0be21d46c)
  • hash: Removed @Beta from HashFunction. (e1cc195cfb)
  • hash: Deprecated buggy murmur3_32, and introduced murmur3_32_fixed. (a36f08fe31)
  • io: Changed CharStreams.asWriter(appendable).write(string[, ...]) to reject a null string. (50e7dddf5c)
  • io: Fixed a bug in FileBackedOutputStream cleanup: If writing to the temp file fails, we now delete it before propagating the exception. (6e054cea7b)
  • net: Changed HostAndPort.fromString to reject port numbers spelled with non-ASCII digits. (53fd1d7612)
  • net: Added HttpHeaders constants for X-Device-Ip, X-Device-Referer, X-Device-Accept-Language, X-Device-Requested-With, Sec-CH-Prefers-Color-Scheme, Sec-CH-UA-Bitness, and Keep-Alive. (da375be86a, b23b277422, 281edd4b6e, 9c88f9ad6d)

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.guava:guava&package-manager=maven&previous-version=30.1.1-jre&new-version=31.0-jre)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #272 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/272 from google:dependabot/maven/com.google.guava-guava-31.0-jre 7859042a37f7805e8194dd947aa8a36593925a74 PiperOrigin-RevId: 399188766 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40d559a8..0b9d2190 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 30.1.1-jre + 31.0-jre com.google.errorprone From 84e10b4d97f490cbbf6f49b917cbef746b197ced Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 07:34:57 -0700 Subject: [PATCH 110/300] Bump guava from 31.0-jre to 31.0.1-jre Bumps [guava](https://github.com/google/guava) from 31.0-jre to 31.0.1-jre.
Release notes

Sourced from guava's releases.

31.0.1

Maven

<dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
  <version>31.0.1-jre</version>
  <!-- or, for Android: -->
  <version>31.0.1-android</version>
</dependency>

Jar files

Guava requires one runtime dependency, which you can download here:

Javadoc

JDiff

Changelog

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.guava:guava&package-manager=maven&previous-version=31.0-jre&new-version=31.0.1-jre)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #273 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/273 from google:dependabot/maven/com.google.guava-guava-31.0.1-jre 108526bea3d17cfa92a95161c97553c3bbfbf3d9 PiperOrigin-RevId: 399436470 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b9d2190..a8aa1a5e 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 31.0-jre + 31.0.1-jre com.google.errorprone From ed5d9f0acc1a6c2ce688d8ab4d57c659ad64a3c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 07:37:31 -0700 Subject: [PATCH 111/300] Bump checker-qual from 3.18.0 to 3.18.1 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.18.0 to 3.18.1.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.18.1

Version 3.18.1 (October 4, 2021)

Closed issues: #4902 and #4903.

Changelog

Sourced from checker-qual's changelog.

Version 3.18.1 (October 4, 2021)

Closed issues: #4902 and #4903.

Commits
  • 8d710a9 new release 3.18.1
  • 2ef9fea Update for relesase.
  • 88f24fc Fix classpath for inference test
  • 902376d Document base directory for classpathExtra
  • 5ab8731 Typo fix
  • 259ed0e Bump classgraph from 4.8.116 to 4.8.117
  • cfb37e1 Mention the issue tracker
  • 22ff13c Update URL
  • 854632d Bump error_prone_core from 2.8.1 to 2.9.0
  • 1eec388 Update FAQ about RUNTIME vs CLASS retention
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.18.0&new-version=3.18.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #274 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/274 from google:dependabot/maven/org.checkerframework-checker-qual-3.18.1 d2794b2b0203ecbb6a618a92ed728519b39789f4 PiperOrigin-RevId: 400981292 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8aa1a5e..1ba95a0a 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.18.0 + 3.18.1 From 14cd7f389d0efadbebf255395b8bd41865aa2e7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 06:36:52 -0700 Subject: [PATCH 112/300] Bump auto-common from 1.1.2 to 1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [auto-common](https://github.com/google/auto) from 1.1.2 to 1.2.
Release notes

Sourced from auto-common's releases.

AutoCommon 1.2

  • In MoreElements.overrides and .getLocalAndInheritedMethods, an interface method is no longer considered to override another interface method unless the first interface inherits from the second. This means that .getLocalAndInheritedMethods may now return two methods with the same signature where before it only returned one. (d8c19343)
Commits
  • 370f9ca [prepare release] Bump version to 1.2 in preparation for release.
  • 502238d [prepare-release] AutoValue 1.2-rc1 version bump.
  • 85e1312 Merge pull request #314 from google/eclipsehack_exceptions
  • 05f9fd0 Merge pull request #313 from google/internal_duplication_improvement
  • 605b912 Merge pull request #312 from google/explicit_final
  • 8b565b8 Merge pull request #311 from google/guava_19
  • a8c5f89 In EclipseHack, catch any exception from propertyOrderer.determinePropertyOrd...
  • dac3fb5 When checking FactoryMethodDescriptor's and ImplementationMethodDescriptor's ...
  • 2627d42 Add an explicit check for @​AutoValue class being private, since otherwise tha...
  • b1db512 Rely on Guava 19.0 and use CharMatcher.whitespace() since CharMatcher.WHITESP...
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto:auto-common&package-manager=maven&previous-version=1.1.2&new-version=1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #275 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/275 from google:dependabot/maven/com.google.auto-auto-common-1.2 afe1293e6b575b25e8e4ca6f52d6e2fb6143e8c9 PiperOrigin-RevId: 403942765 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ba95a0a..dd77a96d 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ com.google.auto auto-common - 1.1.2 + 1.2 org.checkerframework From 3bff37e23198531811e017b2feb5396e2df264d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 08:58:23 -0700 Subject: [PATCH 113/300] Bump actions/checkout from 2.3.4 to 2.3.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5.
Release notes

Sourced from actions/checkout's releases.

v2.3.5

Update dependencies

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=2.3.4&new-version=2.3.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #276 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/276 from google:dependabot/github_actions/actions/checkout-2.3.5 b4862f07e4b29d5d92d8db37f1b440db283d9580 PiperOrigin-RevId: 403973727 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 830c4a0b..19a3b52e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 'Cache local Maven repository' uses: actions/cache@v2.1.6 with: From b36eaa5dd6d555f408d1d4d2edf8ef6fbd90d58b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Nov 2021 09:02:11 -0700 Subject: [PATCH 114/300] Bump checker-qual from 3.18.1 to 3.19.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.18.1 to 3.19.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.19.0

Version 3.19.0 (November 1, 2021)

User-visible changes:

The Checker Framework runs under JDK 17 -- that is, it runs on a version 17 JVM. The Checker Framework also continues to run under JDK 8 and JDK 11. New command-line argument -ApermitUnsupportedJdkVersion lets you run the Checker Framework on any JDK (version 8 or greater) without a warning about an unsupported JDK version. The Checker Framework does not yet run on code that contains switch expressions.

Implementation details:

Removed org.checkerframework.framework.type.VisitorState Removed AnnotatedTypeFactory#postTypeVarSubstitution

Deprecated methods in AnnotatedTypeFactory:

  • getCurrentClassTree
  • getCurrentMethodReceiver

Closed issues: #3014, #4908, #4924, #4932.

Changelog

Sourced from checker-qual's changelog.

Version 3.19.0 (November 1, 2021)

User-visible changes:

The Checker Framework runs under JDK 17 -- that is, it runs on a version 17 JVM. The Checker Framework also continues to run under JDK 8 and JDK 11. New command-line argument -ApermitUnsupportedJdkVersion lets you run the Checker Framework on any JDK (version 8 or greater) without a warning about an unsupported JDK version. The Checker Framework does not yet run on code that contains switch expressions.

Implementation details:

Removed org.checkerframework.framework.type.VisitorState Removed AnnotatedTypeFactory#postTypeVarSubstitution

Deprecated methods in AnnotatedTypeFactory:

  • getCurrentClassTree
  • getCurrentMethodReceiver

Closed issues: #4932, #4924, #4908, #3014.

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.18.1&new-version=3.19.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #277 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/277 from google:dependabot/maven/org.checkerframework-checker-qual-3.19.0 5607cadda879b1dce8006ec54929f49981b8086c PiperOrigin-RevId: 407096711 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dd77a96d..6e241581 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.18.1 + 3.19.0 From a03c19fb3a7d640a595fe1974b0d30038499ee4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 06:44:40 -0700 Subject: [PATCH 115/300] Bump actions/checkout from 2.3.5 to 2.4.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0.
Release notes

Sourced from actions/checkout's releases.

v2.4.0

  • Convert SSH URLs like org-<ORG_ID>@github.com: to https://github.com/ - pr
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=2.3.5&new-version=2.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #278 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/278 from google:dependabot/github_actions/actions/checkout-2.4.0 35b55b7cb5acf866b218795fb3768be4f6f14db6 PiperOrigin-RevId: 407324472 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19a3b52e..bad536ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@v2.3.5 + uses: actions/checkout@v2.4.0 - name: 'Cache local Maven repository' uses: actions/cache@v2.1.6 with: From 6291430308db3c634dd6d7ecfc4560b9645a6994 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Nov 2021 07:32:58 -0700 Subject: [PATCH 116/300] Bump error_prone_annotations from 2.9.0 to 2.10.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.9.0 to 2.10.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.10.0

New checks

Fixed issues: #2616, #2629

Full Changelog: https://github.com/google/error-prone/compare/v2.9.0...v2.10.0

Commits
  • 199a31b Release Error Prone 2.10.0
  • 99cdb15 Always annotate arrays now that we place type-use annotations in the right pl...
  • 0fc9146 Recognize libcore.util.Nullable as type-use, and add a TODO about "hybrid" an...
  • 0f34024 Move check for the regex "." to a new WARNING-level check
  • eb3708a Delete obsolete travis config
  • 5538acc Automated rollback of commit 34d98e8cf1d8da2dc6d261d70c85e96dc4a0d031.
  • f91fff5 ASTHelpers: add getAnnotations method, to allow extraction of annotations fro...
  • cdfa8b8 Add the DistinctVarargs BugChecker. This will generate warning when method ex...
  • 122e512 Add InlineMe:CheckFixCompiles flag, which allows InlineMe users to optional...
  • dd91993 Add ByteString.fromHex to AlwaysThrows
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.9.0&new-version=2.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #279 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/279 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.10.0 c9e5081f4a01e6c47f537435375bd86b47e1cb43 PiperOrigin-RevId: 407818637 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e241581..fa108962 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.9.0 + 2.10.0 provided From 8a5d03bf0442133255d6cf067d86811dba2f523f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 10:08:56 -0800 Subject: [PATCH 117/300] Bump auto-common from 1.2 to 1.2.1 Bumps [auto-common](https://github.com/google/auto) from 1.2 to 1.2.1.
Release notes

Sourced from auto-common's releases.

AutoCommon 1.2.1

  • Remove usage of Guava 30 API (Comparators.min). (102506c3)
Commits
  • ae5b058 Set version number for auto-common to 1.2.1.
  • 102506c Remove usage of Guava 30 API (Comparators.min).
  • d6d9657 Bump errorprone.version from 2.9.0 to 2.10.0 in /value
  • 66c620d Bump auto-service from 1.0 to 1.0.1 in /value
  • c219995 Bump auto-service-annotations from 1.0 to 1.0.1 in /factory
  • 27f3297 Bump auto-service-annotations from 1.0 to 1.0.1 in /value
  • d8083fd Handle missing classes better in AutoService.
  • ce31cc1 Bump actions/checkout from 2.3.5 to 2.4.0
  • 0820e2e Make it easier to make a step-builder for AutoValue.
  • 15c7619 Use Java 11's Optional.isEmpty() method in docs: !optional.isPresent() -> `...
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto:auto-common&package-manager=maven&previous-version=1.2&new-version=1.2.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #280 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/280 from google:dependabot/maven/com.google.auto-auto-common-1.2.1 1f8d9e5cf23bae78cccf27f32eef929e326c1f31 PiperOrigin-RevId: 410283924 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa108962..d6330030 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ com.google.auto auto-common - 1.2 + 1.2.1 org.checkerframework From 4ecd5222a6dd463f25d44f6e58e1262930896d90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:15:17 -0800 Subject: [PATCH 118/300] Bump actions/cache from 2.1.6 to 2.1.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7.
Release notes

Sourced from actions/cache's releases.

v2.1.7

Support 10GB cache upload using the latest version 1.0.8 of @actions/cache

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/cache&package-manager=github_actions&previous-version=2.1.6&new-version=2.1.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #282 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/282 from google:dependabot/github_actions/actions/cache-2.1.7 19d4521dc9e69c2c28733a8957e6afffb5d92ba3 PiperOrigin-RevId: 411814743 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bad536ba..514fcded 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@v2.4.0 - name: 'Cache local Maven repository' - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: ~/.m2/repository key: maven-${{ hashFiles('**/pom.xml') }} From 18a6f6e6682c9badaa916f43f248d3ab5106d136 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 06:58:47 -0800 Subject: [PATCH 119/300] Bump checker-qual from 3.19.0 to 3.20.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.19.0 to 3.20.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.20.0

Version 3.20.0 (December 6, 2021)

User-visible changes:

The Checker Framework now runs on code that contains switch expressions and switch statements that use the new -> case syntax, but treats them conservatively. A future version will improve precision.

Implementation details:

The dataflow framework can be run on code that contains switch expressions and switch statements that use the new -> case syntax, but it does not yet analyze the cases in a switch expression and it treats -> as :. A future version will do so.

Removed methods and classes that have been deprecated for more than one year:

  • Old way of constructing qualifier hierarchies
  • @SuppressWarningsKeys
  • RegularBlock.getContents()
  • TestUtilities.testBooleanProperty()
  • CFAbstractTransfer.getValueWithSameAnnotations()

Closed issues: #4911, #4948, #4965.

Changelog

Sourced from checker-qual's changelog.

Version 3.20.0 (December 6, 2021)

User-visible changes:

The Checker Framework now runs on code that contains switch expressions and switch statements that use the new -> case syntax, but treats them conservatively. A future version will improve precision.

Implementation details:

The dataflow framework can be run on code that contains switch expressions and switch statements that use the new -> case syntax, but it does not yet analyze the cases in a switch expression and it treats -> as :. A future version will do so.

Removed methods and classes that have been deprecated for more than one year:

  • Old way of constructing qualifier hierarchies
  • @SuppressWarningsKeys
  • RegularBlock.getContents()
  • TestUtilities.testBooleanProperty()
  • CFAbstractTransfer.getValueWithSameAnnotations()

Closed issues: #4911, #4948, #4965.

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.19.0&new-version=3.20.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #283 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/283 from google:dependabot/maven/org.checkerframework-checker-qual-3.20.0 4e9a91b2bcc66e1c329ba2684b2352e60e465a24 PiperOrigin-RevId: 414713215 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d6330030..aae43eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.19.0 + 3.20.0 From edc3bbc534ffbc7e67a86f6847422c8874e4fef3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 08:24:10 -0800 Subject: [PATCH 120/300] Bump auto-value from 1.8.2 to 1.9 Bumps [auto-value](https://github.com/google/auto) from 1.8.2 to 1.9.
Release notes

Sourced from auto-value's releases.

AutoValue 1.9

  • The @AutoBuilder annotation documented here is now fully stable and supported. (1f8d7f26)
    • AutoBuilder now uses annotation defaults when building a call to an @AutoAnnotation method. (fb96c836)
  • Making a step-builder for AutoValue is now easier because the inherited setters don't need to be restated in the Builder class so that they return Builder. (0820e2e2)
  • We now handle better the case where an annotation being copied references a missing class. (e0740327)
  • The order of annotations copied into generated code is now deterministic. (8ad800ed)
Commits
  • d26281e Set version number for auto-value-parent to 1.9.
  • f7a8b80 Add a \<developers> section to auto/value/pom.xml.
  • 7dfa541 Copy the oss-parent configuration into value/pom.xml.
  • 000b10c Add a \<distributionManagement> clause to the parent POM for AutoValue and A...
  • 07f37b2 Disallow @AutoValue final class.
  • 8a1d726 Remove references to obsolete AutoBuilderIsUnstable option.
  • a74508b Validate that @AutoValue (etc) classes have appropriate constructors.
  • 1f8d7f2 Make @AutoBuilder available unconditionally.
  • 0b21d83 Bump actions/cache from 2.1.6 to 2.1.7
  • 7e1ec07 Bump mockito-core from 4.0.0 to 4.1.0 in /value
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.8.2&new-version=1.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #288 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/288 from google:dependabot/maven/com.google.auto.value-auto-value-1.9 92d1d228e6698f95e84f0c0b18b14b124de1a630 PiperOrigin-RevId: 416564677 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aae43eb6..4530caf4 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.auto.value auto-value - 1.8.2 + 1.9 com.google.auto From 5c0256ce5787a83a560cb57b55b245f7ad0e4386 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 07:40:04 -0800 Subject: [PATCH 121/300] Bump checker-qual from 3.20.0 to 3.21.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.20.0 to 3.21.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.21.0

Version 3.21.0 (December 17, 2021)

User-visible changes:

The Checker Framework now more precisely computes the type of a switch expression.

Implementation details:

The dataflow framework now analyzes switch expressions and switch statements that use the new -> case syntax. To do so, a new node, SwitchExpressionNode, was added.

Closed issues: #2373, #4934, #4977, #4979, #4987.

Changelog

Sourced from checker-qual's changelog.

Version 3.21.0 (December 17, 2021)

User-visible changes:

The Checker Framework now more precisely computes the type of a switch expression.

Implementation details:

The dataflow framework now analyzes switch expressions and switch statements that use the new -> case syntax. To do so, a new node, SwitchExpressionNode, was added.

Closed issues: #2373, #4934, #4977, #4979, #4987.

Commits
  • 2e12f3b new release 3.21.0
  • 8759973 Prep for release.
  • cd9a2a3 JointJavacJavaParserVisitor now handles switch expressions (#4992)
  • 689b033 CheckerMain: don't crash on nonexistent directories (#4991)
  • 35f31b7 Dataflow: fall through never happens in switch rules. (#4984)
  • 946fc03 add note to documentation of Owning about why it is a declaration annotation,...
  • dd9dde7 Remove SKIP-REQUIRE-JAVADOC
  • 0967219 Add support for switch expressions in dataflow (#4982)
  • 4a5a7d9 Use property for errorprone version number. (#4990)
  • 4bd99aa Fix multiple case constants. (#4985)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.20.0&new-version=3.21.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #289 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/289 from google:dependabot/maven/org.checkerframework-checker-qual-3.21.0 3252da43b74c5e6d95427500ebe9ef8b55a8491b PiperOrigin-RevId: 417404104 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4530caf4..d097e373 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.20.0 + 3.21.0 From 94aa7a3e01e8202e055a933888c2892221a54f1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 15:05:49 -0800 Subject: [PATCH 122/300] Bump maven-site-plugin from 3.9.1 to 3.10.0 Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.9.1 to 3.10.0.
Commits
  • c56b7b2 [maven-release-plugin] prepare release maven-site-plugin-3.10.0
  • 7029bab [MSITE-878] Upgrade Doxia to 1.11.1 and Doxia Tools to 1.11.1
  • 7f8fe7e [MSITE-877] Shared GitHub Actions (#65)
  • e330284 require CDATA
  • eeba50c Add PR template
  • 7813e8f add Sitetools' integration tool and skin model
  • fda2a84 Updated CI setup
  • 0cd2070 Bump slf4jVersion from 1.7.31 to 1.7.32 (#58)
  • 9f24d2b update CI url
  • e06aa78 [MSITE-875] add 3.10.0 in history table
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-site-plugin&package-manager=maven&previous-version=3.9.1&new-version=3.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #290 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/290 from google:dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.10.0 f6d018cd75358964852a96bf976569f0f413561b PiperOrigin-RevId: 419921315 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d097e373..fbadc639 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ maven-site-plugin - 3.9.1 + 3.10.0 From 30a81d765f63a06f42e4f8ca72b1a281a55c52f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 07:24:10 -0800 Subject: [PATCH 123/300] Bump checker-qual from 3.21.0 to 3.21.1 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.21.0 to 3.21.1.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.21.1

Version 3.21.1 (January 7, 2022)

User-visible changes:

The Checker Framework Gradle Plugin now works incrementally: if you change just one source file, then Gradle will recompile just that file rather than all files.

Closed issues: #2401, #4994, #4995, #4996.

Changelog

Sourced from checker-qual's changelog.

Version 3.21.1 (January 7, 2022)

User-visible changes:

The Checker Framework Gradle Plugin now works incrementally: if you change just one source file, then Gradle will recompile just that file rather than all files.

Closed issues: #2401, #4994, #4995, #4996.

Commits
  • dd715c3 new release 3.21.1
  • 3820124 Prep for release.
  • 673b126 Capture enclosing types
  • 269bca0 Checker Framework Gradle Plugin is now incremental
  • c73c4f8 In TreeScanners, ensure "scan" is called so that Java 17+ trees are visited p...
  • ed70606 Add synthetic variables to CFG for ternary expressions (#5000)
  • 3f9646e When releasing, make Randoop use the latest version of the Checker Framework
  • 2ee909e Update BCEL line number (#4999)
  • d3540b9 Bump com.github.johnrengelman.shadow from 7.1.1 to 7.1.2
  • 8e008df Update for next release.
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.21.0&new-version=3.21.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #292 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/292 from google:dependabot/maven/org.checkerframework-checker-qual-3.21.1 0a2e88bd20b0cbcd55a8dfd9196dad80ff496c0f PiperOrigin-RevId: 420755435 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fbadc639..5a2574fe 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.21.0 + 3.21.1 From 997925e8d959484b47970dee5df4c0104c11fc0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jan 2022 08:33:03 -0800 Subject: [PATCH 124/300] Bump maven-jar-plugin from 3.2.0 to 3.2.2 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.0 to 3.2.2.
Commits
  • d37e995 [maven-release-plugin] prepare release maven-jar-plugin-3.2.2
  • 7bb0bfc [MJAR-284] Remove override for Plexus Archiver
  • a3e424d [MJAR-283] Upgrade Plexus Utils to 3.3.1
  • 95bc15b [maven-release-plugin] prepare for next development iteration
  • 50a8e0b [maven-release-plugin] prepare release maven-jar-plugin-3.2.1
  • 0fb2bf0 Proper uppercase JAR
  • e44e5f2 [MJAR-282] Upgrade Maven Archiver to 3.5.2
  • 34d62b6 Bump maven-archiver from 3.5.0 to 3.5.1
  • a496294 use shared gh action - v1 (#28)
  • a7cfde9 Bump junit from 4.13 to 4.13.2
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-jar-plugin&package-manager=maven&previous-version=3.2.0&new-version=3.2.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #293 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/293 from google:dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.2.2 e55936e259be2e8ae107477320db4fcf795778e1 PiperOrigin-RevId: 421306201 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a2574fe..8ebdff42 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ maven-jar-plugin - 3.2.0 + 3.2.2 maven-javadoc-plugin From e328f1c81d2d095c5fd8f85625235ca579727401 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 08:24:59 -0800 Subject: [PATCH 125/300] Bump maven-compiler-plugin from 3.8.1 to 3.9.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.9.0.
Commits
  • aeb15b6 [maven-release-plugin] prepare release maven-compiler-plugin-3.9.0
  • 6335382 Shared GitHub Acton v2
  • 8d5d3cd Fix site build
  • ce4eb1e Bump plexus-component-metadata from 2.1.0 to 2.1.1
  • f875750 Bump mockito-core from 4.1.0 to 4.2.0
  • 5463357 fix CI site goal
  • 859c903 Update plugins
  • b0de9bc Bump mockito-core from 4.0.0 to 4.1.0
  • f95dd46 Bump plexusCompilerVersion from 2.8.8 to 2.9.0
  • 26900cf Bump mockito-core from 2.28.2 to 4.0.0
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.8.1&new-version=3.9.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #294 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/294 from google:dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.9.0 b4de7b8a2e3465ccabddea0b231b0b6ccea8e412 PiperOrigin-RevId: 421571861 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ebdff42..2dadb1de 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ maven-compiler-plugin - 3.8.1 + 3.9.0 1.8 1.8 From d6bbb9222753269e20c3691f7268c8dfe491c681 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 07:03:05 -0800 Subject: [PATCH 126/300] Bump error_prone_annotations from 2.10.0 to 2.11.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.10.0 to 2.11.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.11.0

Error Prone now requires JDK 11 or newer (google/error-prone#2730).

New checks

Fixed issues: #2641, #2705, #2776, #2798, #2799, #2819, #2820, #2831, #2833, #2834, #2835, #2861, #2873, #2889, #2892, #2901

Full Changelog: https://github.com/google/error-prone/compare/v2.10.0...v2.11.0

Commits
  • 6439153 Release Error Prone 2.11.0
  • d33ab70 Add backreferences to b/216306810
  • 3f61879 Decrease TooManyParameters default limit from 10 to 9.
  • c2e14f2 Make ASTHelpers.getSymbol(MethodInvocationTree) and friends throw instead o...
  • c18ae52 Autofix all the AnnotationPosition findings in EP.
  • 4698c8e intellij project files update
  • f6a508f Bump more deps.
  • 048a664 Document missing itself lock expression.
  • fbaa55b Update OrphanedFormatString to warn on log("hello %s")
  • e09ca6f More version updates
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.10.0&new-version=2.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #295 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/295 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.11.0 41527b431d4465e62d8cc42c2683c8af2c9d7d7e PiperOrigin-RevId: 424336705 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2dadb1de..10f589a8 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.10.0 + 2.11.0 provided From 7029c581f41c6873d47ba9524f2fa06d47b45634 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:09:35 -0800 Subject: [PATCH 127/300] Bump plexus-java from 1.1.0 to 1.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [plexus-java](https://github.com/codehaus-plexus/plexus-languages) from 1.1.0 to 1.1.1.
Release notes

Sourced from plexus-java's releases.

1.1.1

🐛 Bug Fixes

  • requires static from deeper level must be included if requested. see MCOMPILER-481 (#106) @​olamy

📦 Dependency updates

Commits
  • cdb4bff [maven-release-plugin] prepare release plexus-languages-1.1.1
  • 86e0436 requires static from deeper level must be included if requested. see MCOMPILE...
  • 7d9c4a4 Merge pull request #109 from codehaus-plexus/dependabot/maven/com.google.inje...
  • e20fb76 Merge pull request #110 from codehaus-plexus/dependabot/maven/org.mockito-moc...
  • c94c9ef Bump mockito-core from 4.3.0 to 4.3.1
  • 1f04919 Merge pull request #108 from codehaus-plexus/dependabot/maven/org.mockito-moc...
  • acb10ab Bump guice from 4.2.3 to 5.1.0
  • 3ed346c Bump mockito-core from 4.2.0 to 4.3.0
  • f765c18 Merge pull request #107 from codehaus-plexus/dependabot/github_actions/releas...
  • 33ab74f Bump release-drafter/release-drafter from 5.17.5 to 5.17.6
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=1.1.0&new-version=1.1.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #296 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/296 from google:dependabot/maven/org.codehaus.plexus-plexus-java-1.1.1 ab856d8edb31f774587888af022ad4bc5efd0449 PiperOrigin-RevId: 425669781 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10f589a8..37a60902 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ org.codehaus.plexus plexus-java - 1.1.0 + 1.1.1 From 33875fc2ce03b8cab6d06e7c9d770912680681e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 07:59:04 -0800 Subject: [PATCH 128/300] Bump checker-qual from 3.21.1 to 3.21.2 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.21.1 to 3.21.2.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.21.2

Version 3.21.2 (February 1, 2022)

User-visible changes:

The wpi.sh script supports non-standard names for build system compile targets via the new -c command-line option.

The Checker Framework now more precisely computes and checks the type of the pattern variable in a pattern match instanceof.

Implementation details:

Deprecated CFGLambda.getMethod{Name} in favor of getEnclosingMethod{Name}.

Closed issues: #4615, #4993, #5006, #5007, #5008, #5013, #5016, #5021.

Changelog

Sourced from checker-qual's changelog.

Version 3.21.2 (February 1, 2022)

User-visible changes:

The wpi.sh script supports non-standard names for build system compile targets via the new -c command-line option.

The Checker Framework now more precisely computes and checks the type of the pattern variable in a pattern match instanceof.

Implementation details:

Deprecated CFGLambda.getMethod{Name} in favor of getEnclosingMethod{Name}.

Closed issues: #4615, #4993, #5006, #5007, #5008, #5013, #5016, #5021.

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.21.1&new-version=3.21.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #297 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/297 from google:dependabot/maven/org.checkerframework-checker-qual-3.21.2 708049cc770f687fe1009751442eb81a6589732a PiperOrigin-RevId: 426145623 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37a60902..dbb7e9de 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.21.1 + 3.21.2 From 018626d23e3c8da8f1e13693d454a5a3f72f0aa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 09:24:19 -0800 Subject: [PATCH 129/300] Bump maven-javadoc-plugin from 3.3.1 to 3.3.2 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.1 to 3.3.2.
Commits
  • 50a41f7 [maven-release-plugin] prepare release maven-javadoc-plugin-3.3.2
  • 5af4519 [MJAVADOC-705] Upgrade Maven Reporting API to 3.1.0
  • ee4132f [MJAVADOC-704] Javadoc plugin does not respect jdkToolchain
  • 651b98e Bump doxia-site-renderer from 1.10 to 1.11.1
  • db20fdd Bump plexus-archiver from 4.2.5 to 4.2.6
  • b51c5d8 [MJAVADOC-694] Avoid empty warn message from getResolvePathResult
  • 6b1515e Bump httpcore from 4.4.14 to 4.4.15
  • a4aa7dc (doc) fix javadoc issues
  • 3309cc2 Bump maven-project-info-reports-plugin to 3.1.2
  • 51a2c3f Bump maven-javadoc-plugin to 3.3.1
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.3.1&new-version=3.3.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #299 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/299 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.3.2 3394a61de291dbdda3cdacc9c39b5619e6045b72 PiperOrigin-RevId: 428019451 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dbb7e9de..cc34a620 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ maven-javadoc-plugin - 3.3.1 + 3.3.2 maven-site-plugin @@ -206,7 +206,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 attach-docs From b9bb431d68896a4d63f65b48c7ba453230884ed9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 07:17:16 -0800 Subject: [PATCH 130/300] Bump maven-compiler-plugin from 3.9.0 to 3.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.9.0 to 3.10.0.
Release notes

Sourced from maven-compiler-plugin's releases.

3.10.0

🚨 Removed

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

📝 Documentation updates

🔧 Build

Commits
  • f4239a4 [maven-release-plugin] prepare release maven-compiler-plugin-3.10.0
  • fda9729 fix typo gtrhhhrhr
  • 49a40ab use github
  • bd72d75 back to snapshot again
  • 2863d29 [maven-release-plugin] prepare release maven-compiler-plugin-3.10.0
  • 807d4e5 use last release plugin version
  • 037670c restore snapshot version
  • 07d635a [maven-release-plugin] prepare for next development iteration
  • a0fa151 [maven-release-plugin] prepare release maven-compiler-plugin-3.10.0
  • 500ade4 add more jdk for testing (#93)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.9.0&new-version=3.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #301 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/301 from google:dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.10.0 582c3b84424039143953f9bda2b2e258a48834a6 PiperOrigin-RevId: 428500371 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc34a620..f3cc14a0 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ maven-compiler-plugin - 3.9.0 + 3.10.0 1.8 1.8 From c96bd595e4e45ee18e5bb818f351e7d68eb32050 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 10:12:21 -0800 Subject: [PATCH 131/300] Bump maven-site-plugin from 3.10.0 to 3.11.0 Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.10.0 to 3.11.0.
Commits
  • a0e97b4 [maven-release-plugin] prepare release maven-site-plugin-3.11.0
  • 26979ff [MSITE-882] Upgrade Maven Reporting Exec to 1.6.0
  • 09d2f6f [MSITE-881] Upgrade Maven Reporting API to 3.1.0
  • eca1960 [MSITE-883] Upgrade plugins in ITs
  • db0ed41 [MSITE-880] AbstractSiteDeployWebDavTest should not log
  • 94e03e7 Bump maven-archiver from 3.5.1 to 3.5.2
  • 1399379 send PR notifications to issues@maven.a.o
  • 3ebcef6 [MSITE-870] wagon-provider-api is also provided by Maven Core
  • 75c8d35 update GitHub notifications scheme
  • 26d92ab [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-site-plugin&package-manager=maven&previous-version=3.10.0&new-version=3.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #302 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/302 from google:dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.11.0 fe26948c511a30923904d21eec4b5e7305c3d6e0 PiperOrigin-RevId: 429338856 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f3cc14a0..fdbe0232 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ maven-site-plugin - 3.10.0 + 3.11.0 From 4be713f18433727fb6e2385abca83811f63da7bb Mon Sep 17 00:00:00 2001 From: sullis Date: Tue, 22 Feb 2022 12:07:49 -0800 Subject: [PATCH 132/300] setup-java v2 maven cache Fixes #300 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/300 from sullis:ci-maven-cache 21ec375ea4c699ec01e2095ab81562d54f56eb40 PiperOrigin-RevId: 430265637 --- .github/workflows/ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 514fcded..5e6ce90f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,18 +23,12 @@ jobs: access_token: ${{ github.token }} - name: 'Check out repository' uses: actions/checkout@v2.4.0 - - name: 'Cache local Maven repository' - uses: actions/cache@v2.1.7 - with: - path: ~/.m2/repository - key: maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - maven- - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} distribution: 'zulu' + cache: 'maven' - name: 'Install' shell: bash run: mvn -B -U install clean --fail-never --quiet -DskipTests=true -Dinvoker.skip=true From f140155e413eb99fe8ba0db8ebb8a377cc052b5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 12:47:13 -0800 Subject: [PATCH 133/300] Bump guava from 31.0.1-jre to 31.1-jre Bumps [guava](https://github.com/google/guava) from 31.0.1-jre to 31.1-jre.
Release notes

Sourced from guava's releases.

31.1

Maven

<dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
  <version>31.1-jre</version>
  <!-- or, for Android: -->
  <version>31.1-android</version>
</dependency>

Jar files

Guava requires one runtime dependency, which you can download here:

Javadoc

JDiff

Changelog

  • base: Deprecated the Throwables methods lazyStackTrace and lazyStackTraceIsLazy. They are no longer useful on any current platform. (6ebd7d8648)
  • collect: Added a new method ImmutableMap.Builder.buildKeepingLast(), which keeps the last value for any given key rather than throwing an exception when a key appears more than once. (68500b2c09)
  • collect: As a side-effect of the buildKeepingLast() change, the idiom ImmutableList.copyOf(Maps.transformValues(map, function)) may produce different results if function has side-effects. (This is not recommended.) (68500b2c09)
  • hash: Added Hashing.fingerprint2011(). (13f703c25f)
  • io: Changed ByteStreams.nullOutputStream() to follow the contract of OutputStream.write by throwing an exception if the range of bytes is out of bounds. (1cd85d01c9)
  • net: Added @CheckReturnValue to the package (with a few exceptions). (a0e2577de6)
  • net: Added HttpHeaders constant for Access-Control-Allow-Private-Network. (6dabbdf9c9)
  • util.concurrent: Added accumulate/update methods for AtomicDouble and AtomicDoubleArray. (2d875d327a)

APIs promoted from @Beta

  • base: Throwables methods getCausalChain and getCauseAs (dd462afa6b)
  • collect: Streams methods mapWithIndex and findLast (8079a29463)
  • collect: the remaining methods in Comparators: min, max, lexicographical, emptiesFirst, emptiesLast, isInOrder, isInStrictOrder (a3e411c3a4)
  • escape: various APIs (468c68a6ac)

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.guava:guava&package-manager=maven&previous-version=31.0.1-jre&new-version=31.1-jre)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #304 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/304 from google:dependabot/maven/com.google.guava-guava-31.1-jre ad64bf9954a449bbec8b1b47d6e6d8d32787f9a5 PiperOrigin-RevId: 431753802 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fdbe0232..e2af7c25 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 31.0.1-jre + 31.1-jre com.google.errorprone From 85f31abfbf7945ead9f2f43029aaca03b5b0805d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 06:31:39 -0800 Subject: [PATCH 134/300] Bump checker-qual from 3.21.2 to 3.21.3 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.21.2 to 3.21.3.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.21.3

Version 3.21.3 (March 1, 2022)

Closed issues: #2847, #4965, #5039, #5042, #5047.

Changelog

Sourced from checker-qual's changelog.

Version 3.21.3 (March 1, 2022)

Closed issues: #2847, #4965, #5039, #5042, #5047.

Commits
  • 1f2d31c new release 3.21.3
  • f945c92 Update for release.
  • 4fcc1d3 Bump classgraph from 4.8.140 to 4.8.141
  • 0ff6387 Bump biz.aQute.bnd.gradle from 6.1.0 to 6.2.0
  • a7f54a2 Fix annotation element defaulting
  • eaecc63 Bump classgraph from 4.8.139 to 4.8.140
  • 62070ff Widen a char to an int or long should be @SignedPositiveFromUnsigned
  • b669b3e Report problems with a javac command line, not a build file
  • 6c5bdad Reinstate leading whitespace
  • b924fd1 Javadoc formatting fix
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.21.2&new-version=3.21.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #305 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/305 from google:dependabot/maven/org.checkerframework-checker-qual-3.21.3 72cf7fbf3bbd8aef902be25ef6305da18031b0c7 PiperOrigin-RevId: 431924958 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2af7c25..25d939fc 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.21.2 + 3.21.3 From 0576eead7b6dd52a3dd8928d967753c84beaeb06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 07:28:17 -0800 Subject: [PATCH 135/300] Bump actions/checkout from 2.4.0 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3.
Release notes

Sourced from actions/checkout's releases.

v3.0.0

  • Update default runtime to node16
Changelog

Sourced from actions/checkout's changelog.

Changelog

v2.3.1

v2.3.0

v2.2.0

v2.1.1

  • Changes to support GHES (here and here)

v2.1.0

v2.0.0

v2 (beta)

  • Improved fetch performance
    • The default behavior now fetches only the SHA being checked-out
  • Script authenticated git commands
    • Persists with.token in the local git config
    • Enables your scripts to run authenticated git commands
    • Post-job cleanup removes the token
    • Coming soon: Opt out by setting with.persist-credentials to false
  • Creates a local branch
    • No longer detached HEAD when checking out a branch
    • A local branch is created with the corresponding upstream branch set
  • Improved layout

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=2.4.0&new-version=3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #306 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/306 from google:dependabot/github_actions/actions/checkout-3 587fb599cfdb9ca9ee0f1d226cb333f0969e6b00 PiperOrigin-RevId: 431934359 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e6ce90f..4fc810c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@v2.4.0 + uses: actions/checkout@v3 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@v2 with: From 6927b60aaae4774e3051f5c55df06e991097d1a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 07:53:52 -0700 Subject: [PATCH 136/300] Bump maven-compiler-plugin from 3.10.0 to 3.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.0 to 3.10.1.
Release notes

Sourced from maven-compiler-plugin's releases.

3.10.1

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

Other contributions

Commits
  • 4e08e2b [maven-release-plugin] prepare release maven-compiler-plugin-3.10.1
  • 6795b0f [MCOMPILER-426] add flag to enable-preview java compiler feature (#98)
  • 1de8c91 MCOMPILER 346 workaround to jdk bug: assertion error from javaxcompiler javax...
  • 96ed94f use shared release drafter
  • fa80028 [MCOMPILER-485] Fixes internal string format in generated package-info.class ...
  • f605c0f Merge pull request #94 from apache/dependabot/maven/org.apache.maven.plugins-...
  • 4a54a9a Bump maven-javadoc-plugin from 3.3.1 to 3.3.2
  • 87b5a7f [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.10.0&new-version=3.10.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #307 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/307 from google:dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.10.1 f81b61a0839eef17b9e3f4dcf5abe9939e4c1690 PiperOrigin-RevId: 434463755 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25d939fc..1bee40c4 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ maven-compiler-plugin - 3.10.0 + 3.10.1 1.8 1.8 From fb589222312eae724e9e569e7320697534160ea7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 07:19:26 -0700 Subject: [PATCH 137/300] Bump checker-qual from 3.21.3 to 3.21.4 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.21.3 to 3.21.4.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.21.4

Version 3.21.4 (April 1, 2022)

Closed issues: #5086.

Changelog

Sourced from checker-qual's changelog.

Version 3.21.4 (April 1, 2022)

Closed issues: #5086.

Commits
  • e72f064 new release 3.21.4
  • 74f49db Prep for release.
  • 87af4e9 Update to stubparser 3.24.2. (#5098)
  • 9a0311b When no information about a field is in the store, use top when deciding whet...
  • 7336fd9 Call AnnotatedTypeFactory#getPath instead of Trees.getPath (#5096)
  • d943309 Bump de.undercouch.download from 5.0.2 to 5.0.4
  • 8cdeb46 force file encoding to UTF-8 during build/tests (#5093)
  • 7493691 Work around javac bug
  • f6f6c58 Improve Maven instructions. Fixes #5086. (#5089)
  • 91ec466 correct wildcard expansion in classpath arguments (#5090)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.21.3&new-version=3.21.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #310 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/310 from google:dependabot/maven/org.checkerframework-checker-qual-3.21.4 9b98672771ecc3dffdfd5c865afb898d2b252939 PiperOrigin-RevId: 439308966 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1bee40c4..08a680ba 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.21.3 + 3.21.4 From 2994de294577253a80e2094351bb41ce48c2ad1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:31:57 -0700 Subject: [PATCH 138/300] Bump error_prone_annotations from 2.11.0 to 2.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.11.0 to 2.12.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.12.0

New checks

Fixed issues: #58, #65, #1327, #1654, #2858, #2867, #2916, #2951, #2954, #3006, #3008

Full Changelog: https://github.com/google/error-prone/compare/v2.11.0...v2.12.0

Commits
  • 82e9c57 Release Error Prone 2.12.0
  • fba919b Fix consistency of isCovered() in CheckReturnValue
  • 2ea4d44 JUnit3TestNotRun: generalise to handle cases where a test methdod has paramet...
  • 3cc8786 Remove JMockTestWithoutRunWithOrRuleAnnotation, which isn't enabled.
  • 1be56c2 Remove NoFunctionalReturnType.
  • d175bb6 Add Matchers.methodHasNoParameters to disambiguate methodHasParameters()
  • d8961c2 Suppress MethodCanBeStatic with @​Keep (including as a meta-annotation)
  • 62a2d27 An update on StringEquality.
  • ce2e0f7 Varifier: change some fairly obvious patterns to var.
  • b8a1e55 Remove Proto Definitions of desugar_jdk_libs_apis.proto
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.11.0&new-version=2.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #312 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/312 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.12.0 5622b9e367a9f6c0327182fae3b9d5eb3e7dd5d5 PiperOrigin-RevId: 439588339 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08a680ba..70a1f08a 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.11.0 + 2.12.0 provided From f7efbb82a46cef83d2906e6300b1e77734a4d055 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 07:38:14 -0700 Subject: [PATCH 139/300] Bump error_prone_annotations from 2.12.0 to 2.12.1 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.12.0 to 2.12.1.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.12.1

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.12.0&new-version=2.12.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #313 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/313 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.12.1 1db59657a5b34f437999b71f5d4a54b21989db7c PiperOrigin-RevId: 439835148 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70a1f08a..dc002f53 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.12.0 + 2.12.1 provided From c1f676d729fa58b9f5eefb02951e023c6a67fe02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 08:30:14 -0700 Subject: [PATCH 140/300] Bump actions/setup-java from 2 to 3 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 3.
Release notes

Sourced from actions/setup-java's releases.

v3.0.0

In scope of this release we changed version of the runtime Node.js for the setup-java action and updated package-lock.json file to v2.

Breaking Changes

With the update to Node 16 in #290, all scripts will now be run with Node 16 rather than Node 12.

v2.5.0

In scope of this pull request we add support for Microsoft Build of OpenJDK (actions/setup-java#252).

steps:
  - name: Checkout
    uses: actions/checkout@v2
  - name: Setup-java
    uses: actions/setup-java@v2
    with:
      distribution: microsoft
      java-version: 11

Supported distributions

Currently, the following distributions are supported:

Keyword Distribution Official site License
temurin Eclipse Temurin Link Link
zulu Zulu OpenJDK Link Link
adopt or adopt-hotspot Adopt OpenJDK Hotspot Link Link
adopt-openj9 Adopt OpenJDK OpenJ9 Link Link
liberica Liberica JDK Link Link
microsoft Microsoft Build of OpenJDK Link Link

v2.4.0

In scope of this pull request we add support for Liberica JDK (actions/setup-java#225).

steps:
  - name: Checkout
    uses: actions/checkout@v2
  - name: Setup-java
    uses: actions/setup-java@v2
    with:
      distribution: liberica
      java-version: 11

Supported distributions

Currently, the following distributions are supported:

Keyword Distribution Official site License
zulu Zulu OpenJDK Link Link
adopt or adopt-hotspot Adopt OpenJDK Hotspot Link Link
adopt-openj9 Adopt OpenJDK OpenJ9 Link Link
temurin Eclipse Temurin Link Link

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=2&new-version=3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #314 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/314 from google:dependabot/github_actions/actions/setup-java-3 427149f67136d9b749ef9155151a618bccfe14e9 PiperOrigin-RevId: 440898754 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fc810c8..2bb5a38e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@v3 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 5e8e1a31d171f5b68582d2cc18936605219fd2a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 07:11:44 -0700 Subject: [PATCH 141/300] Bump error_prone_annotations from 2.12.1 to 2.13.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.12.1 to 2.13.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.13.0

  • Handle all annotations with the simple name Generated in -XepDisableWarningsInGeneratedCode (#3094)
  • Reconcile BugChecker#isSuppressed with suppression handling in ErrorProneScanner (#3094)
  • Fix a bug in enclosingPackage (8fa64d48f3a1d8df852ed2546ba02b0e2b7585af)
  • Improve performance of fix application (186334bcc45d9c275037cdcce3eb509ae8b7ff50)
  • Implicitly treat @AutoBuilder setter methods as @CanIgnoreReturnValue.
  • Remove some obsolete checks (PublicConstructorForAbstractClass, HashCodeToString)

Release Diff: v2.12.1...v2.13.0.

Commits
  • b48b264 Release Error Prone 2.13.0
  • 3906173 Update release.yml
  • 8fa64d4 Fix enclosingPackage after https://github.com/google/error-prone/commit/3ac...
  • f6323b2 Don't auto-release the staging repository
  • 4caf621 Create release.yml
  • 4fc1ff5 ImmutableChecker: start of work to match lambdas.
  • 006aa1d Strongly type a parameter as a MethodSymbol to make it a bit clearer what it ...
  • 5d647de Reconcile BugChecker#isSuppressed with suppression handling in `ErrorProneS...
  • 47c2b05 Handle all annotations with the simple name Generated in `-XepDisableWarnin...
  • 7b6ae68 PUBLIC: Add an example test for AutoBuilder build() methods.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.12.1&new-version=2.13.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #315 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/315 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.13.0 06496b9303e7e37388af931b43df028ca3ace0ac PiperOrigin-RevId: 442009492 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc002f53..c9f9ea5c 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.12.1 + 2.13.0 provided From 466a1ec812d5da5377f31e15d8f3150b9c5a00be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 07:59:52 -0700 Subject: [PATCH 142/300] Bump error_prone_annotations from 2.13.0 to 2.13.1 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.13.0 to 2.13.1.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.13.1

What's Changed

Full Changelog: https://github.com/google/error-prone/compare/v2.13.0...v2.13.1

Commits
  • 2076780 Release Error Prone 2.13.1
  • 726d179 Include the unicode character in the diagnostic message
  • ed35fda Fix a crash in UnnecessaryBoxedVariable
  • 460d6c2 Update release.yml
  • cb15103 Hardcode AlwaysThrows:MatchUuidParse.
  • 2d20166 Fix handling of foo.new A() {}.
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.13.0&new-version=2.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #316 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/316 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.13.1 cb819ff81fcfffae92181ba165c027fc96898917 PiperOrigin-RevId: 442542513 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9f9ea5c..2c61e26c 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.13.0 + 2.13.1 provided From b49ece41202778d92b0432364768833dc471cff8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 11:20:44 -0700 Subject: [PATCH 143/300] Bump maven-javadoc-plugin from 3.3.2 to 3.4.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.2 to 3.4.0.
Commits
  • 40cc602 [maven-release-plugin] prepare release maven-javadoc-plugin-3.4.0
  • 0c6b32f [MJAVADOC-714] Upgrade to Maven 3.2.5
  • 506cb74 [MJAVADOC-696] Invalid anchors in Javadoc and plugin mojo
  • 47d03d3 [MJAVADOC-712] Remove remains of org.codehaus.doxia.sink.Sink
  • 5fae3b6 [MJAVADOC-711] Upgrade plugins in ITs
  • 03ca843 Bump maven-archiver from 3.5.1 to 3.5.2
  • 5dcfa6e Bump plexus-archiver from 4.2.6 to 4.2.7
  • ca00601 Bump junit in /src/it/projects/MJAVADOC-498_modulepath
  • 2583554 Bump commons-io from 2.2 to 2.7 in /src/it/projects/MJAVADOC-437/module2
  • 9dd7bdd use shared gh action/release-drafter (#128)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.3.2&new-version=3.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #317 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/317 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.4.0 f9966177625054d3fd426846ed9d4e2f846cf92e PiperOrigin-RevId: 443714241 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2c61e26c..58970cfa 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ maven-javadoc-plugin - 3.3.2 + 3.4.0 maven-site-plugin @@ -206,7 +206,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 attach-docs From 77a5a6d3d62988bf6cdcf58ab7e16a7577b87270 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 09:08:49 -0700 Subject: [PATCH 144/300] Bump maven-site-plugin from 3.11.0 to 3.12.0 Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.11.0 to 3.12.0.
Commits
  • 8c597d8 [maven-release-plugin] prepare release maven-site-plugin-3.12.0
  • 32be6ad [MSITE-888] Upgrade to Maven 3.2.5
  • bf434e5 [MSITE-891] Upgrade plugins in ITs
  • 5f10ad1 [MSITE-890] Upgrade Jetty to 9.4.46.v20220331
  • 606a327 [MSITE-857] Jetty engine fails to resolve web.xml DTD behind corporate proxy
  • 522eddd [MSITE-889] Upgrade Plexus Utils to 3.3.1
  • d1bfb42 [MSITE-887] Deprecate templateFile parameter
  • 6c42df3 Add undeclared dependency
  • 73df7bb Remove unused properties
  • 7a3ed19 [MSITE-886] Upgrade Maven Wagon to 3.5.1
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-site-plugin&package-manager=maven&previous-version=3.11.0&new-version=3.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #318 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/318 from google:dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.12.0 a4307c0bc3454828c993caff285e02a6525997d7 PiperOrigin-RevId: 444285174 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58970cfa..0d0c0f29 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ maven-site-plugin - 3.11.0 + 3.12.0 From 2a17b1d9f36daf2a4cfdd47547c9aa73c14a955f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 May 2022 07:57:11 -0700 Subject: [PATCH 145/300] Bump checker-qual from 3.21.4 to 3.22.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.21.4 to 3.22.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.22.0

Version 3.22.0 (May 2, 2022)

User-visible changes:

The Signedness Checker now checks calls to equals() as well as to ==. When two formal parameter types are annotated with @​PolySigned, the two arguments at a call site must have the same signedness type annotation. (This differs from the standard rule for polymorphic qualifiers.)

Implementation details:

When passed a NewClassTree that creates an anonymous constructor, AnnotatedTypeFactory#constructorFromUse now returns the type of the anonymous constructor rather than the type of the super constructor invoked in the anonymous classes constructor. If the super constructor has explicit annotations, they are copied to the anonymous classes constructor.

Closed issues: #5113.

Changelog

Sourced from checker-qual's changelog.

Version 3.22.0 (May 2, 2022)

User-visible changes:

The Signedness Checker now checks calls to equals() as well as to ==. When two formal parameter types are annotated with @​PolySigned, the two arguments at a call site must have the same signedness type annotation. (This differs from the standard rule for polymorphic qualifiers.)

Implementation details:

When passed a NewClassTree that creates an anonymous constructor, AnnotatedTypeFactory#constructorFormUse now returns the type of the anonymous constructor rather than the type of the super constructor invoked in the anonymous classes constructor. If the super constructor has explicit annotations, they are copied to the anonymous classes constructor.

Closed issues: #5113.

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.21.4&new-version=3.22.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #319 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/319 from google:dependabot/maven/org.checkerframework-checker-qual-3.22.0 fcd137866b517c095dce81c7e1bffa12aa70783a PiperOrigin-RevId: 446193640 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d0c0f29..e88f8c11 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.21.4 + 3.22.0 From d140209439811c8d1bfbb022e61826deea2d719e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 07:41:47 -0700 Subject: [PATCH 146/300] Bump error_prone_annotations from 2.13.1 to 2.14.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.13.1 to 2.14.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.14.0

New checkers:

Fixed issues: #3110, #3193

Full Changelog: https://github.com/google/error-prone/compare/v2.13.1...v2.14.0

Commits
  • 3a2c717 Release Error Prone 2.14.0
  • fbacd85 Don't crash when a lambda parameter's type is an inner class in the default p...
  • 81acea9 Don't crash on an "empty" method with a redundant return.
  • 464b218 Implement BanSerializableRead in Android Lint.
  • 7cd5def Support void placeholder expressions in Refaster
  • b822dd4 ImmutableChecker: handle local classes.
  • 98dfcaf Scan try-with-resources blocks
  • be243a1 ImmutableChecker: check any variables that anonymous classes close around.
  • 2cb3b54 ImmutableChecker: fix the heuristic around MemberSelects.
  • 97a7dbc Don't crash when someone declares a StringBuffer using var.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.13.1&new-version=2.14.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #320 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/320 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.14.0 6102f2d21aaf399ee5264c43266e8412c10f83dc PiperOrigin-RevId: 450921228 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e88f8c11..f49c84b2 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.13.1 + 2.14.0 provided From 5c1b7c247b703d3a5f26faf19b916d5310a4aeb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 08:47:41 -0700 Subject: [PATCH 147/300] Bump checker-qual from 3.22.0 to 3.22.1 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.22.0 to 3.22.1.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.22.1

Version 3.22.1 (June 1, 2022)

Closed issues: #58, #5136, #5138, #5142, #5143.

Changelog

Sourced from checker-qual's changelog.

Version 3.22.1 (June 1, 2022)

Closed issues: #58, #5136, #5138, #5142, #5143.,

Commits
  • 2089614 new release 3.22.1
  • 039d70e Prep for release.
  • 7821f4a Project ideas are relevant beyond GSoC (#5148)
  • 705c522 Bump require-javadoc from 1.0.2 to 1.0.3
  • 4f79420 Expand auto-discovery discussion (#5146)
  • 5c4de3a Bump classgraph from 4.8.146 to 4.8.147
  • 00a52bd Bump error_prone_annotations from 2.13.1 to 2.14.0
  • ebcd2f4 Add -AinferOutputOriginal option
  • a84f10a Enable all-systems tests for whole-program inference (#5091)
  • 60950e8 Bump de.undercouch.download from 5.0.5 to 5.1.0
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.22.0&new-version=3.22.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #321 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/321 from google:dependabot/maven/org.checkerframework-checker-qual-3.22.1 c894f8650240b73d11f433609bd3e2b41983540a PiperOrigin-RevId: 452547236 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f49c84b2..4bfce797 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.22.0 + 3.22.1 From 14d7b25e847af39d78cf75ae354a98dcb0ecccc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 08:26:14 -0700 Subject: [PATCH 148/300] Bump checker-qual from 3.22.1 to 3.22.2 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.22.1 to 3.22.2.
Changelog

Sourced from checker-qual's changelog.

Version 3.22.2 (June 14, 2022)

Implementation details:

Expose CFG APIs to allow inserting jumps and throws

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.22.1&new-version=3.22.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #322 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/322 from google:dependabot/maven/org.checkerframework-checker-qual-3.22.2 16b81f4b2ba4b3d8bc6771da99373f616130c9a9 PiperOrigin-RevId: 455136130 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4bfce797..5b49bcf2 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.22.1 + 3.22.2 From a9a657436cad322c2814debf6c49ccff4115c025 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 08:11:09 -0700 Subject: [PATCH 149/300] Bump styfle/cancel-workflow-action from 0.9.1 to 0.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.9.1 to 0.10.0.
Release notes

Sourced from styfle/cancel-workflow-action's releases.

0.10.0

Changes

  • Feat(all):support for considering all workflows with one term: #165
  • Chore: rebuild: 74a81dc1a9321342ebc12fa8670cc91600c8c494
  • Chore: update main.yml: #78
  • Bump @​vercel/ncc from 0.28.6 to 0.29.1: #106
  • Bump @​vercel/ncc from 0.29.1 to 0.29.2: #109
  • Bump @​vercel/ncc from 0.29.2 to 0.30.0: #112
  • Bump husky from 7.0.1 to 7.0.2: #110
  • Bump prettier from 2.3.2 to 2.4.0: #116
  • Bump @​vercel/ncc from 0.30.0 to 0.31.1: #115
  • Bump typescript from 4.3.5 to 4.4.3: #114
  • Bump prettier from 2.4.0 to 2.4.1: #117
  • Bump @​actions/github from 4.0.0 to 5.0.0: #89
  • Bump @​actions/core from 1.3.0 to 1.6.0: #118
  • Bump typescript from 4.4.3 to 4.4.4: #119
  • Bump husky from 7.0.2 to 7.0.4: #120
  • Bump typescript from 4.4.4 to 4.5.2: #124
  • Bump @​vercel/ncc from 0.31.1 to 0.32.0: #123
  • Bump prettier from 2.4.1 to 2.5.0: #125
  • Bump prettier from 2.5.0 to 2.5.1: #126
  • Bump @​vercel/ncc from 0.32.0 to 0.33.0: #127
  • Bump typescript from 4.5.2 to 4.5.3: #128
  • Bump @​vercel/ncc from 0.33.0 to 0.33.1: #130
  • Bump typescript from 4.5.3 to 4.5.4: #129
  • Bump typescript from 4.5.4 to 4.5.5: #131
  • Bump node-fetch from 2.6.5 to 2.6.7: #132
  • Bump @​vercel/ncc from 0.33.1 to 0.33.3: #138
  • Bump actions/setup-node from 2 to 3.0.0: #140
  • Bump actions/checkout from 2 to 3: #141
  • Bump typescript from 4.5.5 to 4.6.2: #142
  • Bump prettier from 2.5.1 to 2.6.0: #143
  • Bump prettier from 2.6.0 to 2.6.1: #145
  • Bump actions/setup-node from 3.0.0 to 3.1.0: #146
  • Bump typescript from 4.6.2 to 4.6.3: #144
  • Bump prettier from 2.6.1 to 2.6.2: #147
  • Bump @​actions/github from 5.0.0 to 5.0.1: #148
  • Bump actions/setup-node from 3.1.0 to 3.1.1: #149
  • Bump @​vercel/ncc from 0.33.3 to 0.33.4: #151
  • Bump @​actions/core from 1.6.0 to 1.7.0: #153
  • Bump typescript from 4.6.3 to 4.6.4: #154
  • Bump husky from 7.0.4 to 8.0.1: #155
  • Bump @​actions/core from 1.7.0 to 1.8.0: #156
  • Bump actions/setup-node from 3.1.1 to 3.2.0: #159
  • Bump @​actions/github from 5.0.1 to 5.0.3: #157
  • Bump @​actions/core from 1.8.0 to 1.8.2: #158
  • Bump typescript from 4.6.4 to 4.7.2: #160
  • Bump @​vercel/ncc from 0.33.4 to 0.34.0: #161
  • Bump typescript from 4.7.2 to 4.7.3: #163

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=styfle/cancel-workflow-action&package-manager=github_actions&previous-version=0.9.1&new-version=0.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #324 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/324 from google:dependabot/github_actions/styfle/cancel-workflow-action-0.10.0 ce3ef838a9e8f8dd5648c6b5b369238071fd37b6 PiperOrigin-RevId: 457482774 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bb5a38e..3c9b9090 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: # Cancel any previous runs for the same branch that are still running. - name: 'Cancel previous runs' - uses: styfle/cancel-workflow-action@0.9.1 + uses: styfle/cancel-workflow-action@0.10.0 with: access_token: ${{ github.token }} - name: 'Check out repository' From b8119dc5a2ffb4608dbfcbd2142d91692606667a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 08:46:44 -0700 Subject: [PATCH 150/300] Bump checker-qual from 3.22.2 to 3.23.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.22.2 to 3.23.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.23.0

Version 3.23.0 (July 11, 2022)

User-visible changes:

By default, command-line argument -AstubWarnIfNotFound is treated as true for stub files provided on the command line and false for built-in stub files. Use -AstubWarnIfNotFound to enable it for all stub files, and use new -AstubNoWarnIfNotFound to disable it for all stub files.

New command-line argument -ApermitStaticOwning suppresses Resource Leak Checker warnings related to static owning fields.

New command-line argument -ApermitInitializationLeak suppresses Resource Leak Checker warnings related to field initialization.

Closed issues:

#4855, #5151, #5166, #5172, #5175, #5181, #5189.

Changelog

Sourced from checker-qual's changelog.

Version 3.23.0 (July 11, 2022)

User-visible changes:

By default, command-line argument -AstubWarnIfNotFound is treated as true for stub files provided on the command line and false for built-in stub files. Use -AstubWarnIfNotFound to enable it for all stub files, and use new -AstubNoWarnIfNotFound to disable it for all stub files.

New command-line argument -ApermitStaticOwning suppresses Resource Leak Checker warnings related to static owning fields.

New command-line argument -ApermitInitializationLeak suppresses Resource Leak Checker warnings related to field initialization.

Closed issues:

#4855, #5151, #5166, #5172, #5175, #5181, #5189.

Commits
  • 07cc67f Remove stray character
  • bf5ab82 Handle there being nothing to commit
  • 407d6ee Need to update AFU version number, too
  • 25e9c3d Update changelog for release 3.23.0
  • e9193df Remove unnecessary step (updating list of contributors)
  • 22b6d5a Handle passing no arguments to a varargs method
  • 95c93bb CFG construction documentation
  • f550329 Move Javadoc comment
  • adc381e Documentation about creating a checker
  • 864942c Factor out WholeProgramInferenceJavaParserStorage#isInvisible (#5196)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.22.2&new-version=3.23.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #325 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/325 from google:dependabot/maven/org.checkerframework-checker-qual-3.23.0 22ac377beaeeb1729fde3b31387421140fd34d3c PiperOrigin-RevId: 460725841 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b49bcf2..7702a9b9 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.22.2 + 3.23.0 From 05b022fedec123164eb16636cf15ede4f1f93886 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Aug 2022 08:26:19 -0700 Subject: [PATCH 151/300] Bump checker-qual from 3.23.0 to 3.24.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.23.0 to 3.24.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.24.0

Version 3.24.0 (August 3, 2022)

User-visible changes:

Performance improvements.

Minor bug fixes and enhancements.

Implementation details:

Prefer SystemUtil.jreVersion to SystemUtil.getJreVersion().

Closed issues:

#5200, #5216.

Changelog

Sourced from checker-qual's changelog.

Version 3.24.0 (August 3, 2022)

User-visible changes:

Performance improvements.

Minor bug fixes and enhancements.

Implementation details:

Prefer SystemUtil.jreVersion to SystemUtil.getJreVersion().

Closed issues:

#5200, #5216.

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.23.0&new-version=3.24.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #326 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/326 from google:dependabot/maven/org.checkerframework-checker-qual-3.24.0 583c9f91fccae7b03bd8a61bd1ca799094acb5db PiperOrigin-RevId: 465319876 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7702a9b9..82ad1ea9 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.23.0 + 3.24.0 From 49ea1120cc32680d49dd46373e5ab00f364db794 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 08:00:51 -0700 Subject: [PATCH 152/300] Bump maven-site-plugin from 3.12.0 to 3.12.1 Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.12.0 to 3.12.1.
Commits
  • ecae28f [maven-release-plugin] prepare release maven-site-plugin-3.12.1
  • d98569b [MSITE-908] Upgrade Maven Reporting API to 3.1.1
  • bd3376f [MSITE-901] If precending standalone report has been run, site:jar does not r...
  • b99c0ef [MSITE-902] Upgrade Plexus Utils to 3.4.2
  • 3c6ff2e Update CI URL
  • f314e9d [MSITE-898] Upgrade Parent to 36
  • bce7458 [MSITE-897] Upgrade Plexus Archiver to 4.2.7
  • 3c8d426 keep only release month, drop day
  • 6604ab3 also keep only Doxia versions changes
  • 789a7a1 lighten content: keep only meaningful values
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-site-plugin&package-manager=maven&previous-version=3.12.0&new-version=3.12.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #328 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/328 from google:dependabot/maven/org.apache.maven.plugins-maven-site-plugin-3.12.1 a231e3d953a0330c974d11e8d57b978cbc6c6247 PiperOrigin-RevId: 465564219 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82ad1ea9..35510ac4 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ maven-site-plugin - 3.12.0 + 3.12.1 From fb26dc50bfd27e2d5a138ca64bce8e3cb1516205 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 12:35:42 -0700 Subject: [PATCH 153/300] Bump error_prone_annotations from 2.14.0 to 2.15.0 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.14.0 to 2.15.0.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.15.0

New Checkers:

Fixed issues: #1562, #3236, #3245, #3321

Full Changelog: https://github.com/google/error-prone/compare/v2.14.0...v2.15.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.14.0&new-version=2.15.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #327 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/327 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.15.0 95125a81e4cb35338620af94b0e98dadd106cb79 PiperOrigin-RevId: 466118227 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35510ac4..e656b507 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.14.0 + 2.15.0 provided From 60a5b544970d3408bb0285ac5211416c4cc4b53d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 08:04:34 -0700 Subject: [PATCH 154/300] Bump maven-javadoc-plugin from 3.4.0 to 3.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.0 to 3.4.1.
Release notes

Sourced from maven-javadoc-plugin's releases.

3.4.1

📦 Dependency updates

Commits
  • a5db96e [maven-release-plugin] prepare release maven-javadoc-plugin-3.4.1
  • a10f0b1 [MJAVADOC-723] Upgrade Maven Reporting API to 3.1.1/Complete with Maven Repor...
  • c19dba2 Skip Java 9-14 in reproducible test
  • 26d84b2 Add notimestamp for reproducible builds test
  • 92ce668 Ignore Maven Core updates
  • bacc078 Add Integration Test for reproducible builds
  • 497f80f [MJAVADOC-719] - Update Maven Archiver to 3.6.0
  • 34b501d Bump assertj-core from 3.21.0 to 3.23.1
  • b928970 Bump spring-webmvc in /src/it/projects/MJAVADOC-434_fixcompile
  • 4306c92 Bump mockito-core from 4.1.0 to 4.4.0
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.4.0&new-version=3.4.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #330 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/330 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.4.1 b052c04618e7f172fc4cd4f69e0f5d83fd173f55 PiperOrigin-RevId: 467670825 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e656b507..387d734a 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ maven-javadoc-plugin - 3.4.0 + 3.4.1 maven-site-plugin @@ -206,7 +206,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.4.1 attach-docs From 115014eb920e361e43880c8ad607f06c7e048ff8 Mon Sep 17 00:00:00 2001 From: Compile-Testing Team Date: Tue, 16 Aug 2022 15:05:04 -0700 Subject: [PATCH 155/300] Improve error messages rendered by `JavaSourcesSubject.parsesAs()` and `JavaFileObjectSubject.containsElementsIn()` to more easily distinguish between errors incurred in *actual* vs *expected* source. RELNOTES=Improve error messages rendered by `JavaSourcesSubject.parsesAs()` and `JavaFileObjectSubject.containsElementsIn()` to more easily distinguish between errors incurred in *actual* vs *expected* source. PiperOrigin-RevId: 468034719 --- .../compile/JavaFileObjectSubject.java | 4 +-- .../testing/compile/JavaSourcesSubject.java | 4 +-- .../com/google/testing/compile/MoreTrees.java | 4 +-- .../com/google/testing/compile/Parser.java | 11 ++++-- .../compile/JavaFileObjectSubjectTest.java | 36 +++++++++++++++++++ .../JavaSourcesSubjectFactoryTest.java | 4 +-- 6 files changed, 52 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index b0b26971..eb27c3a3 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -170,10 +170,10 @@ private void performTreeDifference( String failureVerb, String expectedTitle, BiFunction differencingFunction) { - ParseResult actualResult = Parser.parse(ImmutableList.of(actual)); + ParseResult actualResult = Parser.parse(ImmutableList.of(actual), "*actual* source"); CompilationUnitTree actualTree = getOnlyElement(actualResult.compilationUnits()); - ParseResult expectedResult = Parser.parse(ImmutableList.of(expected)); + ParseResult expectedResult = Parser.parse(ImmutableList.of(expected), "*expected* source"); CompilationUnitTree expectedTree = getOnlyElement(expectedResult.compilationUnits()); TreeDifference treeDifference = differencingFunction.apply(expectedResult, actualResult); diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index f55276fe..394eb002 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -158,7 +158,7 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { "Compilation generated no additional source files, though some were expected.")); return; } - ParseResult actualResult = Parser.parse(actual); + ParseResult actualResult = Parser.parse(actual, "*actual* source"); ImmutableList> errors = actualResult.diagnosticsByKind().get(Kind.ERROR); if (!errors.isEmpty()) { @@ -170,7 +170,7 @@ public void parsesAs(JavaFileObject first, JavaFileObject... rest) { failWithoutActual(simpleFact(message.toString())); return; } - ParseResult expectedResult = Parser.parse(Lists.asList(first, rest)); + ParseResult expectedResult = Parser.parse(Lists.asList(first, rest), "*expected* source"); ImmutableList actualTrees = actualResult.compilationUnits().stream() .map(TypedCompilationUnit::create) diff --git a/src/main/java/com/google/testing/compile/MoreTrees.java b/src/main/java/com/google/testing/compile/MoreTrees.java index 6be48865..5a10e044 100644 --- a/src/main/java/com/google/testing/compile/MoreTrees.java +++ b/src/main/java/com/google/testing/compile/MoreTrees.java @@ -52,7 +52,7 @@ static CompilationUnitTree parseLinesToTree(String... source) { /** Parses the source given into a {@link CompilationUnitTree}. */ static CompilationUnitTree parseLinesToTree(Iterable source) { Iterable parseResults = - Parser.parse(ImmutableList.of(JavaFileObjects.forSourceLines("", source))) + Parser.parse(ImmutableList.of(JavaFileObjects.forSourceLines("", source)), "source") .compilationUnits(); return Iterables.getOnlyElement(parseResults); } @@ -64,7 +64,7 @@ static ParseResult parseLines(String... source) { /** Parses the source given and produces a {@link ParseResult}. */ static ParseResult parseLines(Iterable source) { - return Parser.parse(ImmutableList.of(JavaFileObjects.forSourceLines("", source))); + return Parser.parse(ImmutableList.of(JavaFileObjects.forSourceLines("", source)), "source"); } /** diff --git a/src/main/java/com/google/testing/compile/Parser.java b/src/main/java/com/google/testing/compile/Parser.java index e5ad76ac..e75d9076 100644 --- a/src/main/java/com/google/testing/compile/Parser.java +++ b/src/main/java/com/google/testing/compile/Parser.java @@ -50,8 +50,11 @@ public final class Parser { /** * Parses {@code sources} into {@linkplain CompilationUnitTree compilation units}. This method * does not compile the sources. + * + * @param sourcesDescription describes the sources. Parsing exceptions will contain this string. + * @throws IllegalStateException if any parsing errors occur. */ - static ParseResult parse(Iterable sources) { + static ParseResult parse(Iterable sources, String sourcesDescription) { JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); DiagnosticCollector diagnosticCollector = new DiagnosticCollector<>(); InMemoryJavaFileManager fileManager = @@ -72,8 +75,8 @@ static ParseResult parse(Iterable sources) { Iterable parsedCompilationUnits = task.parse(); List> diagnostics = diagnosticCollector.getDiagnostics(); if (foundParseErrors(parsedCompilationUnits, diagnostics)) { - throw new IllegalStateException( - "error while parsing:\n" + Joiner.on('\n').join(diagnostics)); + String msgPrefix = String.format("Error while parsing %s:\n", sourcesDescription); + throw new IllegalStateException(msgPrefix + Joiner.on('\n').join(diagnostics)); } return new ParseResult( sortDiagnosticsByKind(diagnostics), parsedCompilationUnits, Trees.instance(task)); @@ -195,4 +198,6 @@ private DummyJavaCompilerSubclass() { super(null); } } + + private Parser() {} } diff --git a/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java b/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java index 485c84f5..b3aaf218 100644 --- a/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java +++ b/src/test/java/com/google/testing/compile/JavaFileObjectSubjectTest.java @@ -21,6 +21,7 @@ import static com.google.testing.compile.JavaFileObjectSubject.assertThat; import static com.google.testing.compile.JavaFileObjectSubject.javaFileObjects; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.Assert.assertThrows; import com.google.common.truth.ExpectFailure; import java.io.IOException; @@ -196,4 +197,39 @@ public void hasSourceEquivalentTo_failOnExtraInActual() throws IOException { public void containsElementsIn_completeMatch() { assertThat(SAMPLE_ACTUAL_FILE_FOR_MATCHING).containsElementsIn(SAMPLE_ACTUAL_FILE_FOR_MATCHING); } + + private static final JavaFileObject SIMPLE_INVALID_FILE = + JavaFileObjects.forSourceLines( + "test.SomeClass", // + "package test;", + "", + "public syntax error class SomeClass {", + "}"); + private static final JavaFileObject SIMPLE_VALID_FILE = + JavaFileObjects.forSourceLines( + "test.SomeClass", // + "package test;", + "", + "public class SomeClass {", + "}"); + + @Test + public void containsElementsIn_badActual() { + IllegalStateException ex = + assertThrows( + IllegalStateException.class, + () -> assertThat(SIMPLE_INVALID_FILE).containsElementsIn(SIMPLE_VALID_FILE)); + + assertThat(ex).hasMessageThat().startsWith("Error while parsing *actual* source:\n"); + } + + @Test + public void containsElementsIn_badExpected() { + IllegalStateException ex = + assertThrows( + IllegalStateException.class, + () -> assertThat(SIMPLE_VALID_FILE).containsElementsIn(SIMPLE_INVALID_FILE)); + + assertThat(ex).hasMessageThat().startsWith("Error while parsing *expected* source:\n"); + } } diff --git a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java index f140fd72..267634f9 100644 --- a/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java +++ b/src/test/java/com/google/testing/compile/JavaSourcesSubjectFactoryTest.java @@ -398,7 +398,7 @@ public void parsesAs_expectedFileFailsToParse() { .parsesAs(JavaFileObjects.forResource("test/HelloWorld-broken.java")); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).startsWith("error while parsing:"); + assertThat(expected.getMessage()).startsWith("Error while parsing *expected* source:\n"); } } @@ -410,7 +410,7 @@ public void parsesAs_actualFileFailsToParse() { .parsesAs(HELLO_WORLD_RESOURCE); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage()).startsWith("error while parsing:"); + assertThat(expected.getMessage()).startsWith("Error while parsing *actual* source:\n"); } } From 5dc482c5b1250c0c611187842c05b5598d8193e5 Mon Sep 17 00:00:00 2001 From: Compile-Testing Team Date: Mon, 22 Aug 2022 09:12:33 -0700 Subject: [PATCH 156/300] Add suppressions for existing violations of LenientFormatStringValidation to support making it an ERROR. PiperOrigin-RevId: 469201521 --- .../com/google/testing/compile/TreeContext.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/google/testing/compile/TreeContext.java b/src/main/java/com/google/testing/compile/TreeContext.java index 66dc5ef4..712c705f 100644 --- a/src/main/java/com/google/testing/compile/TreeContext.java +++ b/src/main/java/com/google/testing/compile/TreeContext.java @@ -58,17 +58,20 @@ Trees getTrees() { } /** - * Returns the {@code TreePath} to the given sub-{@code Tree} of this object's - * {@code CompilationUnitTree} + * Returns the {@code TreePath} to the given sub-{@code Tree} of this object's {@code + * CompilationUnitTree} * * @throws IllegalArgumentException if the node provided is not a sub-{@code Tree} of this - * object's {@code CompilationUnitTree}. + * object's {@code CompilationUnitTree}. */ TreePath getNodePath(Tree node) { TreePath treePath = trees.getPath(compilationUnit, node); - checkArgument(treePath != null, "The node provided was not a subtree of the " - + "CompilationUnitTree in this TreeContext. CompilationUnit: %s; Node:", - compilationUnit, node); + checkArgument( + treePath != null, + "The node provided was not a subtree of the " + + "CompilationUnitTree in this TreeContext. CompilationUnit: %s; Node: %s", + compilationUnit, + node); return treePath; } From 9190007c29e090615b9db905e48570d78106fec2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Sep 2022 08:59:23 -0700 Subject: [PATCH 157/300] Bump checker-qual from 3.24.0 to 3.25.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.24.0 to 3.25.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.25.0

Version 3.25.0 (September 1, 2022)

User-visible changes:

Make mustcall.not.inheritable a warning rather than an error

The Property File Checker, Internationalization Checker, and Compiler Message Checker use File.pathSeparator to separate property file paths in -Apropfiles, rather than ':'.

Added DoNothingChecker that does nothing.

Closed issues:

#5216, #5240, #5256, #5273.

Changelog

Sourced from checker-qual's changelog.

Version 3.25.0 (September 1, 2022)

User-visible changes:

Make mustcall.not.inheritable a warning rather than an error

The Property File Checker, Internationalization Checker, and Compiler Message Checker use File.pathSeparator to separate property file paths in -Apropfiles, rather than ':'.

Added DoNothingChecker that does nothing.

Implementation details:

Closed issues:

#5216, #5240, #5256, #5273.

Commits
  • b598442 Split one command into three, in attempt to improve determinism
  • ff25dec Fix command name
  • b261ab4 Improve diagnostic
  • 1562557 Update version number to 3.25.0
  • 84c1a51 Update changelog for version 3.25.0
  • eaec25f Update com.amazonaws:aws-java-sdk-bom
  • 52eee57 Discuss related repositories
  • 56ed124 Update version number and date
  • 421b9a6 Changed -Apropfiles to use File.pathSeparator (#5274)
  • 3e9f110 Set environment variable before invoking wpi-many.sh (#5272)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.24.0&new-version=3.25.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #333 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/333 from google:dependabot/maven/org.checkerframework-checker-qual-3.25.0 06fecfa76632ce728c9acdd5b3a40f92fc346ff5 PiperOrigin-RevId: 471813429 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 387d734a..9f0d2262 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.24.0 + 3.25.0 From c2bd7ba19635779b374ce07f03a91a204e812220 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 07:54:11 -0700 Subject: [PATCH 158/300] Bump maven-jar-plugin from 3.2.2 to 3.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.2 to 3.3.0.
Release notes

Sourced from maven-jar-plugin's releases.

3.3.0

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

📝 Documentation updates

  • Restore mavenArchiverVersion property used in the site (#51) @​jorsol
  • (doc) Updated create-test-jar.apt.vm removing 'and' in Maven site Create Test JAR documentation (#34) @​focbenz

👻 Maintenance

Commits
  • d68df4b [maven-release-plugin] prepare release maven-jar-plugin-3.3.0
  • fb2299a Restore mavenArchiverVersion property used in the site
  • 1204127 [MJAR-290] - Update Plexus Utils to 3.4.2
  • 5fd2fc9 [MJAR-291] - Upgrade Parent to 37
  • 56344da use shared action v3 (#49)
  • 4148491 Code simplifications in AbstractMojo (#47)
  • 46c017d [MJAR-275] - Fix outputTimestamp not applied to module-info; breaks reproduci...
  • c02be20 [MJAR-278] Update plugin (requires Maven 3.2.5+) (#19)
  • b6fe3eb Bump junit from 4.11 to 4.13.2 in /src/it/MJAR-228
  • 78a28dd Ignore Maven Core updates
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-jar-plugin&package-manager=maven&previous-version=3.2.2&new-version=3.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #334 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/334 from google:dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.3.0 7e328b5896d5526d8a0d24e07d78cba004f535f2 PiperOrigin-RevId: 474813982 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f0d2262..4f223996 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ maven-jar-plugin - 3.2.2 + 3.3.0 maven-javadoc-plugin From b9a66d1bf19cbb2836048620a97e4128d813a4cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 06:14:34 -0700 Subject: [PATCH 159/300] Bump styfle/cancel-workflow-action from 0.10.0 to 0.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.10.0 to 0.10.1.
Release notes

Sourced from styfle/cancel-workflow-action's releases.

0.10.1

Patches

  • Bump actions/setup-node from 3.3.0 to 3.4.0: #171
  • Bump actions/setup-node from 3.4.0 to 3.4.1: #172
  • Bump @​actions/core from 1.9.0 to 1.9.1: #176
  • Bump typescript from 4.7.4 to 4.8.2: #177
  • Bump typescript from 4.8.2 to 4.8.3: #178
  • Bump @​actions/github from 5.0.3 to 5.1.0: #179
  • Bump actions/setup-node from 3.4.1 to 3.5.0: #180
  • Chore: change access_token to optional: #72
  • Chore: update README.md to the correct version: #173
  • Chore: add README.md section about versioning: bb0138e6865a516b5413971879ceda1467fd2930 2c6e931f39ab183387be060414035511a22e69bd

Credits

Huge thanks to @​licitdev and @​MichaelDeBoey for helping!

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=styfle/cancel-workflow-action&package-manager=github_actions&previous-version=0.10.0&new-version=0.10.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #336 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/336 from google:dependabot/github_actions/styfle/cancel-workflow-action-0.10.1 b1d751f3bcfc32b32b410661d5e867463b6964d2 PiperOrigin-RevId: 478484431 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c9b9090..d8f956ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: # Cancel any previous runs for the same branch that are still running. - name: 'Cancel previous runs' - uses: styfle/cancel-workflow-action@0.10.0 + uses: styfle/cancel-workflow-action@0.10.1 with: access_token: ${{ github.token }} - name: 'Check out repository' From 6be818d597801ffe566df4e41127e3a8c5c3ef8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 10:29:40 -0700 Subject: [PATCH 160/300] Bump checker-qual from 3.25.0 to 3.26.0 Bumps [checker-qual](https://github.com/typetools/checker-framework) from 3.25.0 to 3.26.0.
Release notes

Sourced from checker-qual's releases.

Checker Framework 3.26.0

Version 3.26.0 (October 3, 2022)

User-visible changes:

The Checker Framework runs under JDK 18 -- that is, it runs on a version 18 JVM. (It worked before, but gave a warning that it was not tested.)

Annotations are available for some new JDK 17 APIs (some of those introduced since JDK 11).

Added -AnoWarnMemoryConstraints to change the "Memory constraints are impeding performance; please increase max heap size" message from a warning to a note.

'unneeded.suppression' warnings can now themeselves be suppressed.

Implementation details:

Deprecated TreeUtils.constructor() in favor of TreeUtils.elementFromUse().

Added method isSideEffectFree() to the AnnotationProvider interface.

Deprecated CFAbstractStore.isSideEffectFree() in favor of new method AnnotationProvider.isSideEffectFree(). Note the different contracts of PurityUtils.isSideEffectFree() and AnnotationProvider.isSideEffectFree().

Use TreeUtils.elementFromDeclaration and TreeUtils.elementFromUse in preference to TreeUtils.elementFromTree, when possible.

For code formatting, use ./gradlew spotlessCheck and ./gradlew spotlessApply. The checkFormat and reformat Gradle tasks have been removed.

Removed variable BaseTypeVisitor.inferPurity.

Closed issues:

#5081, #5159, #5245, #5302, #5319, #5323.

Changelog

Sourced from checker-qual's changelog.

Version 3.26.0 (October 3, 2022)

User-visible changes:

The Checker Framework runs under JDK 18 -- that is, it runs on a version 18 JVM. (It worked before, but gave a warning that it was not tested.)

Annotations are available for some new JDK 17 APIs (some of those introduced since JDK 11).

Added -AnoWarnMemoryConstraints to change the "Memory constraints are impeding performance; please increase max heap size" message from a warning to a note.

'unneeded.suppression' warnings can now themeselves be suppressed.

Implementation details:

Deprecated TreeUtils.constructor() in favor of TreeUtils.elementFromUse().

Added method isSideEffectFree() to the AnnotationProvider interface.

Deprecated CFAbstractStore.isSideEffectFree() in favor of new method AnnotationProvider.isSideEffectFree(). Note the different contracts of PurityUtils.isSideEffectFree() and AnnotationProvider.isSideEffectFree().

Use TreeUtils.elementFromDeclaration and TreeUtils.elementFromUse in preference to TreeUtils.elementFromTree, when possible.

For code formatting, use ./gradlew spotlessCheck and ./gradlew spotlessApply. The checkFormat and reformat Gradle tasks have been removed.

Removed variable BaseTypeVisitor.inferPurity.

Closed issues:

#5081, #5159, #5245, #5302, #5319, #5323.

Commits
  • c7c9f44 Prep for release.
  • 8dda0e9 Use Java 8 to build the release
  • 1af86bf Convert typevars to "uses" before substitution; fixes #5245
  • 8e97003 Delete generated API documentation before coping new release
  • c42463e Update to StubParser 3.24.4. (#5346)
  • 567870f Handle wget failure
  • 87f351d Remove the --notest option to release_build.py
  • 04f831b Miscellaneous cleanups for supporting JDK 18 (#5345)
  • df157d3 Fix crash in ajava-based WPI related to captures (#5335)
  • c6103fc Infer purity when using the Lock Checker (#5343)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.25.0&new-version=3.26.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #337 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/337 from google:dependabot/maven/org.checkerframework-checker-qual-3.26.0 26d2eb239e3c2414a28fd0d208a1ab1725608db4 PiperOrigin-RevId: 478825112 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f223996..0b3e70cb 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.25.0 + 3.26.0 From d288d4555700c6283cce0049cc8238f0a08e7e25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Oct 2022 08:09:13 -0700 Subject: [PATCH 161/300] Bump auto-value from 1.9 to 1.10 Bumps [auto-value](https://github.com/google/auto) from 1.9 to 1.10.
Release notes

Sourced from auto-value's releases.

AutoValue 1.10

  • AutoBuilder is now stable and supported. (2e44a5327)
    • AutoBuilder now allows you to omit a Kotlin default parameter when building a Kotlin class. (d2f91bf32)
    • An @AutoBuilder class can now have @AutoValue.CopyAnnotations so annotations are copied from the class to its generated subclass. (3a15c8834)
    • The generated AutoBuilder class now has a "copy constructor" if values for the builder properties can be obtained from the built type. (b3b53a344)
    • AutoBuilder can now be used to build annotation implementations directly. (196c8100d)
  • Fixed an issue when Serializable and Memoized extensions are used together. (e01968d16)
  • @AutoAnnotation now has CLASS rather than SOURCE retention, making for better operation with Gradle incremental compilation. (34c3be569)
  • @AutoAnnotation methods no longer need to be static. This makes it easier to use AutoAnnotation with Kotlin. (cf55dc644)
  • AutoValue and AutoBuilder builders now use bitmasks to track unset primitive properties, which will typically lead to smaller builder objects and faster build times. (b5d398977)
Commits
  • e065d19 Set version number for auto-value-parent to 1.10.
  • 0079f49 Bump asm from 9.3 to 9.4 in /value
  • 40284c7 Bump styfle/cancel-workflow-action from 0.10.0 to 0.10.1
  • bd69264 Bump kotlin.version from 1.7.10 to 1.7.20 in /value
  • c120217 Move the toBuilder and autoToBuilder from Foo.Builder to the Foo.
  • 14413dc Bump maven-jar-plugin from 3.2.2 to 3.3.0 in /factory
  • 7504e92 Bump maven-jar-plugin from 3.2.2 to 3.3.0 in /value
  • 35f9474 Bump maven-jar-plugin from 3.2.2 to 3.3.0 in /service
  • 182dff1 Bump maven-jar-plugin from 3.2.2 to 3.3.0 in /common
  • aebf49b Bump gradle-test-kit from 7.5 to 7.5.1 in /value
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.9&new-version=1.10)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #338 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/338 from google:dependabot/maven/com.google.auto.value-auto-value-1.10 f8bec9abdaa7cbfb4efe2a8dea18794bd57cc221 PiperOrigin-RevId: 479582939 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b3e70cb..0f24ede8 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.auto.value auto-value - 1.9 + 1.10 com.google.auto From 1148d31f3178988e8ff2e31946b71fbb126912ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:48:03 -0700 Subject: [PATCH 162/300] Bump error_prone_annotations from 2.15.0 to 2.16 Bumps [error_prone_annotations](https://github.com/google/error-prone) from 2.15.0 to 2.16.
Release notes

Sourced from error_prone_annotations's releases.

Error Prone 2.16.0

New Checkers:

Fixed issues: #2622,#2623,#2624,#2631,#2632,#2635,#2636,#2637,#2640,#2641,#2642,#2643,#2645,#2648,#2650,#2651,#2653,#2654,#2655,#2656,#2658,#2659,#2660,#2661,#2662,#2953,#3044,#3220,#3225,#3243,#3267,#3365,#3441

Full Changelog: https://github.com/google/error-prone/compare/v2.15.0...v2.16.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.15.0&new-version=2.16)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #339 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/339 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.16 e697fbbbcc988ad5ee3d09588f97ba6b5e8cdbd4 PiperOrigin-RevId: 480664331 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f24ede8..82e21781 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.15.0 + 2.16 provided From ea22b1df214c0cb961060dc869f6ce78e5a80213 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 06:43:00 -0700 Subject: [PATCH 163/300] Bump styfle/cancel-workflow-action from 0.10.1 to 0.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.10.1 to 0.11.0.
Release notes

Sourced from styfle/cancel-workflow-action's releases.

0.11.0

Minor Changes

  • Update to Node 16: #186
  • Chore: rebuild: 1e0e690cd3756927cda56ad0033137ff1268c477
  • Chore(deps-dev): bump typescript from 4.8.3 to 4.8.4: #181
  • Chore(deps): bump @​actions/github from 5.1.0 to 5.1.1: #182
  • Chore(deps): bump @​actions/core from 1.9.1 to 1.10.0: #183

Credits

Huge thanks to @​mattjohnsonpint for helping!

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=styfle/cancel-workflow-action&package-manager=github_actions&previous-version=0.10.1&new-version=0.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #340 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/340 from google:dependabot/github_actions/styfle/cancel-workflow-action-0.11.0 00960781131635925e7638c00b38c4a40d73e1f6 PiperOrigin-RevId: 480878845 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8f956ff..ea05645b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: # Cancel any previous runs for the same branch that are still running. - name: 'Cancel previous runs' - uses: styfle/cancel-workflow-action@0.10.1 + uses: styfle/cancel-workflow-action@0.11.0 with: access_token: ${{ github.token }} - name: 'Check out repository' From 75b95ed9d84d67e397b8e3bb7de2231ad0947ba1 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Thu, 1 Dec 2022 08:14:28 -0800 Subject: [PATCH 164/300] Name our release profile `sonatype-oss-release` instead of `release`. This matches what we do for most of our other projects. (Compile-Testing seems to be the only project that uses a particular feature, ``, so I'm kind of just guessing that I need to update the value there to match.) Motivation: I had trouble releasing 0.20 in part because I was trying to use `-P sonatype-oss-release`. I eventually succeeded by setting _both_ that _and_ `-P release`, but it would be nice not to need that next time. The specific problem appeared to be at least partially about getting an ancient "default" version of `maven-gpg-plugin` instead of the version specified inside the release profile. (And then I had an additional issue from possibly losing my `.m2/settings.xml` when I got a new machine....) Hopefully this new fix is correct, though I guess I'll have to carefully start but not finish a release to be sure. RELNOTES=n/a PiperOrigin-RevId: 492199969 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 82e21781..3e2fa981 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ maven-release-plugin 2.5.3 - release + sonatype-oss-release deploy @@ -174,7 +174,7 @@ - release + sonatype-oss-release false From cd5e8a96a5210e29a425c39bed5fb659c3388fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89amonn=20McManus?= Date: Thu, 1 Dec 2022 17:06:28 -0800 Subject: [PATCH 165/300] Adjust configuration and documents to reflect the renamed main branch. RELNOTES=n/a PiperOrigin-RevId: 492336825 --- .github/workflows/ci.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea05645b..b9291b5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: CI on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: test: diff --git a/README.md b/README.md index b604a819..a7fa2b74 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ License See the License for the specific language governing permissions and limitations under the License. -[ci-shield]: https://github.com/google/compile-testing/actions/workflows/ci.yml/badge.svg?branch=master +[ci-shield]: https://github.com/google/compile-testing/actions/workflows/ci.yml/badge.svg?branch=main [ci-link]: https://github.com/google/compile-testing/actions [maven-shield]: https://img.shields.io/maven-central/v/com.google.testing.compile/compile-testing.png [maven-link]: https://search.maven.org/artifact/com.google.testing.compile/compile-testing From 9a592f77821adecf10a16a7a4cdd2f071ddcf136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89amonn=20McManus?= Date: Mon, 12 Dec 2022 11:19:59 -0800 Subject: [PATCH 166/300] Use reflection to implement `TreeDiffer.DiffVisitor`. This is much more robust than overriding individual visitor methods. It means we won't forget to check some property of an AST node, and it also means we automatically handle new kinds of nodes. Using reflection does make this potentially more expensive than having individual visitor methods. The overhead is likely to be small compared to the cost of compiling source code to produce the ASTs in the first place. Fixes https://github.com/google/compile-testing/issues/303. PiperOrigin-RevId: 494778353 --- .../google/testing/compile/TreeDiffer.java | 892 +++--------------- .../testing/compile/TreeDifferTest.java | 111 ++- 2 files changed, 233 insertions(+), 770 deletions(-) diff --git a/src/main/java/com/google/testing/compile/TreeDiffer.java b/src/main/java/com/google/testing/compile/TreeDiffer.java index 726abccb..87344c22 100644 --- a/src/main/java/com/google/testing/compile/TreeDiffer.java +++ b/src/main/java/com/google/testing/compile/TreeDiffer.java @@ -23,70 +23,33 @@ import com.google.auto.common.MoreTypes; import com.google.auto.value.AutoValue; +import com.google.common.base.CaseFormat; import com.google.common.base.Equivalence; import com.google.common.base.Joiner; -import com.google.common.base.Objects; +import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.errorprone.annotations.FormatMethod; -import com.sun.source.tree.AnnotationTree; -import com.sun.source.tree.ArrayAccessTree; -import com.sun.source.tree.ArrayTypeTree; -import com.sun.source.tree.AssertTree; -import com.sun.source.tree.AssignmentTree; -import com.sun.source.tree.BinaryTree; -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.BreakTree; -import com.sun.source.tree.CaseTree; -import com.sun.source.tree.CatchTree; import com.sun.source.tree.ClassTree; import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.CompoundAssignmentTree; -import com.sun.source.tree.ConditionalExpressionTree; -import com.sun.source.tree.ContinueTree; -import com.sun.source.tree.DoWhileLoopTree; -import com.sun.source.tree.EmptyStatementTree; -import com.sun.source.tree.EnhancedForLoopTree; -import com.sun.source.tree.ErroneousTree; -import com.sun.source.tree.ExpressionStatementTree; -import com.sun.source.tree.ForLoopTree; import com.sun.source.tree.IdentifierTree; -import com.sun.source.tree.IfTree; import com.sun.source.tree.ImportTree; -import com.sun.source.tree.InstanceOfTree; -import com.sun.source.tree.LabeledStatementTree; -import com.sun.source.tree.LambdaExpressionTree; -import com.sun.source.tree.LiteralTree; -import com.sun.source.tree.MemberReferenceTree; +import com.sun.source.tree.LineMap; import com.sun.source.tree.MemberSelectTree; -import com.sun.source.tree.MethodInvocationTree; import com.sun.source.tree.MethodTree; -import com.sun.source.tree.ModifiersTree; -import com.sun.source.tree.NewArrayTree; -import com.sun.source.tree.NewClassTree; -import com.sun.source.tree.ParameterizedTypeTree; -import com.sun.source.tree.ParenthesizedTree; -import com.sun.source.tree.PrimitiveTypeTree; -import com.sun.source.tree.ReturnTree; -import com.sun.source.tree.SwitchTree; -import com.sun.source.tree.SynchronizedTree; -import com.sun.source.tree.ThrowTree; import com.sun.source.tree.Tree; -import com.sun.source.tree.Tree.Kind; import com.sun.source.tree.TreeVisitor; -import com.sun.source.tree.TryTree; -import com.sun.source.tree.TypeCastTree; -import com.sun.source.tree.TypeParameterTree; -import com.sun.source.tree.UnaryTree; import com.sun.source.tree.VariableTree; -import com.sun.source.tree.WhileLoopTree; -import com.sun.source.tree.WildcardTree; import com.sun.source.util.SimpleTreeVisitor; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.WildcardType; import java.util.HashSet; import java.util.Iterator; -import java.util.Optional; +import java.util.Objects; import java.util.Set; import javax.lang.model.element.Name; import javax.lang.model.type.TypeMirror; @@ -200,17 +163,15 @@ public void addTypeMismatch(Tree expected, Tree actual) { } /** - * Adds a {@code TwoWayDiff} if the predicate given evaluates to false. The {@code TwoWayDiff} - * is parameterized by the {@code Tree}s and message format provided. + * Adds a {@code TwoWayDiff} that is parameterized by the {@code Tree}s and message format + * provided. */ @FormatMethod - private void checkForDiff(boolean p, String message, Object... formatArgs) { - if (!p) { - diffBuilder.addDifferingNodes( - requireNonNull(expectedPath), - requireNonNull(actualPath), - String.format(message, formatArgs)); - } + private void reportDiff(String message, Object... formatArgs) { + diffBuilder.addDifferingNodes( + requireNonNull(expectedPath), + requireNonNull(actualPath), + String.format(message, formatArgs)); } private TreePath actualPathPlus(Tree actual) { @@ -279,719 +240,162 @@ private void parallelScan( } } + /** + * {@inheritDoc} + * + *

The exact set of {@code visitFoo} methods depends on the compiler version. For example, if + * the compiler is for a version of the language that has the {@code yield} statement, then + * there will be a {@code visitYield(YieldTree)}. But if it's for an earlier version, then not + * only will there not be that method, there will also not be a {@code YieldTree} type at all. + * That means it is impossible for this class to have a complete set of visit methods and also + * compile on earlier versions. + * + *

Instead, we override {@link SimpleTreeVisitor#defaultAction} and inspect the visited tree + * with reflection. We can use {@link Tree.Kind#getInterface()} to get the specific interface, + * such as {@code YieldTree}, and within that interface we just look for {@code getFoo()} + * methods. The {@code actual} tree must have the same {@link Tree.Kind} and then we can compare + * the results of calling the corresponding {@code getFoo()} methods on both trees. The + * comparison depends on the return type of the method: + * + *

    + *
  • For a method returning {@link Tree} or a subtype, we call {@link #scan(Tree, Tree)}, + * which will visit the subtrees recursively. + *
  • For a method returning a type that is assignable to {@code Iterable}, + * we call {@link #parallelScan(Iterable, Iterable)}. + *
  • For a method returning {@link Name}, we compare with {@link Name#contentEquals}. + *
  • Otherwise we just compare with {@link Objects#equals(Object, Object)}. + *
  • Methods returning certain types are ignored: {@link LineMap}, because we don't care if + * the line numbers don't match between the two trees; {@link JavaFileObject}, because the + * value for two distinct trees will never compare equal. + *
+ * + *

This technique depends on the specific way the tree interfaces are defined. In practice it + * works well. Besides solving the {@code YieldTree} issue, it also ensures we don't overlook + * properties of any given tree type, include properties that may be added in later versions. + * For example, in versions that have sealed interfaces, the {@code permits} clause is + * represented by a method {@code ClassTree.getPermitsClause()}. Earlier versions obviously + * don't have that method. + */ @Override - public @Nullable Void visitAnnotation(AnnotationTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getAnnotationType(), other.get().getAnnotationType()); - parallelScan(expected.getArguments(), other.get().getArguments()); - return null; - } - - @Override - public @Nullable Void visitMethodInvocation(MethodInvocationTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - parallelScan(expected.getTypeArguments(), other.get().getTypeArguments()); - scan(expected.getMethodSelect(), other.get().getMethodSelect()); - parallelScan(expected.getArguments(), other.get().getArguments()); - return null; - } - - @Override - public @Nullable Void visitLambdaExpression(LambdaExpressionTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - parallelScan(expected.getParameters(), other.get().getParameters()); - scan(expected.getBody(), other.get().getBody()); - return null; - } - - @Override - public @Nullable Void visitMemberReference(MemberReferenceTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getQualifierExpression(), other.get().getQualifierExpression()); - parallelScan(expected.getTypeArguments(), other.get().getTypeArguments()); - checkForDiff(expected.getName().contentEquals(other.get().getName()), - "Expected identifier to be <%s> but was <%s>.", - expected.getName(), other.get().getName()); - return null; - } - - @Override - public @Nullable Void visitAssert(AssertTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getCondition(), other.get().getCondition()); - scan(expected.getDetail(), other.get().getDetail()); - return null; - } - - @Override - public @Nullable Void visitAssignment(AssignmentTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getVariable(), other.get().getVariable()); - scan(expected.getExpression(), other.get().getExpression()); - return null; - } - - @Override - public @Nullable Void visitCompoundAssignment(CompoundAssignmentTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getVariable(), other.get().getVariable()); - scan(expected.getExpression(), other.get().getExpression()); - return null; - } - - @Override - public @Nullable Void visitBinary(BinaryTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getLeftOperand(), other.get().getLeftOperand()); - scan(expected.getRightOperand(), other.get().getRightOperand()); - return null; - } - - @Override - public @Nullable Void visitBlock(BlockTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(expected.isStatic() == other.get().isStatic(), - "Expected block to be <%s> but was <%s>.", expected.isStatic() ? "static" : "non-static", - other.get().isStatic() ? "static" : "non-static"); - - parallelScan(expected.getStatements(), other.get().getStatements()); - return null; - } - - @Override - public @Nullable Void visitBreak(BreakTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(namesEqual(expected.getLabel(), other.get().getLabel()), - "Expected label on break statement to be <%s> but was <%s>.", - expected.getLabel(), other.get().getLabel()); - return null; - } - - @Override - public @Nullable Void visitCase(CaseTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getExpression(), other.get().getExpression()); - parallelScan(expected.getStatements(), other.get().getStatements()); - return null; - } - - @Override - public @Nullable Void visitCatch(CatchTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getParameter(), other.get().getParameter()); - scan(expected.getBlock(), other.get().getBlock()); - return null; - } - - @Override - public @Nullable Void visitClass(ClassTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(expected.getSimpleName().contentEquals(other.get().getSimpleName()), - "Expected name of type to be <%s> but was <%s>.", - expected.getSimpleName(), other.get().getSimpleName()); - - scan(expected.getModifiers(), other.get().getModifiers()); - parallelScan(expected.getTypeParameters(), other.get().getTypeParameters()); - scan(expected.getExtendsClause(), other.get().getExtendsClause()); - parallelScan(expected.getImplementsClause(), other.get().getImplementsClause()); - parallelScan( - expected.getMembers(), - filter.filterActualMembers( - ImmutableList.copyOf(expected.getMembers()), - ImmutableList.copyOf(other.get().getMembers()))); - return null; - } - - @Override - public @Nullable Void visitConditionalExpression( - ConditionalExpressionTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getCondition(), other.get().getCondition()); - scan(expected.getTrueExpression(), other.get().getTrueExpression()); - scan(expected.getFalseExpression(), other.get().getFalseExpression()); - return null; - } - - @Override - public @Nullable Void visitContinue(ContinueTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(namesEqual(expected.getLabel(), other.get().getLabel()), - "Expected label on continue statement to be <%s> but was <%s>.", - expected.getLabel(), other.get().getLabel()); - return null; - } - - @Override - public @Nullable Void visitDoWhileLoop(DoWhileLoopTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getCondition(), other.get().getCondition()); - scan(expected.getStatement(), other.get().getStatement()); - return null; - } - - @Override - public @Nullable Void visitErroneous(ErroneousTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - parallelScan(expected.getErrorTrees(), other.get().getErrorTrees()); - return null; - } - - @Override - public @Nullable Void visitExpressionStatement(ExpressionStatementTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getExpression(), other.get().getExpression()); - return null; - } - - @Override - public @Nullable Void visitEnhancedForLoop(EnhancedForLoopTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getVariable(), other.get().getVariable()); - scan(expected.getExpression(), other.get().getExpression()); - scan(expected.getStatement(), other.get().getStatement()); - return null; - } - - @Override - public @Nullable Void visitForLoop(ForLoopTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - parallelScan(expected.getInitializer(), other.get().getInitializer()); - scan(expected.getCondition(), other.get().getCondition()); - parallelScan(expected.getUpdate(), other.get().getUpdate()); - scan(expected.getStatement(), other.get().getStatement()); - return null; - } - - @Override - public @Nullable Void visitIdentifier(IdentifierTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(expected.getName().contentEquals(other.get().getName()), - "Expected identifier to be <%s> but was <%s>.", - expected.getName(), other.get().getName()); - return null; - } - - @Override - public @Nullable Void visitIf(IfTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getCondition(), other.get().getCondition()); - scan(expected.getThenStatement(), other.get().getThenStatement()); - scan(expected.getElseStatement(), other.get().getElseStatement()); - return null; - } - - @Override - public @Nullable Void visitImport(ImportTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(expected.isStatic() == other.get().isStatic(), - "Expected import to be <%s> but was <%s>.", - expected.isStatic() ? "static" : "non-static", - other.get().isStatic() ? "static" : "non-static"); - - scan(expected.getQualifiedIdentifier(), other.get().getQualifiedIdentifier()); - return null; - } - - @Override - public @Nullable Void visitArrayAccess(ArrayAccessTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getExpression(), other.get().getExpression()); - scan(expected.getIndex(), other.get().getIndex()); - return null; - } - - @Override - public @Nullable Void visitLabeledStatement(LabeledStatementTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(expected.getLabel().contentEquals(other.get().getLabel()), - "Expected statement label to be <%s> but was <%s>.", - expected.getLabel(), other.get().getLabel()); - - scan(expected.getStatement(), other.get().getStatement()); - return null; - } - - @Override - public @Nullable Void visitLiteral(LiteralTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(Objects.equal(expected.getValue(), other.get().getValue()), - "Expected literal value to be <%s> but was <%s>.", - expected.getValue(), other.get().getValue()); - return null; - } - - @Override - public @Nullable Void visitMethod(MethodTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(expected.getName().contentEquals(other.get().getName()), - "Expected method name to be <%s> but was <%s>.", - expected.getName(), other.get().getName()); - - scan(expected.getModifiers(), other.get().getModifiers()); - scan(expected.getReturnType(), other.get().getReturnType()); - parallelScan(expected.getTypeParameters(), other.get().getTypeParameters()); - parallelScan(expected.getParameters(), other.get().getParameters()); - parallelScan(expected.getThrows(), other.get().getThrows()); - scan(expected.getBody(), other.get().getBody()); - scan(expected.getDefaultValue(), other.get().getDefaultValue()); - return null; - } - - @Override - public @Nullable Void visitModifiers(ModifiersTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(expected.getFlags().equals(other.get().getFlags()), - "Expected modifier set to be <%s> but was <%s>.", - expected.getFlags(), other.get().getFlags()); - - parallelScan(expected.getAnnotations(), other.get().getAnnotations()); - return null; - } - - @Override - public @Nullable Void visitNewArray(NewArrayTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getType(), other.get().getType()); - parallelScan(expected.getDimensions(), other.get().getDimensions()); - parallelScan(expected.getInitializers(), other.get().getInitializers()); - return null; - } - - @Override - public @Nullable Void visitNewClass(NewClassTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getEnclosingExpression(), other.get().getEnclosingExpression()); - parallelScan(expected.getTypeArguments(), other.get().getTypeArguments()); - scan(expected.getIdentifier(), other.get().getIdentifier()); - parallelScan(expected.getArguments(), other.get().getArguments()); - scan(expected.getClassBody(), other.get().getClassBody()); - return null; - } - - @Override - public @Nullable Void visitParenthesized(ParenthesizedTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getExpression(), other.get().getExpression()); - return null; - } - - @Override - public @Nullable Void visitReturn(ReturnTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getExpression(), other.get().getExpression()); - return null; - } - - @Override - public @Nullable Void visitMemberSelect(MemberSelectTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - checkForDiff(expected.getIdentifier().contentEquals(other.get().getIdentifier()), - "Expected member identifier to be <%s> but was <%s>.", - expected.getIdentifier(), other.get().getIdentifier()); - - scan(expected.getExpression(), other.get().getExpression()); - return null; - } - - @Override - public @Nullable Void visitEmptyStatement(EmptyStatementTree expected, Tree actual) { - if (!checkTypeAndCast(expected, actual).isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - return null; - } - - @Override - public @Nullable Void visitSwitch(SwitchTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getExpression(), other.get().getExpression()); - parallelScan(expected.getCases(), other.get().getCases()); - return null; - } - - @Override - public @Nullable Void visitSynchronized(SynchronizedTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getExpression(), other.get().getExpression()); - scan(expected.getBlock(), other.get().getBlock()); - return null; - } - - @Override - public @Nullable Void visitThrow(ThrowTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getExpression(), other.get().getExpression()); - return null; - } - - @Override - public @Nullable Void visitCompilationUnit(CompilationUnitTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - parallelScan(expected.getPackageAnnotations(), other.get().getPackageAnnotations()); - scan(expected.getPackageName(), other.get().getPackageName()); - parallelScan( - expected.getImports(), - filter.filterImports( - ImmutableList.copyOf(expected.getImports()), - ImmutableList.copyOf(other.get().getImports()))); - parallelScan(expected.getTypeDecls(), other.get().getTypeDecls()); - return null; - } - - @Override - public @Nullable Void visitTry(TryTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - parallelScan(expected.getResources(), other.get().getResources()); - scan(expected.getBlock(), other.get().getBlock()); - parallelScan(expected.getCatches(), other.get().getCatches()); - scan(expected.getFinallyBlock(), other.get().getFinallyBlock()); - return null; - } - - @Override - public @Nullable Void visitParameterizedType(ParameterizedTypeTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getType(), other.get().getType()); - parallelScan(expected.getTypeArguments(), other.get().getTypeArguments()); - return null; - } - - @Override - public @Nullable Void visitArrayType(ArrayTypeTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getType(), other.get().getType()); - return null; - } - - @Override - public @Nullable Void visitTypeCast(TypeCastTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; - } - - scan(expected.getType(), other.get().getType()); - scan(expected.getExpression(), other.get().getExpression()); - return null; - } - - @Override - public @Nullable Void visitPrimitiveType(PrimitiveTypeTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { + public @Nullable Void defaultAction(Tree expected, Tree actual) { + if (expected.getKind() != actual.getKind()) { addTypeMismatch(expected, actual); return null; } - - checkForDiff(expected.getPrimitiveTypeKind() == other.get().getPrimitiveTypeKind(), - "Expected primitive type kind to be <%s> but was <%s>.", - expected.getPrimitiveTypeKind(), other.get().getPrimitiveTypeKind()); - return null; - } - - @Override - public @Nullable Void visitTypeParameter(TypeParameterTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; + Class treeInterface = expected.getKind().asInterface(); + for (Method method : treeInterface.getMethods()) { + if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) { + Object expectedValue; + Object actualValue; + try { + expectedValue = method.invoke(expected); + actualValue = method.invoke(actual); + } catch (ReflectiveOperationException e) { + throw new VerifyException(e); + } + defaultCompare(method, expected.getKind(), expectedValue, actualValue); + } } - - checkForDiff(expected.getName().contentEquals(other.get().getName()), - "Expected type parameter name to be <%s> but was <%s>.", - expected.getName(), other.get().getName()); - - parallelScan(expected.getBounds(), other.get().getBounds()); return null; } - @Override - public @Nullable Void visitInstanceOf(InstanceOfTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; + private void defaultCompare(Method method, Tree.Kind kind, Object expected, Object actual) { + Type type = method.getGenericReturnType(); + if (isIterableOfTree(type)) { + @SuppressWarnings("unchecked") + Iterable expectedList = (Iterable) expected; + @SuppressWarnings("unchecked") + Iterable actualList = (Iterable) actual; + actualList = filterActual(method, kind, expectedList, actualList); + parallelScan(expectedList, actualList); + } else if (type instanceof Class && Tree.class.isAssignableFrom((Class) type)) { + scan((Tree) expected, (Tree) actual); + } else if (expected instanceof LineMap && actual instanceof LineMap) { + return; // we don't require lines to match exactly + } else if (expected instanceof JavaFileObject && actual instanceof JavaFileObject) { + return; // these will never be equal unless the inputs are identical + } else { + boolean eq = + (expected instanceof Name) + ? namesEqual((Name) expected, (Name) actual) + : Objects.equals(expected, actual); + if (!eq) { + // If MemberSelectTree.getIdentifier() doesn't match, we will say + // "Expected member-select identifier to be but was ." + String treeKind = + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, kind.name()); + String property = + CaseFormat.UPPER_CAMEL + .to(CaseFormat.LOWER_UNDERSCORE, method.getName().substring("get".length())) + .replace('_', ' '); + reportDiff( + "Expected %s %s to be <%s> but was <%s>.", + treeKind, + property, + expected, + actual); + } } - - scan(expected.getExpression(), other.get().getExpression()); - scan(expected.getType(), other.get().getType()); - return null; } - @Override - public @Nullable Void visitUnary(UnaryTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; + /** + * Applies {@link #filter} to the list of subtrees from the actual tree. If it is a + * {@code CompilationUnitTree} then we filter its imports. If it is a {@code ClassTree} then we + * filter its members. + */ + private Iterable filterActual( + Method method, + Tree.Kind kind, + Iterable expected, + Iterable actual) { + switch (kind) { + case COMPILATION_UNIT: + if (method.getName().equals("getImports")) { + @SuppressWarnings("unchecked") + Iterable expectedImports = (Iterable) expected; + @SuppressWarnings("unchecked") + Iterable actualImports = (Iterable) actual; + return filter.filterImports( + ImmutableList.copyOf(expectedImports), ImmutableList.copyOf(actualImports)); + } + break; + case CLASS: + if (method.getName().equals("getMembers")) { + return filter.filterActualMembers( + ImmutableList.copyOf(expected), ImmutableList.copyOf(actual)); + } + break; + default: } - - scan(expected.getExpression(), other.get().getExpression()); - return null; + return actual; } - @Override - public @Nullable Void visitVariable(VariableTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; + private static boolean isIterableOfTree(Type type) { + if (!(type instanceof ParameterizedType)) { + return false; } - - checkForDiff(expected.getName().contentEquals(other.get().getName()), - "Expected variable name to be <%s> but was <%s>.", - expected.getName(), other.get().getName()); - - scan(expected.getModifiers(), other.get().getModifiers()); - scan(expected.getType(), other.get().getType()); - scan(expected.getInitializer(), other.get().getInitializer()); - return null; - } - - @Override - public @Nullable Void visitWhileLoop(WhileLoopTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; + ParameterizedType parameterizedType = (ParameterizedType) type; + if (!Iterable.class.isAssignableFrom((Class) parameterizedType.getRawType()) + || parameterizedType.getActualTypeArguments().length != 1) { + return false; } - - scan(expected.getCondition(), other.get().getCondition()); - scan(expected.getStatement(), other.get().getStatement()); - return null; - } - - @Override - public @Nullable Void visitWildcard(WildcardTree expected, Tree actual) { - Optional other = checkTypeAndCast(expected, actual); - if (!other.isPresent()) { - addTypeMismatch(expected, actual); - return null; + Type argType = parameterizedType.getActualTypeArguments()[0]; + if (argType instanceof Class) { + return Tree.class.isAssignableFrom((Class) argType); + } else if (argType instanceof WildcardType) { + WildcardType wildcardType = (WildcardType) argType; + return wildcardType.getUpperBounds().length == 1 + && wildcardType.getUpperBounds()[0] instanceof Class + && Tree.class.isAssignableFrom((Class) wildcardType.getUpperBounds()[0]); + } else { + return false; } - - scan(expected.getBound(), other.get().getBound()); - return null; } @Override public @Nullable Void visitOther(Tree expected, Tree actual) { throw new UnsupportedOperationException("cannot compare unknown trees"); } - - // TODO(dpb,ronshapiro): rename this method and document which one is cast - private Optional checkTypeAndCast(T expected, Tree actual) { - Kind expectedKind = checkNotNull(expected).getKind(); - Kind treeKind = checkNotNull(actual).getKind(); - if (expectedKind == treeKind) { - @SuppressWarnings("unchecked") // checked by Kind - T treeAsExpectedType = (T) actual; - return Optional.of(treeAsExpectedType); - } else { - return Optional.empty(); - } - } } /** Strategy for determining which {link Tree}s should be diffed in {@link DiffVisitor}. */ diff --git a/src/test/java/com/google/testing/compile/TreeDifferTest.java b/src/test/java/com/google/testing/compile/TreeDifferTest.java index 47ce4f0e..cd77317f 100644 --- a/src/test/java/com/google/testing/compile/TreeDifferTest.java +++ b/src/test/java/com/google/testing/compile/TreeDifferTest.java @@ -15,6 +15,7 @@ */ package com.google.testing.compile; +import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Truth.assertThat; @@ -24,18 +25,15 @@ import com.sun.source.tree.Tree; import com.sun.source.util.TreePath; import java.util.Objects; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; /** - * A test for {@link DetailedEqualityScanner} + * A test for {@link TreeDiffer}. */ @RunWith(JUnit4.class) public class TreeDifferTest { - @Rule public final ExpectedException expectedExn = ExpectedException.none(); private static final CompilationUnitTree EXPECTED_TREE = MoreTrees.parseLinesToTree("package test;", "import java.util.Set;", @@ -171,6 +169,49 @@ public class TreeDifferTest { " }", "}"); + private static final ImmutableList ANNOTATED_TYPE_SOURCE = + ImmutableList.of( + "package test;", + "", + "import java.lang.annotation.*;", + "import java.util.List;", + "", + "@Target(ElementType.TYPE_USE)", + "@interface Nullable {}", + "", + "interface NullableStringList extends List<@Nullable String> {}"); + + private static final CompilationUnitTree ANNOTATED_TYPE_1 = + MoreTrees.parseLinesToTree(ANNOTATED_TYPE_SOURCE); + + private static final CompilationUnitTree ANNOTATED_TYPE_2 = + MoreTrees.parseLinesToTree( + ANNOTATED_TYPE_SOURCE.stream() + .map(s -> s.replace("@Nullable ", "")) + .collect(toImmutableList())); + + private static final ImmutableList MULTICATCH_SOURCE = + ImmutableList.of( + "package test;", + "", + "class TestClass {", + " void f() {", + " try {", + " System.gc();", + " } catch (IllegalArgumentException | NullPointerException e) {", + " }", + " }", + "}"); + + private static final CompilationUnitTree MULTICATCH_1 = + MoreTrees.parseLinesToTree(MULTICATCH_SOURCE); + + private static final CompilationUnitTree MULTICATCH_2 = + MoreTrees.parseLinesToTree( + MULTICATCH_SOURCE.stream() + .map(s -> s.replace("IllegalArgumentException", "IllegalStateException")) + .collect(toImmutableList())); + @Test public void scan_differingCompilationUnits() { TreeDifference diff = TreeDiffer.diffCompilationUnits(EXPECTED_TREE, ACTUAL_TREE); @@ -182,15 +223,15 @@ public void scan_differingCompilationUnits() { ImmutableList differingNodesExpected = ImmutableList.of( new SimplifiedDiff(Tree.Kind.MEMBER_SELECT, - "Expected member identifier to be but was ."), + "Expected member-select identifier to be but was ."), new SimplifiedDiff(Tree.Kind.VARIABLE, "Expected variable name to be but was ."), new SimplifiedDiff(Tree.Kind.IDENTIFIER, - "Expected identifier to be but was ."), + "Expected identifier name to be but was ."), new SimplifiedDiff(Tree.Kind.IDENTIFIER, - "Expected identifier to be but was ."), + "Expected identifier name to be but was ."), new SimplifiedDiff(Tree.Kind.BREAK, - "Expected label on break statement to be but was .")); + "Expected break label to be but was .")); assertThat(diff.getExtraExpectedNodes().isEmpty()).isTrue(); assertThat(diff.getExtraActualNodes().size()).isEqualTo(extraNodesExpected.size()); @@ -205,9 +246,7 @@ public void scan_differingCompilationUnits() { for (TreeDifference.TwoWayDiff differingNode : diff.getDifferingNodes()) { differingNodesFound.add(SimplifiedDiff.create(differingNode)); } - assertThat(differingNodesFound.build()) - .containsExactlyElementsIn(differingNodesExpected) - .inOrder(); + assertThat(differingNodesFound.build()).containsExactlyElementsIn(differingNodesExpected); } @Test @@ -246,7 +285,7 @@ public void scan_testTwoNullIterableTrees() { assertThat(diff.isEmpty()).isFalse(); for (TreeDifference.TwoWayDiff differingNode : diff.getDifferingNodes()) { assertThat(differingNode.getDetails()) - .contains("Expected literal value to be <3> but was <4>"); + .contains("Expected int-literal value to be <3> but was <4>"); } } @@ -268,7 +307,7 @@ public void scan_testActualNullIterableTree() { public void scan_testLambdas() { TreeDifference diff = TreeDiffer.diffCompilationUnits(LAMBDA_1, LAMBDA_2); - assertThat(diff.isEmpty()).isTrue(); + assertThat(diff.getDiffReport()).isEmpty(); } @Test @@ -283,7 +322,7 @@ public void scan_testLambdasParensVsNone() { TreeDifference diff = TreeDiffer.diffCompilationUnits( LAMBDA_IMPLICIT_ARG_TYPE, LAMBDA_IMPLICIT_ARG_TYPE_NO_PARENS); - assertThat(diff.isEmpty()).isTrue(); + assertThat(diff.getDiffReport()).isEmpty(); } @Test @@ -304,7 +343,7 @@ public void scan_testLambdaVersusAnonymousClass() { public void scan_testTryWithResources() { TreeDifference diff = TreeDiffer.diffCompilationUnits(TRY_WITH_RESOURCES_1, TRY_WITH_RESOURCES_1); - assertThat(diff.isEmpty()).isTrue(); + assertThat(diff.getDiffReport()).isEmpty(); } @Test @@ -314,6 +353,34 @@ public void scan_testTryWithResourcesDifferent() { assertThat(diff.isEmpty()).isFalse(); } + @Test + public void scan_testAnnotatedType() { + TreeDifference diff = + TreeDiffer.diffCompilationUnits(ANNOTATED_TYPE_1, ANNOTATED_TYPE_1); + assertThat(diff.getDiffReport()).isEmpty(); + } + + @Test + public void scan_testAnnotatedTypeDifferent() { + TreeDifference diff = + TreeDiffer.diffCompilationUnits(ANNOTATED_TYPE_1, ANNOTATED_TYPE_2); + assertThat(diff.isEmpty()).isFalse(); + } + + @Test + public void scan_testMulticatch() { + TreeDifference diff = + TreeDiffer.diffCompilationUnits(MULTICATCH_1, MULTICATCH_1); + assertThat(diff.getDiffReport()).isEmpty(); + } + + @Test + public void scan_testMulticatchDifferent() { + TreeDifference diff = + TreeDiffer.diffCompilationUnits(MULTICATCH_1, MULTICATCH_2); + assertThat(diff.isEmpty()).isFalse(); + } + @Test public void matchCompilationUnits() { ParseResult actual = @@ -373,7 +440,7 @@ public void matchCompilationUnits() { getOnlyElement(actual.compilationUnits()), actual.trees()); - assertThat(diff.isEmpty()).isTrue(); + assertThat(diff.getDiffReport()).isEmpty(); } @Test @@ -402,7 +469,7 @@ public void matchCompilationUnits_unresolvedTypeInPattern() { getOnlyElement(actual.compilationUnits()), actual.trees()); - assertThat(diff.isEmpty()).isTrue(); + assertThat(diff.getDiffReport()).isEmpty(); } @Test @@ -710,7 +777,7 @@ public void matchCompilationUnits_skipsImports() { getOnlyElement(actual.compilationUnits()), actual.trees()); - assertThat(diff.isEmpty()).isTrue(); + assertThat(diff.getDiffReport()).isEmpty(); } private TreePath asPath(CompilationUnitTree compilationUnit) { @@ -734,14 +801,6 @@ private static class SimplifiedDiff { this.details = details; } - Tree.Kind getKind() { - return kind; - } - - String getDetails() { - return details; - } - static SimplifiedDiff create(TreeDifference.OneWayDiff other) { return new SimplifiedDiff(other.getNodePath().getLeaf().getKind(), other.getDetails()); } From 7d258e7d72007c61539b942612e48865e23df2a0 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 12 Dec 2022 13:03:05 -0800 Subject: [PATCH 167/300] Fix Javadoc generation under JDK11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...by adding `--add-exports` configuration. Javadoc generation is part of the release process but not the CI. (So arguably we should make it—and the rest of the release processs—part of the CI, as Javadoc generation already is for some of our other projects. One thing at a time... :)) (It's possible that this change is an abuse of `additionalJOptions`, as these options are not `-J` options. But I don't see anywhere else to put them. I'm not sure why Error Prone seemingly doesn't have this problem. Could `maven-javadoc-plugin` be automatically picking up the `compilerArgs` from `maven-compiler-plugin`, similar to how it picks up `source` from that plugin (cl/488902996)? And I guess we get away without the `--add-exports` in compile-testing because we set `source` to `8`? But then `maven-javadoc-plugin` _doesn't_ pick up its `source` value in the case of compile-testing because... something?) (This CL results in a spam of "[WARNING] javadoc: warning - The code being documented uses modules but the packages defined in https://docs.oracle.com/javase/8/docs/api/ are in the unnamed module." lines. _One thing at a time_ :)) RELNOTES=n/a PiperOrigin-RevId: 494805776 --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 3e2fa981..804d1270 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,13 @@ maven-javadoc-plugin 3.4.1 + + + --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED + --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + + maven-site-plugin From 2a2f710ec30e1a3552272db827f51765275d3e0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 08:00:57 -0800 Subject: [PATCH 168/300] Bump plexus-java from 1.1.1 to 1.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [plexus-java](https://github.com/codehaus-plexus/plexus-languages) from 1.1.1 to 1.1.2.

Release notes

Sourced from plexus-java's releases.

1.1.2

📦 Dependency updates

📝 Documentation updates

Maintenance

Commits
  • 54827a0 [maven-release-plugin] prepare release plexus-languages-1.1.2
  • 4d28443 (doc) switch scm url to https
  • 26f6fd4 Bump maven-jar-plugin to 3.3.0 to have reproducible builds
  • 6d09c0c Bump maven-shared-resources from 4 to 5
  • ed811be Bump mockito-core from 4.8.1 to 4.11.0
  • 3968d66 Bump asm from 9.3 to 9.4
  • 49b1653 Bump qdox from 2.0.2 to 2.0.3
  • dc7d36a Bump mockito-core from 4.8.0 to 4.8.1
  • 27a90ce Bump mockito-core from 4.7.0 to 4.8.0
  • 831ae30 Bump qdox from 2.0.1 to 2.0.2
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=1.1.1&new-version=1.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #345 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/345 from google:dependabot/maven/org.codehaus.plexus-plexus-java-1.1.2 e20ed1dd12d9086771d1a7ffcedcf9e508f8fe29 PiperOrigin-RevId: 499034328 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 804d1270..18b875ca 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ org.codehaus.plexus plexus-java - 1.1.1 + 1.1.2 From 7fc6bcae431c260abfcfc32d399d23a6bf041e72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 08:00:08 -0800 Subject: [PATCH 169/300] Bump maven-javadoc-plugin from 3.4.1 to 3.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0.
Release notes

Sourced from maven-javadoc-plugin's releases.

3.5.0

Release Notes

📝 Documentation updates

👻 Maintenance

Commits
  • e41f4fd [maven-release-plugin] prepare release maven-javadoc-plugin-3.5.0
  • c56ec0a [MJAVADOC-741] Upgrade plugins and components
  • d02fd90 [MJAVADOC-740] Upgrade Parent to 39
  • 4123315 [MJAVADOC-700] Plugin duplicates classes in Java 8 all-classes lists
  • fabff9c Clean up language and update URLs (#172)
  • a654cc6 Assorted minor FAQ edits (#176)
  • 73557e3 Fixed a typo in AbstractJavadocMojo (#175)
  • 96df545 [MJAVADOC-738] Upgrade commons-text to 1.10.0 (#174)
  • f21b24c update Reproducible Builds badge link
  • 5b61ee9 an --> a (#171)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.4.1&new-version=3.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #347 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/347 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.5.0 c8e40b49a1000eed94ac0ce6a95c094c365c51b2 PiperOrigin-RevId: 510144229 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 18b875ca..34d8c344 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ maven-javadoc-plugin - 3.4.1 + 3.5.0 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -213,7 +213,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 attach-docs From fcc335db80c92a04ee2f72355de19676f168b45f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 08:13:06 -0800 Subject: [PATCH 170/300] Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0.
Commits
  • eeda628 [maven-release-plugin] prepare release maven-compiler-plugin-3.11.0
  • 82b799f [MCOMPILER-527] Upgrade plexus-java to 1.1.2 (#177)
  • f9c2350 [MCOMPILER-526] Fix IT (#178)
  • 4022bd0 [MCOMPILER-494] - Add a useModulePath switch to the testCompile mojo (#119)
  • f4a8a54 [MCOMPILER-525] Incorrect detection of dependency change (#172)
  • 86b9f59 [MCOMPILER-395] Allow dependency exclusions for 'annotationProcessorPaths' (#...
  • e304ceb [MCOMPILER-526] Ignore reformat commit for git blame
  • f7a4613 [MCOMPILER-526] Reformat
  • cc78aee [MCOMPILER-526] Upgrade to parent 39
  • 3dca82f [MCOMPILER-526] Add packages to please the formatter
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.10.1&new-version=3.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #348 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/348 from google:dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.11.0 757ff0574734a27fd531630804cc1b08f8217680 PiperOrigin-RevId: 512630625 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34d8c344..528049ea 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ maven-compiler-plugin - 3.10.1 + 3.11.0 1.8 1.8 From 90bf17f13b4c7eb5d573bb9943f1231c51da4a33 Mon Sep 17 00:00:00 2001 From: Stefan Haustein Date: Tue, 28 Feb 2023 09:03:54 -0800 Subject: [PATCH 171/300] Update code to prepare for nullness annotations in Truth. In most cases, this means updating Subject subclasses and their assertThat methods to accept null actual values. (They should always accept null so that assertions like "assertThat(foo).isNull()" succeed instead of throwing NullPointerException.) Occasionally, it involves other changes, like writing `isGreaterThan(1L)` instead of `isGreaterThan(1)` to resolve an ambiguity it Kotlin overload resolution. PiperOrigin-RevId: 512949567 --- .../testing/compile/CompilationSubject.java | 23 ++++++++++------ .../compile/CompilationSubjectFactory.java | 4 ++- .../compile/JavaFileObjectSubject.java | 26 ++++++++++++------- .../compile/JavaFileObjectSubjectFactory.java | 4 ++- .../compile/JavaSourceSubjectFactory.java | 6 ++--- .../testing/compile/JavaSourcesSubject.java | 26 ++++++++++++------- .../compile/JavaSourcesSubjectFactory.java | 6 ++--- 7 files changed, 60 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 04a5aba3..d8adad70 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -16,6 +16,7 @@ package com.google.testing.compile; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Predicates.notNull; import static com.google.common.collect.Iterables.size; import static com.google.common.truth.Fact.fact; @@ -73,15 +74,16 @@ public static CompilationSubject assertThat(Compilation actual) { return assertAbout(compilations()).that(actual); } - private final Compilation actual; + private final @Nullable Compilation actual; - CompilationSubject(FailureMetadata failureMetadata, Compilation actual) { + CompilationSubject(FailureMetadata failureMetadata, @Nullable Compilation actual) { super(failureMetadata, actual); this.actual = actual; } /** Asserts that the compilation succeeded. */ public void succeeded() { + Compilation actual = actualNotNull(); if (actual.status().equals(FAILURE)) { failWithoutActual( simpleFact(actual.describeFailureDiagnostics() + actual.describeGeneratedSourceFiles())); @@ -96,11 +98,11 @@ public void succeededWithoutWarnings() { /** Asserts that the compilation failed. */ public void failed() { - if (actual.status().equals(SUCCESS)) { + if (actualNotNull().status().equals(SUCCESS)) { failWithoutActual( simpleFact( "Compilation was expected to fail, but contained no errors.\n\n" - + actual.describeGeneratedSourceFiles())); + + actualNotNull().describeGeneratedSourceFiles())); } } @@ -176,7 +178,7 @@ public DiagnosticInFile hadNoteContainingMatch(Pattern expectedPattern) { private void checkDiagnosticCount( int expectedCount, Diagnostic.Kind kind, Diagnostic.Kind... more) { Iterable> diagnostics = - actual.diagnosticsOfKind(kind, more); + actualNotNull().diagnosticsOfKind(kind, more); int actualCount = size(diagnostics); if (actualCount != expectedCount) { failWithoutActual( @@ -285,7 +287,7 @@ private ImmutableList> findMatchingDiagnost Diagnostic.Kind kind, Diagnostic.Kind... more) { ImmutableList> diagnosticsOfKind = - actual.diagnosticsOfKind(kind, more); + actualNotNull().diagnosticsOfKind(kind, more); ImmutableList> diagnosticsWithMessage = diagnosticsOfKind .stream() @@ -314,7 +316,7 @@ public JavaFileObjectSubject generatedFile( /** Asserts that compilation generated a file at {@code path}. */ @CanIgnoreReturnValue public JavaFileObjectSubject generatedFile(Location location, String path) { - return checkGeneratedFile(actual.generatedFile(location, path), location, path); + return checkGeneratedFile(actualNotNull().generatedFile(location, path), location, path); } /** Asserts that compilation generated a source file for a type with a given qualified name. */ @@ -335,7 +337,7 @@ private JavaFileObjectSubject checkGeneratedFile( ImmutableList.Builder facts = ImmutableList.builder(); facts.add(fact("in location", location.getName())); facts.add(simpleFact("it generated:")); - for (JavaFileObject generated : actual.generatedFiles()) { + for (JavaFileObject generated : actualNotNull().generatedFiles()) { if (generated.toUri().getPath().contains(location.getName())) { facts.add(simpleFact(" " + generated.toUri().getPath())); } @@ -347,6 +349,11 @@ private JavaFileObjectSubject checkGeneratedFile( return check("generatedFile(/%s)", path).about(javaFileObjects()).that(generatedFile.get()); } + private Compilation actualNotNull() { + isNotNull(); + return checkNotNull(actual); + } + private static Collector> toImmutableList() { return collectingAndThen(toList(), ImmutableList::copyOf); } diff --git a/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java b/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java index 4c932763..75eda87a 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java @@ -18,12 +18,14 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link Truth} subject factory for a {@link Compilation}. */ final class CompilationSubjectFactory implements Subject.Factory { @Override - public CompilationSubject createSubject(FailureMetadata failureMetadata, Compilation that) { + public CompilationSubject createSubject( + FailureMetadata failureMetadata, @Nullable Compilation that) { return new CompilationSubject(failureMetadata, that); } } diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index eb27c3a3..7f8da2dd 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -15,6 +15,7 @@ */ package com.google.testing.compile; +import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Fact.fact; import static com.google.common.truth.Truth.assertAbout; @@ -48,20 +49,20 @@ public static Subject.Factory javaFileObj } /** Starts making assertions about a {@link JavaFileObject}. */ - public static JavaFileObjectSubject assertThat(JavaFileObject actual) { + public static JavaFileObjectSubject assertThat(@Nullable JavaFileObject actual) { return assertAbout(FACTORY).that(actual); } - private final JavaFileObject actual; + private final @Nullable JavaFileObject actual; - JavaFileObjectSubject(FailureMetadata failureMetadata, JavaFileObject actual) { + JavaFileObjectSubject(FailureMetadata failureMetadata, @Nullable JavaFileObject actual) { super(failureMetadata, actual); this.actual = actual; } @Override protected String actualCustomStringRepresentation() { - return actual.toUri().getPath(); + return actualNotNull().toUri().getPath(); } /** @@ -77,7 +78,7 @@ public void isEqualTo(@Nullable Object other) { JavaFileObject otherFile = (JavaFileObject) other; try { - if (!asByteSource(actual).contentEquals(asByteSource(otherFile))) { + if (!asByteSource(actualNotNull()).contentEquals(asByteSource(otherFile))) { failWithActual("expected to be equal to", other); } } catch (IOException e) { @@ -88,7 +89,7 @@ public void isEqualTo(@Nullable Object other) { /** Asserts that the actual file's contents are equal to {@code expected}. */ public void hasContents(ByteSource expected) { try { - if (!asByteSource(actual).contentEquals(expected)) { + if (!asByteSource(actualNotNull()).contentEquals(expected)) { failWithActual("expected to have contents", expected); } } catch (IOException e) { @@ -103,7 +104,7 @@ public void hasContents(ByteSource expected) { public StringSubject contentsAsString(Charset charset) { try { return check("contents()") - .that(JavaFileObjects.asByteSource(actual).asCharSource(charset).read()); + .that(JavaFileObjects.asByteSource(actualNotNull()).asCharSource(charset).read()); } catch (IOException e) { throw new RuntimeException(e); } @@ -170,7 +171,7 @@ private void performTreeDifference( String failureVerb, String expectedTitle, BiFunction differencingFunction) { - ParseResult actualResult = Parser.parse(ImmutableList.of(actual), "*actual* source"); + ParseResult actualResult = Parser.parse(ImmutableList.of(actualNotNull()), "*actual* source"); CompilationUnitTree actualTree = getOnlyElement(actualResult.compilationUnits()); ParseResult expectedResult = Parser.parse(ImmutableList.of(expected), "*expected* source"); @@ -185,15 +186,20 @@ private void performTreeDifference( new TreeContext(actualTree, actualResult.trees())); try { failWithoutActual( - fact("for file", actual.toUri().getPath()), + fact("for file", actualNotNull().toUri().getPath()), fact(failureVerb, expected.toUri().getPath()), fact("diff", diffReport), fact(expectedTitle, expected.getCharContent(false)), - fact("but was", actual.getCharContent(false))); + fact("but was", actualNotNull().getCharContent(false))); } catch (IOException e) { throw new IllegalStateException( "Couldn't read from JavaFileObject when it was already in memory.", e); } } } + + private JavaFileObject actualNotNull() { + isNotNull(); + return checkNotNull(actual); + } } diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java index dbe4f704..daf7fc47 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java @@ -18,13 +18,15 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import javax.tools.JavaFileObject; +import org.checkerframework.checker.nullness.qual.Nullable; /** A factory for {@link JavaFileObjectSubject}s. */ final class JavaFileObjectSubjectFactory implements Subject.Factory { @Override - public JavaFileObjectSubject createSubject(FailureMetadata failureMetadata, JavaFileObject that) { + public JavaFileObjectSubject createSubject( + FailureMetadata failureMetadata, @Nullable JavaFileObject that) { return new JavaFileObjectSubject(failureMetadata, that); } } diff --git a/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java b/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java index d5562cee..9e807ab5 100644 --- a/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java @@ -17,8 +17,8 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; - import javax.tools.JavaFileObject; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A Truth {@link Subject.Factory} similar to @@ -35,8 +35,8 @@ public static JavaSourceSubjectFactory javaSource() { private JavaSourceSubjectFactory() {} @Override - public JavaSourcesSubject.SingleSourceAdapter createSubject(FailureMetadata failureMetadata, - JavaFileObject subject) { + public JavaSourcesSubject.SingleSourceAdapter createSubject( + FailureMetadata failureMetadata, @Nullable JavaFileObject subject) { return new JavaSourcesSubject.SingleSourceAdapter(failureMetadata, subject); } } diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index 394eb002..a088c411 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -15,6 +15,7 @@ */ package com.google.testing.compile; +import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.truth.Fact.simpleFact; import static com.google.common.truth.Truth.assertAbout; import static com.google.testing.compile.CompilationSubject.compilations; @@ -65,14 +66,15 @@ @SuppressWarnings("restriction") // Sun APIs usage intended public final class JavaSourcesSubject extends Subject implements CompileTester, ProcessedCompileTesterFactory { - private final Iterable actual; + private final @Nullable Iterable actual; private final List options = new ArrayList<>(Arrays.asList("-Xlint")); @Nullable private ClassLoader classLoader; @Nullable private ImmutableList classPath; - JavaSourcesSubject(FailureMetadata failureMetadata, Iterable subject) { - super(failureMetadata, subject); - this.actual = subject; + JavaSourcesSubject( + FailureMetadata failureMetadata, @Nullable Iterable actual) { + super(failureMetadata, actual); + this.actual = actual; } @Override @@ -152,13 +154,13 @@ private CompilationClause(Iterable processors) { @Override public void parsesAs(JavaFileObject first, JavaFileObject... rest) { - if (Iterables.isEmpty(actual)) { + if (Iterables.isEmpty(actualNotNull())) { failWithoutActual( simpleFact( "Compilation generated no additional source files, though some were expected.")); return; } - ParseResult actualResult = Parser.parse(actual, "*actual* source"); + ParseResult actualResult = Parser.parse(actualNotNull(), "*actual* source"); ImmutableList> errors = actualResult.diagnosticsByKind().get(Kind.ERROR); if (!errors.isEmpty()) { @@ -312,7 +314,7 @@ private Compilation compilation() { if (classPath != null) { compiler = compiler.withClasspath(classPath); } - return compiler.compile(actual); + return compiler.compile(actualNotNull()); } } @@ -580,6 +582,11 @@ public static JavaSourcesSubject assertThat( .build()); } + private Iterable actualNotNull() { + isNotNull(); + return checkNotNull(actual); + } + private static Collector> toImmutableList() { return collectingAndThen(toList(), ImmutableList::copyOf); } @@ -588,7 +595,7 @@ public static final class SingleSourceAdapter extends Subject implements CompileTester, ProcessedCompileTesterFactory { private final JavaSourcesSubject delegate; - SingleSourceAdapter(FailureMetadata failureMetadata, JavaFileObject subject) { + SingleSourceAdapter(FailureMetadata failureMetadata, @Nullable JavaFileObject subject) { super(failureMetadata, subject); /* * TODO(b/131918061): It would make more sense to eliminate SingleSourceAdapter entirely. @@ -599,7 +606,8 @@ public static final class SingleSourceAdapter extends Subject * We could take that on, or we could wait for JavaSourcesSubject to go away entirely in favor * of CompilationSubject. */ - this.delegate = check("delegate()").about(javaSources()).that(ImmutableList.of(subject)); + this.delegate = + check("delegate()").about(javaSources()).that(ImmutableList.of(checkNotNull(subject))); } @Override diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubjectFactory.java b/src/main/java/com/google/testing/compile/JavaSourcesSubjectFactory.java index c6475e21..89cb800b 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubjectFactory.java @@ -17,8 +17,8 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; - import javax.tools.JavaFileObject; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A Truth {@link Subject.Factory} for creating @@ -35,8 +35,8 @@ public static JavaSourcesSubjectFactory javaSources() { private JavaSourcesSubjectFactory() {} @Override - public JavaSourcesSubject createSubject(FailureMetadata failureMetadata, - Iterable subject) { + public JavaSourcesSubject createSubject( + FailureMetadata failureMetadata, @Nullable Iterable subject) { return new JavaSourcesSubject(failureMetadata, subject); } } From 51d731b19e79f2e23b10caf2da057246809f0ea0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 09:03:22 -0700 Subject: [PATCH 172/300] Bump maven-release-plugin from 2.5.3 to 3.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [maven-release-plugin](https://github.com/apache/maven-release) from 2.5.3 to 3.0.0.
Release notes

Sourced from maven-release-plugin's releases.

3.0.0-M6

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

🔧 Build

3.0.0-M5

What's Changed

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-release-plugin&package-manager=maven&previous-version=2.5.3&new-version=3.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #350 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/350 from google:dependabot/maven/org.apache.maven.plugins-maven-release-plugin-3.0.0 e07eefded06c4ba3c39b5b20d26ac0c631f7b9e7 PiperOrigin-RevId: 517983807 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 528049ea..4c87092f 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ maven-release-plugin - 2.5.3 + 3.0.0 sonatype-oss-release deploy From af42f1776b2bf2b2e3b326b8c1161ed36e143395 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 27 Mar 2023 14:02:31 -0700 Subject: [PATCH 173/300] [Pin](https://github.com/ossf/scorecard/blob/main/docs/checks.md#pinned-dependencies) (and sometimes update) GitHub actions versions. Compare https://github.com/google/guava/pull/5984 RELNOTES=n/a PiperOrigin-RevId: 519822561 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9291b5e..e714f267 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,13 +18,13 @@ jobs: steps: # Cancel any previous runs for the same branch that are still running. - name: 'Cancel previous runs' - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@v3 + uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@v3 + uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 6a77ce1c963c92a50c3e86aef7bffa0548ae9fec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 06:56:26 -0700 Subject: [PATCH 174/300] Bump actions/checkout from 3.5.0 to 3.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.0 to 3.5.1.
Release notes

Sourced from actions/checkout's releases.

v3.5.1

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v3.5.0...v3.5.1

Changelog

Sourced from actions/checkout's changelog.

Changelog

v3.5.1

v3.5.0

v3.4.0

v3.3.0

v3.2.0

v3.1.0

v3.0.2

v3.0.1

v3.0.0

v2.3.1

v2.3.0

v2.2.0

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=3.5.0&new-version=3.5.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #353 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/353 from google:dependabot/github_actions/actions/checkout-3.5.1 d1c1ec0c9f6d41f0e9d37252567d5f893701f363 PiperOrigin-RevId: 523989072 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e714f267..7e098177 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 + uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: From e61f23eab571788c43914a6acbfcd5a635fe357d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 06:25:14 -0700 Subject: [PATCH 175/300] Bump actions/checkout from 3.5.1 to 3.5.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.1 to 3.5.2.
Release notes

Sourced from actions/checkout's releases.

v3.5.2

What's Changed

Full Changelog: https://github.com/actions/checkout/compare/v3.5.1...v3.5.2

Changelog

Sourced from actions/checkout's changelog.

Changelog

v3.5.2

v3.5.1

v3.5.0

v3.4.0

v3.3.0

v3.2.0

v3.1.0

v3.0.2

v3.0.1

v3.0.0

v2.3.1

v2.3.0

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=3.5.1&new-version=3.5.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #354 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/354 from google:dependabot/github_actions/actions/checkout-3.5.2 049eace679cde31f84663ca2cd4bd2d8465a3b3d PiperOrigin-RevId: 524275240 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e098177..7a8118ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@83b7061638ee4956cf7545a6f7efe594e5ad0247 + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: From 8af10c5b8654822b0ebaa13882a0831fb4a300bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 06:31:04 -0700 Subject: [PATCH 176/300] Bump maven-gpg-plugin from 3.0.1 to 3.1.0 Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.0.1 to 3.1.0.
Commits
  • 699e2ad [maven-release-plugin] prepare release maven-gpg-plugin-3.1.0
  • f314f8e [MGPG-97] use gpgverify plugin to check dependencies signatures
  • bad6b57 [MGPG-96] add INFO message
  • 0498a82 [MGPG-95] don't GPG-sign .sigstore signatures
  • 09b5be9 Auto-link MGPG Jira
  • 1e0472f extract FilesCollector
  • af9ccfd [MGPG-94] Ignore reformatting
  • 5e51734 [MGPG-94] Integration tests - convert and reformat bsh to groovy
  • 955ea0e [MGPG-94] Reformat code
  • e160f43 [MGPG-94] Bump maven-plugins from 36 to 39
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-gpg-plugin&package-manager=maven&previous-version=3.0.1&new-version=3.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #355 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/355 from google:dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.1.0 6f5636dbe85df940934b9d103586b1ac92a3a2a1 PiperOrigin-RevId: 530287150 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c87092f..fdbe09e9 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts From 9b1f28d972a50f1ca3fbe9cbb26264ced4af2c75 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 9 May 2023 08:16:18 -0700 Subject: [PATCH 177/300] Include `LICENSE` in the generated jar under `META-INF`. See https://github.com/google/guava/issues/6468 and https://github.com/google/guava/pull/6477. I cowardly did not look into Auto and its many pom.xml files. And I gave up on jimfs when its jar didn't end up containing the license... maybe somehow related to how it has other files autogenerated into `META-INF`?? RELNOTES=n/a PiperOrigin-RevId: 530613491 --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index fdbe09e9..75d3688f 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,15 @@ + + + . + + LICENSE.txt + + META-INF + + maven-compiler-plugin From 541211df9da6ffabe407a2a0c81409192e00457c Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Wed, 17 May 2023 11:25:27 -0700 Subject: [PATCH 178/300] Internal Code Change PiperOrigin-RevId: 532850814 --- .../google/testing/compile/FailingGeneratingProcessor.java | 2 +- .../java/com/google/testing/compile/ThrowingProcessor.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/google/testing/compile/FailingGeneratingProcessor.java b/src/test/java/com/google/testing/compile/FailingGeneratingProcessor.java index ffec2771..540f171b 100644 --- a/src/test/java/com/google/testing/compile/FailingGeneratingProcessor.java +++ b/src/test/java/com/google/testing/compile/FailingGeneratingProcessor.java @@ -52,6 +52,6 @@ public Set getSupportedAnnotationTypes() { @Override public SourceVersion getSupportedSourceVersion() { - return delegate.getSupportedSourceVersion(); + return SourceVersion.latestSupported(); } } diff --git a/src/test/java/com/google/testing/compile/ThrowingProcessor.java b/src/test/java/com/google/testing/compile/ThrowingProcessor.java index 8154c6c2..3fd108cd 100644 --- a/src/test/java/com/google/testing/compile/ThrowingProcessor.java +++ b/src/test/java/com/google/testing/compile/ThrowingProcessor.java @@ -20,6 +20,7 @@ import java.util.Set; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; import javax.lang.model.element.TypeElement; final class ThrowingProcessor extends AbstractProcessor { @@ -35,6 +36,11 @@ public Set getSupportedAnnotationTypes() { return ImmutableSet.of("*"); } + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latestSupported(); + } + @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { throw e; From 5f9fac1b31a55ef062097f0d353482f1a052c8a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 07:17:39 -0700 Subject: [PATCH 179/300] Bump maven-source-plugin from 3.2.1 to 3.3.0 Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.0.
Commits
  • 02a9847 [maven-release-plugin] prepare release maven-source-plugin-3.3.0
  • f186993 [MSOURCES-135] Cleanup project code
  • 021af55 [MSOURCES-134] Refresh download page
  • b11a457 Use shared GitHub actions v3
  • 7caf2b0 [MSOURCES-133] Upgrade Parent to 39 - ignore git blame
  • dee4c10 [MSOURCES-133] Upgrade Parent to 39
  • 452111f Add dependabot configuration
  • e691ac3 s/MSOURCE/MSOURCES/
  • 1ddffd8 Auto-link MSOURCE Jira
  • 37ffefe Add pull request template
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-source-plugin&package-manager=maven&previous-version=3.2.1&new-version=3.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #358 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/358 from google:dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.0 e23eb981498d8e63ca1e48ea68c23a3d0dc2b6ec PiperOrigin-RevId: 534055814 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75d3688f..c3433ac3 100644 --- a/pom.xml +++ b/pom.xml @@ -211,7 +211,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources From 4af939f5d932e1e1db342ef8517a4943f605b71d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 07:19:42 -0700 Subject: [PATCH 180/300] Bump maven-release-plugin from 3.0.0 to 3.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [maven-release-plugin](https://github.com/apache/maven-release) from 3.0.0 to 3.0.1.
Release notes

Sourced from maven-release-plugin's releases.

3.0.1

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

Commits
  • 0fae89d [maven-release-plugin] prepare release maven-release-3.0.1
  • 95cde3e [MRELEASE-1127] Refresh download page
  • 33f0d91 [MRELEASE-1123] Fix for Maven 4 compatibility
  • e89d46a [MRELEASE-1077] Add the since tag to the documentation
  • 2ffacc8 [MRELEASE-1114] Restore interactive mode for forked process
  • e3bf326 [MRELEASE-1121] Bump maven-shared-utils from 3.4.1 to 3.4.2
  • 7b9282c [MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (#...
  • ad666d3 [MRELEASE-1122] configure system requirements history
  • 6e152c9 [MRELEASE-1121] Bump maven-shared-utils from 3.3.4 to 3.4.1 (#183)
  • 78e2329 Auto-link MRELEASE Jira
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-release-plugin&package-manager=maven&previous-version=3.0.0&new-version=3.0.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #359 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/359 from google:dependabot/maven/org.apache.maven.plugins-maven-release-plugin-3.0.1 e48320d0833b3ad2056255bf4d206a0272933012 PiperOrigin-RevId: 537867635 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3433ac3..c943db32 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ maven-release-plugin - 3.0.0 + 3.0.1 sonatype-oss-release deploy From 81ebd19a3582c88987014ae420932bb69c46c8d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 07:28:22 -0700 Subject: [PATCH 181/300] Bump actions/checkout from 3.5.2 to 3.5.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.2 to 3.5.3.
Release notes

Sourced from actions/checkout's releases.

v3.5.3

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v3...v3.5.3

Changelog

Sourced from actions/checkout's changelog.

Changelog

v3.5.3

v3.5.2

v3.5.1

v3.5.0

v3.4.0

v3.3.0

v3.2.0

v3.1.0

v3.0.2

v3.0.1

v3.0.0

v2.3.1

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=3.5.2&new-version=3.5.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #360 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/360 from google:dependabot/github_actions/actions/checkout-3.5.3 e02cd6fc6ddff9d9740c88c972689ae7f030fa44 PiperOrigin-RevId: 539645381 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a8118ec..37e2320f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 with: From cf3a3dfa2c1e7f724bf7e491ab80162091118d14 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 30 Jun 2023 16:37:28 -0700 Subject: [PATCH 182/300] Bump Guava to 32.1.1. RELNOTES=n/a PiperOrigin-RevId: 544777054 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c943db32..19e66590 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 31.1-jre + 32.1.1-jre com.google.errorprone From c4f267c83b760e4bc765d400eb38792610a839e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 06:46:40 -0700 Subject: [PATCH 183/300] Bump actions/setup-java from 3.11.0 to 3.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.11.0 to 3.12.0.
Release notes

Sourced from actions/setup-java's releases.

v3.12.0

In scope of this release the following changes were made:

Bug fixes:

Feature implementations:

Resolving dependencies issues:

Infrastructure updates:

Documentation changes:

New Contributors

Full Changelog: https://github.com/actions/setup-java/compare/v3...v3.12.0

Commits
  • cd89f46 Add versions properties to cache (#280)
  • 4fb3975 Merge pull request #507 from akv-platform/update-oracle-jdk-url-calculation
  • 33b10b6 Use archive as fallback only when dealing with major version
  • 75c6561 Update dependencies (#511)
  • ebe05e0 Update build
  • 46099e1 Build
  • 1a3cd38 Update Oracle JDK URL calculation
  • 1f2faad Instruction to download custom distribution JDK and install (#500)
  • 45058d7 Update xml2js (#484)
  • 87c1c70 Merge pull request #494 from akv-platform/remove-implicit-dependencies
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=3.11.0&new-version=3.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #362 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/362 from google:dependabot/github_actions/actions/setup-java-3.12.0 bfaca1ce5076fb6144b1a7f0232bfcabe580718e PiperOrigin-RevId: 550871775 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37e2320f..b78de3b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 + uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 02e273c022333bb30a1aa11e7879d110fed7a79a Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 1 Aug 2023 08:01:58 -0700 Subject: [PATCH 184/300] Bump Guava to 32.1.2. RELNOTES=n/a PiperOrigin-RevId: 552803654 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19e66590..72921123 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 32.1.1-jre + 32.1.2-jre com.google.errorprone From 80057773826bd3d04f4629aa6de3775f7e034d0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 07:17:45 -0700 Subject: [PATCH 185/300] Bump actions/checkout from 3.5.3 to 3.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0.
Release notes

Sourced from actions/checkout's releases.

v3.6.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v3.5.3...v3.6.0

Changelog

Sourced from actions/checkout's changelog.

Changelog

v3.6.0

v3.5.3

v3.5.2

v3.5.1

v3.5.0

v3.4.0

v3.3.0

v3.2.0

v3.1.0

v3.0.2

v3.0.1

v3.0.0

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=3.5.3&new-version=3.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #366 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/366 from google:dependabot/github_actions/actions/checkout-3.6.0 dec32bfd4fb7761fe4bd09ca70975b7caf33ad5e PiperOrigin-RevId: 560083542 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b78de3b2..239105f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: From 48a3f80d16d7300201a50b68d827219fc9da1527 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 07:10:30 -0700 Subject: [PATCH 186/300] Bump actions/checkout from 3.6.0 to 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0.
Release notes

Sourced from actions/checkout's releases.

v4.0.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v3...v4.0.0

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.0.0

v3.6.0

v3.5.3

v3.5.2

v3.5.1

v3.5.0

v3.4.0

v3.3.0

v3.2.0

v3.1.0

v3.0.2

v3.0.1

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=3.6.0&new-version=4.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #367 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/367 from google:dependabot/github_actions/actions/checkout-4.0.0 45c69dfe1d8730ee18ae46675e63f05450f7111c PiperOrigin-RevId: 562768275 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 239105f2..ba0e5efc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 with: From 50edd7b41e784a2e5ab06f283443b4fd865afbc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 07:51:44 -0700 Subject: [PATCH 187/300] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.5.0 to 3.6.0.
Release notes

Sourced from org.apache.maven.plugins:maven-javadoc-plugin's releases.

3.6.0

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

... (truncated)

Commits
  • 7548066 [maven-release-plugin] prepare release maven-javadoc-plugin-3.6.0
  • 77adc47 [MJAVADOC-642] Make offline mode configurable (#238)
  • 24362d2 [MJAVADOC-742] Fix resolution of docletArtifacts (#186)
  • bee4197 fix jenkins link (#237)
  • 9830bdc Fix build on jenkins
  • 6f30bed [MJAVADOC-642] Make offline mode configurable (#232)
  • e4023d0 [JAVADOC-771] Upgrade Parent to 40 (#234)
  • 7904e45 [MJAVADOC-772] Refresh download page
  • 87c2424 Bump org.apache.maven:maven-core (#226)
  • 83ab01b Use 3.6.0 as release version (#233)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.5.0&new-version=3.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #368 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/368 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.6.0 2a8abb4fdab166cff3ecf85214b1860cc04de419 PiperOrigin-RevId: 566301173 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 72921123..1143694f 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.5.0 + 3.6.0 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -222,7 +222,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-docs From b8560e3229a46e984e40b7e2410acab3ca1b3875 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 06:36:04 -0700 Subject: [PATCH 188/300] Bump actions/setup-java from 3.12.0 to 3.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.12.0 to 3.13.0.
Release notes

Sourced from actions/setup-java's releases.

v3.13.0

What's changed

In the scope of this release, support for Dragonwell JDK was added by @​Accelerator1996 in actions/setup-java#532

steps:
 - name: Checkout
   uses: actions/checkout@v3
 - name: Setup-java
   uses: actions/setup-java@v3
   with:
     distribution: 'dragonwell'
     java-version: '17'

Several inaccuracies were also fixed:

New Contributors

Full Changelog: https://github.com/actions/setup-java/compare/v3...v3.13.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=3.12.0&new-version=3.13.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #369 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/369 from google:dependabot/github_actions/actions/setup-java-3.13.0 bd17f613c8cbc27d172ef2a09484d75c5195f096 PiperOrigin-RevId: 567290540 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba0e5efc..bc327f35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 + uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 7fb694be9e5aeb3334ba5b4e2641e3d4ea9c5980 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 06:42:44 -0700 Subject: [PATCH 189/300] Bump actions/checkout from 4.0.0 to 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
Release notes

Sourced from actions/checkout's releases.

v4.1.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v4.0.0...v4.1.0

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.1.0

v4.0.0

v3.6.0

v3.5.3

v3.5.2

v3.5.1

v3.5.0

v3.4.0

v3.3.0

v3.2.0

v3.1.0

v3.0.2

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.0.0&new-version=4.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #371 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/371 from google:dependabot/github_actions/actions/checkout-4.1.0 0406634a033766552bc11cff13ca0e8513a528e1 PiperOrigin-RevId: 568202915 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc327f35..aa251974 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 with: From 75737678273a9c94f6b2fe16622531b788ac239c Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 29 Sep 2023 14:32:19 -0700 Subject: [PATCH 190/300] Prepare code for more JDK nullness annotations. RELNOTES=n/a PiperOrigin-RevId: 569590313 --- src/main/java/com/google/testing/compile/Compilation.java | 6 +++--- .../java/com/google/testing/compile/CompilationSubject.java | 6 ++++-- .../com/google/testing/compile/InMemoryJavaFileManager.java | 6 ++++-- .../com/google/testing/compile/JavaFileObjectSubject.java | 3 ++- .../java/com/google/testing/compile/JavaFileObjects.java | 3 ++- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/google/testing/compile/Compilation.java b/src/main/java/com/google/testing/compile/Compilation.java index b00dc93d..57342b41 100644 --- a/src/main/java/com/google/testing/compile/Compilation.java +++ b/src/main/java/com/google/testing/compile/Compilation.java @@ -17,6 +17,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.testing.compile.JavaFileObjects.asByteSource; +import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; import static javax.tools.Diagnostic.Kind.ERROR; @@ -155,9 +156,8 @@ public Optional generatedFile(Location location, String path) { // We're relying on the implementation of location.getName() to be equivalent to the first // part of the path. String expectedFilename = String.format("%s/%s", location.getName(), path); - return generatedFiles() - .stream() - .filter(generated -> generated.toUri().getPath().endsWith(expectedFilename)) + return generatedFiles().stream() + .filter(generated -> requireNonNull(generated.toUri().getPath()).endsWith(expectedFilename)) .findFirst(); } diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index d8adad70..2fd3f393 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -26,6 +26,7 @@ import static com.google.testing.compile.Compilation.Status.SUCCESS; import static com.google.testing.compile.JavaFileObjectSubject.javaFileObjects; import static java.nio.charset.StandardCharsets.UTF_8; +import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; @@ -338,7 +339,7 @@ private JavaFileObjectSubject checkGeneratedFile( facts.add(fact("in location", location.getName())); facts.add(simpleFact("it generated:")); for (JavaFileObject generated : actualNotNull().generatedFiles()) { - if (generated.toUri().getPath().contains(location.getName())) { + if (requireNonNull(generated.toUri().getPath()).contains(location.getName())) { facts.add(simpleFact(" " + generated.toUri().getPath())); } } @@ -421,7 +422,8 @@ private ImmutableList> findDiagnosticsInFil filterDiagnostics( diagnostic -> { JavaFileObject source = diagnostic.getSource(); - return source != null && source.toUri().getPath().equals(expectedFilePath); + return source != null + && requireNonNull(source.toUri().getPath()).equals(expectedFilePath); }); if (diagnosticsInFile.isEmpty()) { failExpectingMatchingDiagnostic( diff --git a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java index c50e7817..d7f540a2 100644 --- a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java +++ b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java @@ -16,6 +16,7 @@ package com.google.testing.compile; import static com.google.common.collect.MoreCollectors.toOptional; +import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects; import com.google.common.cache.CacheBuilder; @@ -129,7 +130,7 @@ private Optional findInMemoryInput(String packageName, String re String suffix = packageName.isEmpty() ? relativeName : packageName.replace('.', '/') + "/" + relativeName; return inMemoryInputs.entrySet().stream() - .filter(entry -> entry.getKey().getPath().endsWith(suffix)) + .filter(entry -> requireNonNull(entry.getKey().getPath()).endsWith(suffix)) .map(Map.Entry::getValue) .collect(toOptional()); // Might have problems if more than one input file matches. } @@ -151,7 +152,8 @@ public JavaFileObject getJavaFileForOutput(Location location, String className, ImmutableList getGeneratedSources() { ImmutableList.Builder result = ImmutableList.builder(); for (Map.Entry entry : inMemoryOutputs.asMap().entrySet()) { - if (entry.getKey().getPath().startsWith("/" + StandardLocation.SOURCE_OUTPUT.name()) + if (requireNonNull(entry.getKey().getPath()) + .startsWith("/" + StandardLocation.SOURCE_OUTPUT.name()) && (entry.getValue().getKind() == Kind.SOURCE)) { result.add(entry.getValue()); } diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index 7f8da2dd..29211b6f 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -23,6 +23,7 @@ import static com.google.testing.compile.TreeDiffer.diffCompilationUnits; import static com.google.testing.compile.TreeDiffer.matchCompilationUnits; import static java.nio.charset.StandardCharsets.UTF_8; +import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; import com.google.common.io.ByteSource; @@ -62,7 +63,7 @@ public static JavaFileObjectSubject assertThat(@Nullable JavaFileObject actual) @Override protected String actualCustomStringRepresentation() { - return actualNotNull().toUri().getPath(); + return requireNonNull(actualNotNull().toUri().getPath()); } /** diff --git a/src/main/java/com/google/testing/compile/JavaFileObjects.java b/src/main/java/com/google/testing/compile/JavaFileObjects.java index 81900c32..174bd1e5 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjects.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjects.java @@ -17,6 +17,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; import static javax.tools.JavaFileObject.Kind.SOURCE; import com.google.common.base.CharMatcher; @@ -162,7 +163,7 @@ public static JavaFileObject forResource(String resourceName) { } static Kind deduceKind(URI uri) { - String path = uri.getPath(); + String path = requireNonNull(uri.getPath()); for (Kind kind : Kind.values()) { if (path.endsWith(kind.extension)) { return kind; From 972ac1e15237d314358dd30715bed52e33f588ee Mon Sep 17 00:00:00 2001 From: Colin Decker Date: Tue, 3 Oct 2023 10:15:42 -0700 Subject: [PATCH 191/300] Change `Compiler.compile` to close the `StandardJavaFileManager` it creates. Fixes https://github.com/google/compile-testing/pull/370 According to that PR, it sounds like not closing this can leak file descriptors. RELNOTES=Fixed `Compiler.compile` to ensure that it doesn't leak file descriptors. PiperOrigin-RevId: 570424175 --- .../com/google/testing/compile/Compiler.java | 67 +++++++++++-------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/google/testing/compile/Compiler.java b/src/main/java/com/google/testing/compile/Compiler.java index 0ae8bf03..f77d7e56 100644 --- a/src/main/java/com/google/testing/compile/Compiler.java +++ b/src/main/java/com/google/testing/compile/Compiler.java @@ -43,6 +43,7 @@ import javax.tools.JavaCompiler; import javax.tools.JavaCompiler.CompilationTask; import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; import org.checkerframework.checker.nullness.qual.Nullable; @@ -180,36 +181,44 @@ public final Compilation compile(JavaFileObject... files) { */ public final Compilation compile(Iterable files) { DiagnosticCollector diagnosticCollector = new DiagnosticCollector<>(); - InMemoryJavaFileManager fileManager = - new InMemoryJavaFileManager( - javaCompiler().getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8)); - fileManager.addSourceFiles(files); - classPath().ifPresent(path -> setLocation(fileManager, StandardLocation.CLASS_PATH, path)); - annotationProcessorPath() - .ifPresent( - path -> setLocation(fileManager, StandardLocation.ANNOTATION_PROCESSOR_PATH, path)); - CompilationTask task = - javaCompiler() - .getTask( - null, // use the default because old versions of javac log some output on stderr - fileManager, - diagnosticCollector, - options(), - ImmutableSet.of(), - files); - task.setProcessors(processors()); - boolean succeeded = task.call(); - Compilation compilation = - new Compilation( - this, - files, - succeeded, - diagnosticCollector.getDiagnostics(), - fileManager.getOutputFiles()); - if (compilation.status().equals(Status.FAILURE) && compilation.errors().isEmpty()) { - throw new CompilationFailureException(compilation); + try (StandardJavaFileManager standardFileManager = standardFileManager(diagnosticCollector); + InMemoryJavaFileManager fileManager = new InMemoryJavaFileManager(standardFileManager)) { + fileManager.addSourceFiles(files); + classPath().ifPresent(path -> setLocation(fileManager, StandardLocation.CLASS_PATH, path)); + annotationProcessorPath() + .ifPresent( + path -> setLocation(fileManager, StandardLocation.ANNOTATION_PROCESSOR_PATH, path)); + + CompilationTask task = + javaCompiler() + .getTask( + null, // use the default because old versions of javac log some output on stderr + fileManager, + diagnosticCollector, + options(), + ImmutableSet.of(), + files); + task.setProcessors(processors()); + boolean succeeded = task.call(); + Compilation compilation = + new Compilation( + this, + files, + succeeded, + diagnosticCollector.getDiagnostics(), + fileManager.getOutputFiles()); + if (compilation.status().equals(Status.FAILURE) && compilation.errors().isEmpty()) { + throw new CompilationFailureException(compilation); + } + return compilation; + } catch (IOException e) { + throw new UncheckedIOException(e); } - return compilation; + } + + private StandardJavaFileManager standardFileManager( + DiagnosticCollector diagnosticCollector) { + return javaCompiler().getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8); } @VisibleForTesting From 90b8e572d93aae9581e324c36bc0b93e535415cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 05:39:08 -0700 Subject: [PATCH 192/300] Bump styfle/cancel-workflow-action from 0.11.0 to 0.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.11.0 to 0.12.0.
Release notes

Sourced from styfle/cancel-workflow-action's releases.

0.12.0

Changes

  • Feat: add option only_status: #210
  • Chore(deps): bump actions/setup-node from 3.5.0 to 3.5.1: #188
  • Chore: add a warning to docs about missing version: #184
  • Chore(deps-dev): bump husky from 8.0.1 to 8.0.2: #190
  • Chore(deps-dev): bump typescript from 4.8.4 to 4.9.3: #192
  • Chore(deps-dev): bump prettier from 2.7.1 to 2.8.0: #193
  • Chore(deps-dev): bump prettier from 2.8.0 to 2.8.1: #194
  • Chore(deps-dev): bump typescript from 4.9.3 to 4.9.4: #195
  • Chore(deps-dev): bump @​vercel/ncc from 0.34.0 to 0.36.0: #196
  • Chore(deps): bump actions/setup-node from 3.5.1 to 3.6.0: #197
  • Chore(deps-dev): bump prettier from 2.8.1 to 2.8.2: #199
  • Chore(deps-dev): bump husky from 8.0.2 to 8.0.3: #198
  • Chore(docs): document the native behavior: #201
  • Chore(docs): simplify readme warning: 25b1072e6989f076cfebf162ba7109fcde126aa6
  • Chore: remove dependabot: #206
  • Chore(deps-dev): bump typescript from 4.9.4 to 4.9.5: #205
  • Chore(deps-dev): bump @​vercel/ncc from 0.36.0 to 0.36.1: #204
  • Chore(deps-dev): bump prettier from 2.8.2 to 2.8.3: #203

Credits

Huge thanks to @​chenxsan and @​8666 for helping!

Commits
  • 01ce38b 0.12.0
  • 9c78c20 chore(deps-dev): bump prettier from 2.8.2 to 2.8.3 (#203)
  • 96c8030 Add option only_status (#210)
  • c6a48d7 chore(deps-dev): bump @​vercel/ncc from 0.36.0 to 0.36.1 (#204)
  • 5c8fe64 chore(deps-dev): bump typescript from 4.9.4 to 4.9.5 (#205)
  • 034d0e9 chore: remove dependabot (#206)
  • 25b1072 chore(docs): simplify readme warning
  • 3b7e3bd chore(docs): document the native behavior (#201)
  • a0540e0 chore(deps-dev): bump husky from 8.0.2 to 8.0.3 (#198)
  • cb6ed73 chore(deps-dev): bump prettier from 2.8.1 to 2.8.2 (#199)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=styfle/cancel-workflow-action&package-manager=github_actions&previous-version=0.11.0&new-version=0.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #374 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/374 from google:dependabot/github_actions/styfle/cancel-workflow-action-0.12.0 c125784c861359f20da6f265bd37938128beeaf3 PiperOrigin-RevId: 570666606 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa251974..3196056e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: # Cancel any previous runs for the same branch that are still running. - name: 'Cancel previous runs' - uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 + uses: styfle/cancel-workflow-action@01ce38bf961b4e243a6342cbade0dbc8ba3f0432 with: access_token: ${{ github.token }} - name: 'Check out repository' From 2449e98080611d05e08b39770de4e3070c971755 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 10 Oct 2023 15:26:35 -0700 Subject: [PATCH 193/300] Bump Guava to 32.1.3. RELNOTES=n/a PiperOrigin-RevId: 572383399 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1143694f..f3906f76 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 32.1.2-jre + 32.1.3-jre com.google.errorprone From b6e19e9aeda4775467bf58e2e270447bc37f5fa4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:35:13 -0700 Subject: [PATCH 194/300] Bump org.codehaus.plexus:plexus-java from 1.1.2 to 1.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.codehaus.plexus:plexus-java](https://github.com/codehaus-plexus/plexus-languages) from 1.1.2 to 1.2.0.
Release notes

Sourced from org.codehaus.plexus:plexus-java's releases.

1.2.0

📦 Dependency updates

👻 Maintenance

Commits
  • 9036768 [maven-release-plugin] prepare release plexus-languages-1.2.0
  • e7df12c Bump Site Fluido Skin to 1.12.0
  • 4dfc56b Remove redundant overwrite for junit5Version
  • dacf8b2 Remove redundant profile after parent pom update
  • 477fb79 Cleanup after parent pom update
  • 9cc4a3f Bump org.codehaus.plexus:plexus from 14 to 15
  • 76d72d3 Bump org.ow2.asm:asm from 9.5 to 9.6
  • 3a1f22b Fail on duplicate modules on the module path
  • 605780b Move comments to proper position and improve
  • 5c06f1b Add java bytecode class file version detection
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=1.1.2&new-version=1.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #377 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/377 from google:dependabot/maven/org.codehaus.plexus-plexus-java-1.2.0 a1763ce7b12b445ce246145b4fbd1ecdf05d472e PiperOrigin-RevId: 574176502 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f3906f76..35b8ad37 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ org.codehaus.plexus plexus-java - 1.1.2 + 1.2.0 From 97980517bc455cdc880ced63d823a7efd4f01e6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 06:51:12 -0700 Subject: [PATCH 195/300] Bump actions/checkout from 4.1.0 to 4.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
Release notes

Sourced from actions/checkout's releases.

v4.1.1

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v4...v4.1.1

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.0&new-version=4.1.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #379 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/379 from google:dependabot/github_actions/actions/checkout-4.1.1 814d07cf159179dfac74da5b00a7247a39fe96a7 PiperOrigin-RevId: 574461386 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3196056e..dc3e811a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 with: From 6a7d430d2b9b2b1a393191ca6044f205a3c11289 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 07:47:07 -0800 Subject: [PATCH 196/300] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.0 to 3.6.2.
Release notes

Sourced from org.apache.maven.plugins:maven-javadoc-plugin's releases.

3.6.2

🐛 Bug Fixes

📦 Dependency updates

Commits
  • 28a89f1 [maven-release-plugin] prepare release maven-javadoc-plugin-3.6.2
  • 16ca43f [maven-release-plugin] prepare for next development iteration
  • 88bc4a5 Align IT after MJAVADOC-716
  • 4b881e8 Bump org.codehaus.mojo:mrm-maven-plugin from 1.5.0 to 1.6.0
  • 45a8d29 [MJAVADOC-716] Fix stale files detection failing because of the added newline...
  • afb2dee [MJAVADOC-713] Skipping Javadoc reportset leaves empty Javadoc link in site
  • 4bad23f [MJAVADOC-730] Deprecate parameter "old"
  • 8364883 [MJAVADOC-777] Bump org.codehaus.plexus:plexus-java from 1.1.2 to 1.2.0 (#245)
  • 6fa9c86 [MJAVADOC-762] don't share state between tests (#218)
  • 05b12e8 [MJAVADOC-726] exclude velocity (#243)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.6.0&new-version=3.6.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #380 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/380 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.6.2 f9c16487573c71f9438c64bdd4bea98e0c68c842 PiperOrigin-RevId: 580177496 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 35b8ad37..77e76cc1 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.6.0 + 3.6.2 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -222,7 +222,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.6.2 attach-docs From 5af08b61158627f7d92892da9e70e3397fd1a391 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 06:37:11 -0800 Subject: [PATCH 197/300] Bump actions/setup-java from 3.13.0 to 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.13.0 to 4.0.0.
Release notes

Sourced from actions/setup-java's releases.

v4.0.0

What's Changed

In the scope of this release, the version of the Node.js runtime was updated to 20. The majority of dependencies were updated to the latest versions. From now on, the code for the setup-java will run on Node.js 20 instead of Node.js 16.

Breaking changes

Non-breaking changes

New Contributors

Full Changelog: https://github.com/actions/setup-java/compare/v3...v4.0.0

Commits
  • 387ac29 Upgrade Node to v20 (#558)
  • 9eda6b5 feat: implement cache-dependency-path option to control caching dependency (#...
  • 78078da Update @​actions/cache dependency and documentation (#549)
  • 5caaba6 add support for microsoft openjdk 21.0.0 (#546)
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=3.13.0&new-version=4.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #381 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/381 from google:dependabot/github_actions/actions/setup-java-4.0.0 7a78b5d2b6fcffc1f795ba20c54aeca2ce389b9d PiperOrigin-RevId: 586659503 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc3e811a..a4d40889 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 4c5e6ec01e2604978ea24129e374536645d15fed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 09:30:53 -0800 Subject: [PATCH 198/300] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.2 to 3.6.3.
Commits
  • 8205008 [maven-release-plugin] prepare release maven-javadoc-plugin-3.6.3
  • b69af90 [MJAVADOC-682] Reactor builds fail when multiple modules with same groupId:ar...
  • b47b280 directory, not folder
  • 488624f [MJAVADOC-782] Align read-only parameters naming with other plugins
  • 867dc73 [MJAVADOC-781] Upgrade plugins and components (in ITs)
  • 0104ab2 Fix incorrect config in test-javadoc-test-plugin-config.xml
  • dd39c0c [MJAVADOC-780] add missing plugin configuration
  • e6e6180 Remove junk from 692d7a8a9918efd24633a44f0f3d4dfd22d0fec4
  • 692d7a8 [MJAVADOC-779] - Upgrade maven-plugin parent to 41
  • 386d4ea Remove dead link
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.6.2&new-version=3.6.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #382 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/382 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.6.3 4b27d6d1cc2aae314dedb2d73f27ee43448c2164 PiperOrigin-RevId: 587749532 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 77e76cc1..6e18945b 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.6.2 + 3.6.3 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -222,7 +222,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.2 + 3.6.3 attach-docs From 736249f75f8e2ed650cc2c24c291e64c6d9e9595 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 05:13:07 -0800 Subject: [PATCH 199/300] Bump com.google.errorprone:error_prone_annotations from 2.16 to 2.23.0 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.16 to 2.23.0.
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.23.0

New checks:

Bug fixes and improvements: #3897, #4114, #4123

Full Changelog: https://github.com/google/error-prone/compare/v2.22.0...v2.23.0

Error Prone 2.22.0

We are considering raising the minimum supported JDK from JDK 11 to JDK 17 in a future release of Error Prone, see #3803. Note that using a newer JDK version to run javac during the build doesn't prevent building code that is deployed to earlier versions, for example it's supported to use the JDK 17 javac and pass --release 11 to compile Java 11 code that is deployed to a JDK 11 runtime. If you have feedback, please comment on #3803.

New checks:

Bug fixes and improvements:

  • Don't complain about literal IP addresses in AddressSelection (https://github.com/google/error-prone/commit/44b65527debbc57892f21ca3ba458b16771e423e)
  • Prevent SuggestedFixes#renameMethod from modifying return type declaration (#4043)
  • Fix UnusedVariable false positives for private record parameters (#2713)
  • When running in conservative mode, no longer assume that implementations of Map.get, etc. return null (#2910)
  • CanIgnoreReturnValueSuggester: Support additional exempting method annotations (#4009)
  • UnusedVariable: exclude junit5's @RegisterExtension (#3892)
  • Support running all available patch checks (#947)
  • Upgrade java-diff-utils 4.0 -> 4.12 (#4081)
  • Flag unused Refaster template parameters (#4060)
  • Support @SuppressWarnings("all") (#4065)
  • Prevent Refaster UMemberSelect from matching method parameters (#2456)
  • MissingDefault : Don't require // fall out comments on expression switches (#2709)
  • Skip UnnecessaryLambda findings for usages in enhanced for loops (#2518)
  • Fix bug where nested MissingBraces violations' suggested fixes result in broken code (#3797)
  • Add support for specifying exemptPrefixes/exemptNames for UnusedVariable via flags (#2753)
  • UnusedMethod: Added exempting variable annotations (#2881)

Full Changelog: https://github.com/google/error-prone/compare/v2.21.1...v2.22.0

Error Prone 2.21.1

Changes:

  • Handle overlapping ranges in suppressedRegions (fixes #4040)
  • Add AddressSelection to discourage APIs that convert a hostname to a single address

... (truncated)

Commits
  • ff5e5f7 Release Error Prone 2.23.0
  • 3047300 Suggest this == obj instead of super.equals(obj) when the two are equival...
  • ed01de0 Tweak the wording of summary in FloggerRedundantIsEnabled, because `[LEV...
  • 159ae7f Remove volatile when finalling static fields.
  • e8298e4 Automatic code cleanup.
  • 53f24d4 java.util.Iterable -> lang
  • 1c62a56 Rip out the YetMore flag.
  • 8d62eb6 Don't flag things which probably shouldn't be static anyway.
  • 3cdff25 Remove the deprecated ErrorProneFlags methods.
  • 90baca0 Include javax.inject in 'with-dependencies' jars
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.16&new-version=2.23.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #383 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/383 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.23.0 cb4638950c7462c570f7aa8532a7933606b177d8 PiperOrigin-RevId: 588033609 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e18945b..3d24278f 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.16 + 2.23.0 provided From 0fde2910a9b3a95eb98d1b88eba2fccc292276a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 05:13:33 -0800 Subject: [PATCH 200/300] Bump org.checkerframework:checker-qual from 3.26.0 to 3.41.0 Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.26.0 to 3.41.0.
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.41.0

Version 3.41.0 (December 4, 2023)

User-visible changes:

New command-line options: -AassumePureGetters Unsoundly assume that every getter method is pure

Implementation details:

Added method isDeterministic() to the AnnotationProvider interface.

CFAbstractValue#leastUpperBound and CFAbstractValue#widenUpperBound are now final. Subclasses should override method CFAbstractValue#upperBound(V, TypeMirror, boolean) instead.

Closed issues:

#1497, #3345, #6037, #6204, #6276, #6282, #6290, #6296, #6319, #6327.

Checker Framework 3.40.0

Version 3.40.0 (November 1, 2023)

User-visible changes:

Optional Checker: checker-util.jar defines OptionalUtil.castPresent() for suppressing false positive warnings from the Optional Checker.

Closed issues:

#4947, #6179, #6215, #6218, #6222, #6247, #6259, #6260.

Checker Framework 3.39.0

Version 3.39.0 (October 2, 2023)

User-visible changes:

The Checker Framework runs on a version 21 JVM. It does not yet soundly check all new Java 21 language features, but it does not crash when compiling them.

Implementation details:

Dataflow supports all the new Java 21 language features.

  • A new node,DeconstructorPatternNode, was added, so any implementation of NodeVisitor must be updated.
  • Method InstanceOfNode.getBindingVariable() is deprecated; use getPatternNode() or getBindingVariables() instead.

WPI uses 1-based indexing for formal parameters and arguments.

Closed issues:

... (truncated)

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.41.0 (December 4, 2023)

User-visible changes:

New command-line options: -AassumePureGetters Unsoundly assume that every getter method is pure

Implementation details:

Added method isDeterministic() to the AnnotationProvider interface.

CFAbstractValue#leastUpperBound and CFAbstractValue#widenUpperBound are now final. Subclasses should override method CFAbstractValue#upperBound(V, TypeMirror, boolean) instead.

Closed issues:

#1497, #3345, #6037, #6204, #6276, #6282, #6290, #6296, #6319, #6327.

Version 3.40.0 (November 1, 2023)

User-visible changes:

Optional Checker: checker-util.jar defines OptionalUtil.castPresent() for suppressing false positive warnings from the Optional Checker.

Closed issues:

#4947, #6179, #6215, #6218, #6222, #6247, #6259, #6260.

Version 3.39.0 (October 2, 2023)

User-visible changes:

The Checker Framework runs on a version 21 JVM. It does not yet soundly check all new Java 21 language features, but it does not crash when compiling them.

Implementation details:

Dataflow supports all the new Java 21 language features.

  • A new node,DeconstructorPatternNode, was added, so any implementation of NodeVisitor must be updated.
  • Method InstanceOfNode.getBindingVariable() is deprecated; use getPatternNode() or getBindingVariables() instead.

... (truncated)

Commits
  • df9b135 new release 3.41.0
  • 2f4073a Prep for release.
  • 19ae530 Transfer function documentation (#6333)
  • 116b265 Update plugin com.diffplug.spotless to v6.23.3
  • f80af83 Use Error Prone 2.23.0 (suppress warning)
  • 918fa9e Don't compute element unless necessary
  • d146eea Update dependency io.github.classgraph:classgraph to v4.8.165 (#6331)
  • 98da4e5 Remove a project
  • 43db447 Add a new method to handle annotations not on the classpath
  • 3bca5e2 Update dependency com.amazonaws:aws-java-sdk-bom to v1.12.603 (#6328)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.26.0&new-version=3.41.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #387 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/387 from google:dependabot/maven/org.checkerframework-checker-qual-3.41.0 14463c33c078785e3a680a0b8ae79b13b361d057 PiperOrigin-RevId: 588033695 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d24278f..1987f701 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.26.0 + 3.41.0 From ee209ef842f841e2faadf1b86979d791be5b275d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 05:17:40 -0800 Subject: [PATCH 201/300] Bump com.google.auto:auto-common from 1.2.1 to 1.2.2 Bumps [com.google.auto:auto-common](https://github.com/google/auto) from 1.2.1 to 1.2.2.
Release notes

Sourced from com.google.auto:auto-common's releases.

auto-common-1.2.2

What's Changed

  • No functional changes.
  • Dependencies updated.

Full Changelog: https://github.com/google/auto/compare/auto-common-1.2.1...auto-common-1.2.2

Commits
  • 3aefd84 Set version number for auto-common
  • 7394c75 Update Auto projects to Guava 32.0.1-jre.
  • f8955c9 Prepare AutoFactoryProcessorTest for future changes.
  • d3a6beb Bump kotlin.version from 1.8.21 to 1.8.22 in /value
  • 6c5c548 Bump maven-surefire-plugin from 3.1.0 to 3.1.2 in /factory
  • 6d244be Bump maven-surefire-plugin from 3.1.0 to 3.1.2 in /value
  • 45dde3d Bump maven-failsafe-plugin from 3.1.0 to 3.1.2 in /value
  • b5345e6 Use try-with-resources instead of Closer.
  • e27cfe2 Update Guava dependencies.
  • 7d46d87 In a test, replace an obsolete JSpecify package name with a fictional one.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto:auto-common&package-manager=maven&previous-version=1.2.1&new-version=1.2.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #386 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/386 from google:dependabot/maven/com.google.auto-auto-common-1.2.2 f6fb3924d29ebcd7c8a9597557ac390c3f293940 PiperOrigin-RevId: 588034557 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1987f701..e2e06098 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ com.google.auto auto-common - 1.2.1 + 1.2.2 org.checkerframework From 2a0627a37bb2fe6301adb5c34b679c8d7228336f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 07:25:17 -0800 Subject: [PATCH 202/300] Bump org.checkerframework:checker-qual from 3.41.0 to 3.42.0 Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.41.0 to 3.42.0.
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.42.0

Version 3.42.0 (December 15, 2023)

User-visible changes:

Method annotation @AssertMethod indicates that a method checks a value and possibly throws an assertion. Using it can make flow-sensitive type refinement more effective.

In org.checkerframework.common.util.debug, renamed EmptyProcessor to DoNothingProcessor. Removed org.checkerframework.common.util.report.DoNothingChecker. Moved ReportChecker from org.checkerframework.common.util.report to org.checkerframework.common.util.count.report.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.42.0 (December 15, 2023)

User-visible changes:

Method annotation @AssertMethod indicates that a method checks a value and possibly throws an assertion. Using it can make flow-sensitive type refinement more effective.

In org.checkerframework.common.util.debug, renamed EmptyProcessor to DoNothingProcessor. Removed org.checkerframework.common.util.report.DoNothingChecker. Moved ReportChecker from org.checkerframework.common.util.report to org.checkerframework.common.util.count.report.

Commits
  • ed3a237 new release 3.42.0
  • 9053af5 Prep for release.
  • 886d0b3 Add support for opt.map(type::method) pattern. (#6370)
  • 4b5e2c9 ReportChecker: Fix array access crash
  • 3eb26a9 Fix guava-assertions.astub
  • 7906a83 Add -y, a second command-line option for exclusion
  • b38ed80 Fix Kotlin instructions
  • ae8a6e1 Add support for OptionalDouble, OptionalInt, OptionalLong
  • 17226ff Add Optional method annotations
  • 964d027 Permit Stream.filter(Optional::isPresent).map(Optional::get)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.41.0&new-version=3.42.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #388 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/388 from google:dependabot/maven/org.checkerframework-checker-qual-3.42.0 52b7db16f5f1cdb550be9e21c8dd2665ca4a88e6 PiperOrigin-RevId: 591890060 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2e06098..52e79ad4 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.41.0 + 3.42.0 From 381f5d81337eee662964e4e6eb2a7c3270a38472 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 08:17:24 -0800 Subject: [PATCH 203/300] Bump truth.version from 1.1.3 to 1.1.5 Bumps `truth.version` from 1.1.3 to 1.1.5. Updates `com.google.truth:truth` from 1.1.3 to 1.1.5
Release notes

Sourced from com.google.truth:truth's releases.

1.1.5

  • Updated Truth to depend on Guava 32.0.1. The previous Guava version, 32.0.0, contained a bug under Windows, which did not affect Truth's functionality but could cause problems for people who use Guava's I/O functionality in their codebase. Affected users can already manually update their Guava dependency to 32.0.1, but if they don't depend directly on Guava, they may find it easier to upgrade to this new Truth release instead.
  • Fixed IterableOfProtosSubject to produce a proper failure message instead of NPE when the actual value is null.

1.1.4

  • Updated Truth to build with -source 8 -target 8. This means that it no longer runs under Java 7 VMs. It continues to run under Android, even old versions, for all apps that have enabled support for Java 8 language features. (db5db2429)
  • Updated Truth to depend on Guava 32.0.0. That release contains changes related to CVEs. Neither of the CVEs relates to any methods that are used by Truth, so this version bump is just about eliminating any warnings related to the old version and helping tools like Maven to select the newest version of Guava. (f8d4dbba8adc65effba70879d59a39da092dce51, 99b1df8852a25b5638590bea1b55a31ae536936d)
  • Added support for value of: method() to expect.that, matching the existing support for assertThat. (bd8efd003)
  • Enhanced IterableSubject.containsAtLeastElementsIn().inOrder() to print an extra line that shows only the expected elements in their actual order. (9da7dd184)
  • Annotated Truth for nullness. (2151add71)
Commits

Updates `com.google.truth.extensions:truth-java8-extension` from 1.1.3 to 1.1.5 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #384 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/384 from google:dependabot/maven/truth.version-1.1.5 a068eaec7843973e91dbad46a67887c1e70aa9b2 PiperOrigin-RevId: 591903066 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52e79ad4..966b82e1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.1.3 + 1.1.5 http://github.com/google/compile-testing From a572df4980eaa3dc11fe93debe2913c58d27876f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 08:21:16 -0800 Subject: [PATCH 204/300] Bump com.google.auto.value:auto-value from 1.10 to 1.10.4 Bumps [com.google.auto.value:auto-value](https://github.com/google/auto) from 1.10 to 1.10.4.
Release notes

Sourced from com.google.auto.value:auto-value's releases.

AutoValue 1.10.4

  • A workaround for a JDK bug with reading jar resources has been extended so it always applies, rather than just as a fallback. See #1572. (3f69cd255)
  • If an AutoValue property method is @Nullable, the corresponding field in the generated class will be too. This was already the case for TYPE_USE @Nullable or if the method had @CopyAnnotations, but now @Nullable will be copied in other cases too. (4506804f1)

AutoValue 1.10.3

  • An "incompatible version" issue with Kotlin compilation has been fixed. See #1574. (b21c7f4fb)
  • A warning is now produced if a setX method in a Builder or its return type is marked @Nullable. Those methods always return the Builder instance, which is never null. (e5b4b5484)

AutoValue 1.10.2

  • The constructor parameter names in the class generated by @Memoized no longer add a $. This may require changes to code that was depending on the old names, for example using Error Prone's /* param= */ comments. (4f8dbea8a)
  • An AutoValue or AutoBuilder property is now allowed to be null if its type is a type variable with a @Nullable bound, like <T extends @Nullable Object>. (1b58cff5e)
  • Better error message when AutoValue, AutoBuilder, etc give up because of missing types. We now say what the first missing type was. (2e734f605)
  • AutoBuilder copy-constructors no longer require an exact match between a property and the corresponding constructor parameter. (1440a25e4)
  • A property of type List<T> can be built by a property builder whose build() method returns List<? extends T>. (8ba4531b8)
  • Made it easier to support @CopyAnnotations in AutoValue extensions, via new methods classAnnotationsToCopy and methodAnnotationsToCopy. (a3f218d2b)
  • Generated builders now include a @Nullable type annotation on appropriate builder fields if one is available. (91d5f32c6)
  • Updated @AutoAnnotation documentation to say that it isn't needed in Kotlin. (600b4b6d0)
  • Maven dependencies have been updated, fixing #1532.

AutoValue 1.10.1

  • Two annotations from org.jetbrains.annotations were accidentally included unshaded in the AutoValue jar. That has been fixed. (6de325b0c)
  • Fixed an issue when a builder has a property foo with both a getter foo() and a builder fooBuilder(). (3659a0e64)
Commits
  • 12a165f Set version number for auto-value-parent
  • 3f69cd2 Apply a workaround for a JDK bug unconditionally.
  • 389b6e7 Bump actions/cache from 3.3.1 to 3.3.2
  • 903ffd0 Bump com.google.truth:truth from 1.1.3 to 1.1.5 in /service
  • 905bb83 Bump com.google.testing.compile:compile-testing from 0.19 to 0.21.0 in /service
  • ab0723a Bump actions/checkout from 3.6.0 to 4.0.0
  • 1068620 Bump dev.gradleplugins:gradle-test-kit from 8.2.1 to 8.3 in /value
  • a32053e Bump actions/checkout from 3.5.3 to 3.6.0
  • 4506804 Apply @Nullable to fields in the generated class where appropriate.
  • e67ab8b Bump kotlin.version from 1.9.0 to 1.9.10 in /value
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.10&new-version=1.10.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #385 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/385 from google:dependabot/maven/com.google.auto.value-auto-value-1.10.4 da3a1de2d74f774b20057d43aea16bf66f1c7e6a PiperOrigin-RevId: 591904046 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 966b82e1..1dbea840 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.auto.value auto-value - 1.10 + 1.10.4 com.google.auto From 50f34167f467c618a0b8f3c547548466df08b248 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 09:19:44 -0800 Subject: [PATCH 205/300] Bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.0.
Release notes

Sourced from org.apache.maven.plugins:maven-compiler-plugin's releases.

3.12.0

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

Commits
  • c08b0fd [maven-release-plugin] prepare release maven-compiler-plugin-3.12.0
  • a1c5b13 [MCOMPILER-565] Allow project build by Maven 4
  • 4855773 Bump plexusCompilerVersion from 2.13.0 to 2.14.1
  • 1d05342 [MCOMPILER-562] Add property maven.compiler.outputDirectory to CompilerMojo (...
  • ea74978 [MCOMPILER-381] - Refactor incremental detection (#181)
  • fd37f09 [MCOMPILER-333] Cleanup generated source files (#214)
  • d721f0f [MCOMPILER-542] rework log and conditions to run
  • 8420d58 [MCOMPILER-542] Clean JDK patch version in module-info.class
  • 340f63c [MCOMPILER-542] add IT
  • e5375fd [MCOMPILER-558] compileSourceRoots in testCompile should be writable (#209)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.11.0&new-version=3.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #390 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/390 from google:dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.12.0 351abb696a646dd4ae28740f1a501634d8742c5a PiperOrigin-RevId: 592256562 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1dbea840..168c245b 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ maven-compiler-plugin - 3.11.0 + 3.12.0 1.8 1.8 From ea92e5cb444854cdbf36e58601c6c79d5496dcdd Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 19 Dec 2023 09:24:51 -0800 Subject: [PATCH 206/300] Bump Guava to 33.0.0. RELNOTES=n/a PiperOrigin-RevId: 592257829 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 168c245b..03ca22a5 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 32.1.3-jre + 33.0.0-jre com.google.errorprone From ca3f3c0870793f53a1093d7800ea2fd5617fac3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 06:07:14 -0800 Subject: [PATCH 207/300] Bump truth.version from 1.1.5 to 1.2.0 Bumps `truth.version` from 1.1.5 to 1.2.0. Updates `com.google.truth:truth` from 1.1.5 to 1.2.0
Release notes

Sourced from com.google.truth:truth's releases.

1.2.0

  • Fixed a bug that caused ProtoTruth to ignore the contents of unpacked Any messages. This fix may cause tests to fail, since ProtoTruth will now check whether the message contents match. If so, you may need to change the values that your tests expect, or there may be a bug in the code under test that had been hidden by the Truth bug. Sorry for the trouble. (8bd3ef613)
  • Added isWithin().of() support to IntegerSubject and LongSubject. (6464cb5ca, 0e99a2711)
Commits
  • 60873b1 Set version number for truth-parent to 1.2.0.
  • 61d7afb Bump Guava to 33.0.0.
  • cb09b47 Bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.0
  • 5da5e3f Bump org.checkerframework:checker-qual from 3.41.0 to 3.42.0
  • fde6632 Make our nullness checking work with an Android bootclasspath.
  • 3e125c7 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.2 to 3.2.3
  • 6464cb5 Add isWithin().of() support to IntegerSubject.
  • 91f4bdc Remove getSuperclass() from the j2kt API, as it's not supported and ideally w...
  • d532e91 Bump org.checkerframework:checker-qual from 3.40.0 to 3.41.0
  • 04fddbb Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3
  • Additional commits viewable in compare view

Updates `com.google.truth.extensions:truth-java8-extension` from 1.1.5 to 1.2.0 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #392 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/392 from google:dependabot/maven/truth.version-1.2.0 26dbc6ff3bd8a5d47bb61ea469ceb5e7da7013b0 PiperOrigin-RevId: 592538493 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03ca22a5..ede2d91c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.1.5 + 1.2.0 http://github.com/google/compile-testing From bb4ce8791a6cd6e6e5b9f8fed4fc138d13a32172 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Wed, 20 Dec 2023 14:54:16 -0800 Subject: [PATCH 208/300] Add JDK 17 and 21 to CI RELNOTES=n/a PiperOrigin-RevId: 592664794 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4d40889..03429df5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: name: "JDK ${{ matrix.java }}" strategy: matrix: - java: [ 8, 11 ] + java: [ 8, 11, 17, 21 ] runs-on: ubuntu-latest steps: # Cancel any previous runs for the same branch that are still running. From e794c7505bba93865705276def4aad2363906d69 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Wed, 20 Dec 2023 15:40:30 -0800 Subject: [PATCH 209/300] Fix CI for JDK 17+ The `--add-exports=` flags are required after https://openjdk.org/jeps/396 Related to https://github.com/google/compile-testing/issues/222 RELNOTES=n/a PiperOrigin-RevId: 592675658 --- pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index ede2d91c..e9deee00 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,14 @@ maven-site-plugin 3.12.1 + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.3 + + ${test.jvm.flags} + + @@ -233,5 +241,18 @@ + + add-exports + + [9,) + + + + --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED + --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + + + From 044a5a5628a548960e8464c06ffdb70ac9106cb4 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Wed, 20 Dec 2023 16:49:57 -0800 Subject: [PATCH 210/300] Improve parse error handling in compile-testing RELNOTES=Improve parse error handling PiperOrigin-RevId: 592691296 --- pom.xml | 3 + .../com/google/testing/compile/Parser.java | 130 +++++------------- .../google/testing/compile/ParserTest.java | 27 ++++ 3 files changed, 62 insertions(+), 98 deletions(-) create mode 100644 src/test/java/com/google/testing/compile/ParserTest.java diff --git a/pom.xml b/pom.xml index e9deee00..2ba7c3d0 100644 --- a/pom.xml +++ b/pom.xml @@ -251,6 +251,9 @@ --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED diff --git a/src/main/java/com/google/testing/compile/Parser.java b/src/main/java/com/google/testing/compile/Parser.java index e75d9076..c2b7314a 100644 --- a/src/main/java/com/google/testing/compile/Parser.java +++ b/src/main/java/com/google/testing/compile/Parser.java @@ -15,37 +15,33 @@ */ package com.google.testing.compile; -import static com.google.common.base.MoreObjects.firstNonNull; -import static java.lang.Boolean.TRUE; import static java.nio.charset.StandardCharsets.UTF_8; -import static java.util.function.Predicate.isEqual; import static javax.tools.Diagnostic.Kind.ERROR; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.Multimaps; import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.ErroneousTree; -import com.sun.source.tree.Tree; import com.sun.source.util.JavacTask; -import com.sun.source.util.TreeScanner; import com.sun.source.util.Trees; -import com.sun.tools.javac.api.JavacTool; +import com.sun.tools.javac.api.JavacTrees; +import com.sun.tools.javac.file.JavacFileManager; +import com.sun.tools.javac.parser.JavacParser; +import com.sun.tools.javac.parser.ParserFactory; +import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Log; import java.io.IOException; +import java.util.ArrayList; import java.util.List; -import java.util.Locale; import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; -import javax.tools.JavaCompiler; +import javax.tools.DiagnosticListener; import javax.tools.JavaFileObject; -import javax.tools.ToolProvider; /** Methods to parse Java source files. */ -public final class Parser { +final class Parser { /** * Parses {@code sources} into {@linkplain CompilationUnitTree compilation units}. This method @@ -55,89 +51,42 @@ public final class Parser { * @throws IllegalStateException if any parsing errors occur. */ static ParseResult parse(Iterable sources, String sourcesDescription) { - JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); DiagnosticCollector diagnosticCollector = new DiagnosticCollector<>(); - InMemoryJavaFileManager fileManager = - new InMemoryJavaFileManager( - compiler.getStandardFileManager(diagnosticCollector, Locale.getDefault(), UTF_8)); Context context = new Context(); - JavacTask task = - ((JavacTool) compiler) - .getTask( - null, // explicitly use the default because old javac logs some output on stderr - fileManager, - diagnosticCollector, - ImmutableSet.of(), - ImmutableSet.of(), - sources, - context); + context.put(DiagnosticListener.class, diagnosticCollector); + Log log = Log.instance(context); + // The constructor registers the instance in the Context + JavacFileManager unused = new JavacFileManager(context, true, UTF_8); + ParserFactory parserFactory = ParserFactory.instance(context); try { - Iterable parsedCompilationUnits = task.parse(); + List parsedCompilationUnits = new ArrayList<>(); + for (JavaFileObject source : sources) { + log.useSource(source); + JavacParser parser = + parserFactory.newParser( + source.getCharContent(false), + /* keepDocComments= */ true, + /* keepEndPos= */ true, + /* keepLineMap= */ true); + JCCompilationUnit unit = parser.parseCompilationUnit(); + unit.sourcefile = source; + parsedCompilationUnits.add(unit); + } List> diagnostics = diagnosticCollector.getDiagnostics(); - if (foundParseErrors(parsedCompilationUnits, diagnostics)) { + if (foundParseErrors(diagnostics)) { String msgPrefix = String.format("Error while parsing %s:\n", sourcesDescription); throw new IllegalStateException(msgPrefix + Joiner.on('\n').join(diagnostics)); } return new ParseResult( - sortDiagnosticsByKind(diagnostics), parsedCompilationUnits, Trees.instance(task)); + sortDiagnosticsByKind(diagnostics), parsedCompilationUnits, JavacTrees.instance(context)); } catch (IOException e) { throw new RuntimeException(e); - } finally { - DummyJavaCompilerSubclass.closeCompiler(context); } } - /** - * Returns {@code true} if errors were found while parsing source files. - * - *

Normally, the parser reports error diagnostics, but in some cases there are no diagnostics; - * instead the parse tree contains {@linkplain ErroneousTree "erroneous"} nodes. - */ - private static boolean foundParseErrors( - Iterable parsedCompilationUnits, - List> diagnostics) { - return diagnostics.stream().map(Diagnostic::getKind).anyMatch(isEqual(ERROR)) - || Iterables.any(parsedCompilationUnits, Parser::hasErrorNode); - } - - /** - * Returns {@code true} if the tree contains at least one {@linkplain ErroneousTree "erroneous"} - * node. - */ - private static boolean hasErrorNode(Tree tree) { - return isTrue(HAS_ERRONEOUS_NODE.scan(tree, false)); - } - - private static final TreeScanner HAS_ERRONEOUS_NODE = - new TreeScanner() { - @Override - public Boolean visitErroneous(ErroneousTree node, Boolean p) { - return true; - } - - @Override - public Boolean scan(Iterable nodes, Boolean p) { - for (Tree node : firstNonNull(nodes, ImmutableList.of())) { - if (isTrue(scan(node, p))) { - return true; - } - } - return p; - } - - @Override - public Boolean scan(Tree tree, Boolean p) { - return isTrue(p) ? p : super.scan(tree, p); - } - - @Override - public Boolean reduce(Boolean r1, Boolean r2) { - return isTrue(r1) || isTrue(r2); - } - }; - - private static boolean isTrue(Boolean p) { - return TRUE.equals(p); + /** Returns {@code true} if errors were found while parsing source files. */ + private static boolean foundParseErrors(List> diagnostics) { + return diagnostics.stream().anyMatch(d -> d.getKind().equals(ERROR)); } private static ImmutableListMultimap> @@ -184,20 +133,5 @@ Trees trees() { } } - // JavaCompiler.compilerKey has protected access until Java 9, so this is a workaround. - private static final class DummyJavaCompilerSubclass extends com.sun.tools.javac.main.JavaCompiler { - private static void closeCompiler(Context context) { - com.sun.tools.javac.main.JavaCompiler compiler = context.get(compilerKey); - if (compiler != null) { - compiler.close(); - } - } - - private DummyJavaCompilerSubclass() { - // not instantiable - super(null); - } - } - private Parser() {} } diff --git a/src/test/java/com/google/testing/compile/ParserTest.java b/src/test/java/com/google/testing/compile/ParserTest.java new file mode 100644 index 00000000..d4ae1eb1 --- /dev/null +++ b/src/test/java/com/google/testing/compile/ParserTest.java @@ -0,0 +1,27 @@ +package com.google.testing.compile; + +import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertThrows; + +import com.google.common.collect.ImmutableList; +import javax.tools.JavaFileObject; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +@RunWith(JUnit4.class) +public final class ParserTest { + + private static final JavaFileObject HELLO_WORLD_BROKEN = + JavaFileObjects.forSourceLines( + "test.HelloWorld", "package test;", "", "public class HelloWorld {", "}}"); + + @Test + public void failsToParse() { + IllegalStateException expected = + assertThrows( + IllegalStateException.class, + () -> Parser.parse(ImmutableList.of(HELLO_WORLD_BROKEN), "hello world")); + assertThat(expected).hasMessageThat().contains("HelloWorld.java:4: error"); + } +} From a69a3ab17e3a96f2e574975af38855df67587313 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 06:26:04 -0800 Subject: [PATCH 211/300] Bump com.google.errorprone:error_prone_annotations from 2.23.0 to 2.24.0 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.23.0 to 2.24.0.

Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.24.0

New checks:

Full Changelog: https://github.com/google/error-prone/compare/v2.23.0...v2.24.0

Commits
  • 2cc8504 Release Error Prone 2.24.0
  • 21c190a Document that javadoc shouldn't appear between annotations and the documented...
  • d272dfa Automated rollback of commit 654d1dbf1e6dd652cd6e8ca003643ddf02266ec2.
  • 654d1db Handle Joiner.on(...) in AbstractToString.
  • da7be27 Descend into VariableTrees when looking for variables to check.
  • affa37a Do not flag unused parameters on abstract methods.
  • d78dd6d Don't report NonFinalStaticField findings for fields modified in `@BeforeClas...
  • aadfdc3 WellKnownThreadSafety: Add common PKIX types to known thread-safe list.
  • ac52ca9 AutoValueFinalMethods: support method-level suppression.
  • 336323a Import eisop/checker-framework from GitHub.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.23.0&new-version=2.24.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #396 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/396 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.24.0 9364021fe5099737eb6bbbd7f0bacd8d98765c48 PiperOrigin-RevId: 593106469 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ba7c3d0..2f6e15d6 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.23.0 + 2.24.0 provided From 5207692822ab8b7dec51c64bf6ca8d811f566d4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Dec 2023 07:31:39 -0800 Subject: [PATCH 212/300] Bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.0 to 3.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.12.0 to 3.12.1.
Release notes

Sourced from org.apache.maven.plugins:maven-compiler-plugin's releases.

3.12.1

🐛 Bug Fixes

📦 Dependency updates

Commits
  • 736da68 [maven-release-plugin] prepare release maven-compiler-plugin-3.12.1
  • ef93f3d [MCOMPILER-568] Bump plexusCompilerVersion from 2.14.1 to 2.14.2 (#220)
  • eb7840c [MCOMPILER-567] - Fail to compile if the "generated-sources/annotations" does...
  • 2a7a73b [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.12.0&new-version=3.12.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #397 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/397 from google:dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.12.1 6c0feba40f0b7d476baf3b081197967939a1c23c PiperOrigin-RevId: 593788885 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f6e15d6..8e37ef54 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ maven-compiler-plugin - 3.12.0 + 3.12.1 1.8 1.8 From 25adc2714c52073e3e156db559f1b7063d03a342 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 06:37:52 -0800 Subject: [PATCH 213/300] Bump com.google.errorprone:error_prone_annotations from 2.24.0 to 2.24.1 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.24.0 to 2.24.1.
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.24.1

Changes:

Full Changelog: https://github.com/google/error-prone/compare/v2.24.0...v2.24.1

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.24.0&new-version=2.24.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #398 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/398 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.24.1 bbe0eddbda676999bd1f2313cc5c651bcf2b2f55 PiperOrigin-RevId: 595689310 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e37ef54..1c17cb7a 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.24.0 + 2.24.1 provided From cb9ce1634c02b2a213a28e58ebaf6a6d2e1459d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 06:31:33 -0800 Subject: [PATCH 214/300] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5.
Release notes

Sourced from org.apache.maven.plugins:maven-surefire-plugin's releases.

3.2.5

JIRA link

Release Notes - Maven Surefire - Version 3.2.5

What's Changed

... (truncated)

Commits
  • 4b3a271 [maven-release-plugin] prepare release surefire-3.2.5
  • eb3f1d9 Bump org.codehaus.plexus:plexus-component-metadata from 2.1.1 to 2.2.0
  • 430c406 Bump org.assertj:assertj-core from 3.24.2 to 3.25.1
  • 2d92f2d [SUREFIRE-2231] JaCoCo 0.8.11 fails with old TestNG releases on Java 17+
  • 3290740 Bump org.apache.maven.plugins:maven-docck-plugin from 1.1 to 1.2
  • 25a9776 Bump net.java.dev.javacc:javacc from 7.0.12 to 7.0.13
  • 7752f7e Bump commons-io:commons-io from 2.15.0 to 2.15.1
  • 8874add Revert "Bump jacocoVersion from 0.8.8 to 0.8.11"
  • c0f7755 Fix formatting
  • e5f4545 Bump jacocoVersion from 0.8.8 to 0.8.11
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-surefire-plugin&package-manager=maven&previous-version=3.2.3&new-version=3.2.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #400 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/400 from google:dependabot/maven/org.apache.maven.plugins-maven-surefire-plugin-3.2.5 eb0d0d076e0db04ac73c4206c1675e517673f8bf PiperOrigin-RevId: 597232906 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c17cb7a..7ce5a5da 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.3 + 3.2.5 ${test.jvm.flags} From 67712d046caf8de1626136d3e52b1de78dded0fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 08:44:32 -0800 Subject: [PATCH 215/300] Bump truth.version from 1.2.0 to 1.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps `truth.version` from 1.2.0 to 1.3.0. Updates `com.google.truth:truth` from 1.2.0 to 1.3.0
Release notes

Sourced from com.google.truth:truth's releases.

1.3.0

In this release, our assertions on Java 8 types begin to move from the truth-java8-extensions artifact and the Truth8 class to the main truth artifact and the Truth class. This change should not break compatibility for anyone, even users who test under old versions of Android without API desugaring. Additionally, we will never break binary compatibility, though some users will have to make changes to their source code in order for it to compile against newer versions.

This change will be routine for most users, but we're providing as much information as we can for any users who do encounter problems.

We will post fuller instructions for migration later on, once we've learned more from our internal migration efforts. For now, you may find that you need to make one kind of change, and you may elect to make others. (If we missed anything, please open an issue to report problems or request help.)

The change you might need to make:

  • By adding new overloads of Truth.assertThat, we cause some code to fail to compile because of an overload ambiguity. This is rare, but it can happen if you static import both Truth.assertThat and some other assertThat method that includes overloads for Optional or Stream. (It does not happen for Truth8.assertThat, though, except with the Eclipse compiler. Nor it does necessarily happen for other assertThat(Stream) and assertThat(Optional) methods.) If this happens to you, you'll need to remove one of the static imports, changing the corresponding call sites from "assertThat" to "FooSubject.assertThat."
    • Alternatively, you may choose to wait until we make further changes to the new Truth.assertThat overloads. Once we make those further changes, you may be able to simultaneously replace all your imports of Truth8.assertThat with imports of Truth.assertThat as you upgrade to the new version, likely without introducing overload ambiguities.

The changes you might elect to make:

  • If you use Truth8.assertThat(Stream) or Truth8.assertThat(Optional), you can migrate to the new overloads in Truth. If you static import Truth8.assertThat, you can usually make this change simply by replacing that static import with a static import of Truth.assertThat—or, if you already have an import of Truth.assertThat, by just removing the import of Truth8.assertThat. (If you additionally use less common assertion methods, like assertThat(OptionalInt), you'll want to use both imports for now. Later, we'll move assertThat(OptionalInt) and friends, too.) We recommend making this change now, since your calls to Truth8.assertThat will fail to compile against some future version of Truth, unless you plan to wait to update your Truth dependency until we've made all our changes for Java 8 types.

  • If you use assertWithMessage(...).about(streams()).that(...), expect.about(optionals()).that(...), or similar, you can remove your call to about. This change will never be necessary; it is just a simplification.

  • If you depend on truth-java8-extension, you may remove it. All its classes are now part of the main truth artifact. This change, too, is not necessary; it is just a simplification. (OK, if your build system has a concept of strict deps, there is a chance that you'll need to add deps on truth to replace your deps on truth-java8-extension.)

Finally, the changelog for this release:

  • Made StreamSubject avoid collecting the Stream until necessary, and made its isEqualTo and isNotEqualTo methods no longer always throw. (f8ecaec69)
  • Added assertThat overloads for Optional and Stream to the main Truth class. (37fd8bea9)
  • Added that overloads to make it possible to write type-specific assertions when using expect.that(optional) and expect.that(stream). (ca7e8f4c5)
  • Moved the truth-java8-extension classes into the main truth artifact. There is no longer any need to depend on truth-java8-extension, which is now empty. (We've also removed the Truth8 GWT module.) (eb0426eb7)

Again, if you have any problems, please let us know.

Commits
  • abf9e15 Set version number for truth-parent to 1.3.0.
  • 93b4d93 Add @since tags for the first batch of Java-8-related APIs.
  • 78d27dd Remove stale suppressions.
  • 7be930d Bump actions/cache from 3.3.3 to 4.0.0
  • 16db780 Make "value of" lines work with StreamSubject.
  • 37fd8be Copy Truth8.assertThat overloads for Optional and Stream to the main `T...
  • ca7e8f4 Make it possible to write expect.that(optional).isPresent(), `assertWithMes...
  • f8ecaec Prepare StreamSubject for adding Truth.assertThat(Stream).
  • 795a9cf Bump actions/cache from 3.3.2 to 3.3.3
  • 7dab78f Bump com.google.protobuf:protobuf-java from 3.25.1 to 3.25.2
  • Additional commits viewable in compare view

Updates `com.google.truth.extensions:truth-java8-extension` from 1.2.0 to 1.3.0 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #402 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/402 from google:dependabot/maven/truth.version-1.3.0 8d20a1603f0d70c4981cd1f37bafc2a57f3a9b06 PiperOrigin-RevId: 600468686 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ce5a5da..b3bad048 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.2.0 + 1.3.0 http://github.com/google/compile-testing From 6493d6f341fd5628e8680b7c2f75e085692c0e9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 06:17:23 -0800 Subject: [PATCH 216/300] Bump styfle/cancel-workflow-action from 0.12.0 to 0.12.1 Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.12.0 to 0.12.1.
Release notes

Sourced from styfle/cancel-workflow-action's releases.

0.12.1

Patches

  • Fix: bump to node20: #212
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=styfle/cancel-workflow-action&package-manager=github_actions&previous-version=0.12.0&new-version=0.12.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #403 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/403 from google:dependabot/github_actions/styfle/cancel-workflow-action-0.12.1 cb3f36ac0b9a0b8886d750808f217685dab47c2a PiperOrigin-RevId: 601746365 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03429df5..ed45b769 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: # Cancel any previous runs for the same branch that are still running. - name: 'Cancel previous runs' - uses: styfle/cancel-workflow-action@01ce38bf961b4e243a6342cbade0dbc8ba3f0432 + uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa with: access_token: ${{ github.token }} - name: 'Check out repository' From 5d3aaffc1285cb0c7e4899b1559b4f507b23936f Mon Sep 17 00:00:00 2001 From: cpovirk Date: Wed, 31 Jan 2024 09:56:34 -0800 Subject: [PATCH 217/300] Automated Code Change PiperOrigin-RevId: 603080567 --- .../com/google/testing/compile/CompilationTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/google/testing/compile/CompilationTest.java b/src/test/java/com/google/testing/compile/CompilationTest.java index 51f830ce..21d1eb12 100644 --- a/src/test/java/com/google/testing/compile/CompilationTest.java +++ b/src/test/java/com/google/testing/compile/CompilationTest.java @@ -17,13 +17,13 @@ package com.google.testing.compile; import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth8.assertThat; import static com.google.testing.compile.CompilationSubject.assertThat; import static com.google.testing.compile.Compiler.javac; import static javax.tools.StandardLocation.SOURCE_OUTPUT; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; +import com.google.common.truth.Truth8; import javax.tools.JavaFileObject; import org.junit.Test; import org.junit.runner.RunWith; @@ -75,21 +75,23 @@ public void compilerStatusFailure() { public void generatedFilePath() { Compiler compiler = compilerWithGenerator(); Compilation compilation = compiler.compile(source1, source2); - assertThat(compilation.generatedFile(SOURCE_OUTPUT, "test/generated/Blah.java")).isPresent(); + Truth8.assertThat(compilation.generatedFile(SOURCE_OUTPUT, "test/generated/Blah.java")) + .isPresent(); } @Test public void generatedFilePackage() { Compiler compiler = compilerWithGenerator(); Compilation compilation = compiler.compile(source1, source2); - assertThat(compilation.generatedFile(SOURCE_OUTPUT, "test.generated", "Blah.java")).isPresent(); + Truth8.assertThat(compilation.generatedFile(SOURCE_OUTPUT, "test.generated", "Blah.java")) + .isPresent(); } @Test public void generatedSourceFile() { Compiler compiler = compilerWithGenerator(); Compilation compilation = compiler.compile(source1, source2); - assertThat(compilation.generatedSourceFile("test.generated.Blah")).isPresent(); + Truth8.assertThat(compilation.generatedSourceFile("test.generated.Blah")).isPresent(); } private static Compiler compilerWithGenerator() { From 293e7d3091438daf7814641480bb09b0ea366c34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 06:50:17 -0800 Subject: [PATCH 218/300] Bump truth.version from 1.3.0 to 1.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps `truth.version` from 1.3.0 to 1.4.0. Updates `com.google.truth:truth` from 1.3.0 to 1.4.0
Release notes

Sourced from com.google.truth:truth's releases.

1.4.0

In this release, our assertions on Java 8 types continue to move from the Truth8 class to the main Truth class. This change should not break compatibility for any supported JDK or Android version, even users who test under old versions of Android without API desugaring. Additionally, we will never break binary compatibility, though some users will have to make changes to their source code in order for it to compile against newer versions.

This release is likely to lead to more build failures than 1.3.0 did. However, those failures should be straightforward to fix.

Example build failure

Foo.java:152: error: reference to assertThat is ambiguous
    assertThat(repo.findFileWithName("foo")).isNull();
    ^
  both method assertThat(@org.jspecify.nullness.Nullable Path) in Truth8 and method assertThat(@org.jspecify.nullness.Nullable Path) in Truth match

Simplest upgrade strategy (if you can update all your code atomically in the same commit as the Truth upgrade)

In the same commit:

  1. Upgrade Truth to 1.4.0.
  2. Replace import static com.google.common.truth.Truth8.assertThat; with import static com.google.common.truth.Truth.assertThat;.
    • If you use Kotlin, replace import com.google.common.truth.Truth8.assertThat with import com.google.common.truth.Truth.assertThat.
  3. Replace import com.google.common.truth.Truth8; with import com.google.common.truth.Truth;.
    • again, similarly for Kotlin if needed
  4. Replace remaining references to Truth8 with references to Truth.
    • For example, replace Truth8.assertThat(optional).isPresent() with Truth.assertThat(optional).isPresent().

If you're feeling lucky, you can try this one-liner for the code updates:

git grep -l Truth8 | xargs perl -pi -e 's/import static com.google.common.truth.Truth8.assertThat;/import static com.google.common.truth.Truth.assertThat;/g; s/import com.google.common.truth.Truth8.assertThat/import com.google.common.truth.Truth.assertThat/g; s/import com.google.common.truth.Truth8/import com.google.common.truth.Truth/g; s/\bTruth8[.]/Truth./g;'

After that process, it is possible that you'll still see build errors from ambiguous usages of assertThat static imports. If so, you can find a workaround in the section about overload ambiguity in the release notes for 1.3.0. Alternatively, you can wait to upgrade until after a future Truth release, which will eliminate the ambiguity by changing the signatures of some Truth.assertThat overloads.

Incremental upgrade strategy

If you have a very large repo or you have other reasons to prefer to upgrade incrementally, you can use the approach that we used inside Google. Roughly, that approach was:

  1. Make the optional changes discussed in the release notes for 1.3.0.
  2. For any remaining calls to Truth8.assertThat, change them to avoid static import.
    • That is, replace assertThat(optional).isPresent() with Truth8.assertThat(optional).isPresent().
  3. Upgrade Truth to 1.4.0.
  4. Optionally replace references to Truth8 with references to Truth (including restoring static imports if desired), as discussed in section about the simple upgrade strategy above.

Optional additional changes

  • If you use assertWithMessage(...).about(intStreams()).that(...), expect.about(optionalLongs()).that(...), or similar, you can remove your call to about. This change will never be necessary; it is just a simplification.
    • This is similar to a previous optional change from 1.3.0, except that 1.3.0 solved this problem for streams and optionals, whereas 1.4.0 solves it for the other Truth8 types.

For help

... (truncated)

Commits
  • 2e8e488 Set version number for truth-parent to 1.4.0.
  • 1f81827 Copy Truth8.assertThat overloads for Path and OptionalLong to the main ...
  • 9be8e77 Copy remaining Truth8.assertThat overloads to the main Truth class—except...
  • b02a658 Migrate most usages of Truth8.assertThat to equivalent usages of `Truth.ass...
  • 0999369 Automated Code Change
  • 7c65fc6 Make it possible to write expect.that(optionalInt).isPresent(), `assertWith...
  • 87b371d Bump styfle/cancel-workflow-action from 0.12.0 to 0.12.1
  • See full diff in compare view

Updates `com.google.truth.extensions:truth-java8-extension` from 1.3.0 to 1.4.0 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #405 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/405 from google:dependabot/maven/truth.version-1.4.0 c9ca2fabbe769afb60f3ac5b4635fc93ebd5e03f PiperOrigin-RevId: 604303548 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3bad048..ad3a5c42 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.3.0 + 1.4.0 http://github.com/google/compile-testing From 997b1b406935e41b03bee2176828205e95524158 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 6 Feb 2024 10:31:55 -0800 Subject: [PATCH 219/300] Migrate usages of `Truth8.assertThat` to equivalent usages of `Truth.assertThat`. The `Truth8` methods will be hidden in the future. All callers will use `Truth`. PiperOrigin-RevId: 604692296 --- .../java/com/google/testing/compile/CompilationTest.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/google/testing/compile/CompilationTest.java b/src/test/java/com/google/testing/compile/CompilationTest.java index 21d1eb12..c8921c9f 100644 --- a/src/test/java/com/google/testing/compile/CompilationTest.java +++ b/src/test/java/com/google/testing/compile/CompilationTest.java @@ -23,7 +23,6 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; -import com.google.common.truth.Truth8; import javax.tools.JavaFileObject; import org.junit.Test; import org.junit.runner.RunWith; @@ -75,23 +74,21 @@ public void compilerStatusFailure() { public void generatedFilePath() { Compiler compiler = compilerWithGenerator(); Compilation compilation = compiler.compile(source1, source2); - Truth8.assertThat(compilation.generatedFile(SOURCE_OUTPUT, "test/generated/Blah.java")) - .isPresent(); + assertThat(compilation.generatedFile(SOURCE_OUTPUT, "test/generated/Blah.java")).isPresent(); } @Test public void generatedFilePackage() { Compiler compiler = compilerWithGenerator(); Compilation compilation = compiler.compile(source1, source2); - Truth8.assertThat(compilation.generatedFile(SOURCE_OUTPUT, "test.generated", "Blah.java")) - .isPresent(); + assertThat(compilation.generatedFile(SOURCE_OUTPUT, "test.generated", "Blah.java")).isPresent(); } @Test public void generatedSourceFile() { Compiler compiler = compilerWithGenerator(); Compilation compilation = compiler.compile(source1, source2); - Truth8.assertThat(compilation.generatedSourceFile("test.generated.Blah")).isPresent(); + assertThat(compilation.generatedSourceFile("test.generated.Blah")).isPresent(); } private static Compiler compilerWithGenerator() { From 539905b96c4ab4e96eef239092a47c4bc9f3f78e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 07:06:13 -0800 Subject: [PATCH 220/300] Bump com.google.errorprone:error_prone_annotations from 2.24.1 to 2.25.0 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.24.1 to 2.25.0.
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.25.0

New checks:

Closed issues: #4195, #4224, #4228, #4248, #4249, #4251

Full Changelog: https://github.com/google/error-prone/compare/v2.24.1...v2.25.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.24.1&new-version=2.25.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #407 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/407 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.25.0 af4958c76db2e83ff53374dfd9d7e80ff12eba76 PiperOrigin-RevId: 608328859 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad3a5c42..7c758efd 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.24.1 + 2.25.0 provided From 9fbbf7af9b11c3be2de5a5ed330c6a0f1f8e7069 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 08:27:14 -0800 Subject: [PATCH 221/300] Bump truth.version from 1.4.0 to 1.4.1 Bumps `truth.version` from 1.4.0 to 1.4.1. Updates `com.google.truth:truth` from 1.4.0 to 1.4.1
Release notes

Sourced from com.google.truth:truth's releases.

1.4.1

This release deprecates Truth8.

All its methods have become available on the main Truth class. In most cases, you can migrate your whole project mechanically: git grep -l Truth8 | xargs perl -pi -e 's/\bTruth8\b/Truth/g;'

While we do not plan to delete Truth8, we recommend migrating off it, at least if you static import assertThat: If you do not migrate, such static imports will become ambiguous in Truth 1.4.2, breaking your build.

Commits
  • a920d7d Set version number for truth-parent to 1.4.1.
  • 3406074 Document more about how and why to migrate off Truth8.
  • 2be0061 Update docs to reflect that the Java 8 assertions have "moved" to the main `T...
  • See full diff in compare view

Updates `com.google.truth.extensions:truth-java8-extension` from 1.4.0 to 1.4.1 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #408 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/408 from google:dependabot/maven/truth.version-1.4.1 da303d94ba4a6b396c836e2a323b4adde2a820ef PiperOrigin-RevId: 608613801 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c758efd..7b091561 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.4.0 + 1.4.1 http://github.com/google/compile-testing From d8e4b5b351be7c968423483d6275d4adee30644a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 06:33:58 -0800 Subject: [PATCH 222/300] Bump actions/setup-java from 4.0.0 to 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.0.0 to 4.1.0.
Release notes

Sourced from actions/setup-java's releases.

V4.1.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.1.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.0.0&new-version=4.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #409 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/409 from google:dependabot/github_actions/actions/setup-java-4.1.0 0e5af482a94bbd76ec999937f5e3636a275c0e33 PiperOrigin-RevId: 611083139 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed45b769..85284e6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 3952ab4ed592ca9a7c73d9ff2e5b67e09e259b17 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Thu, 29 Feb 2024 14:24:11 -0800 Subject: [PATCH 223/300] Bump Truth to 1.4.2. RELNOTES=n/a PiperOrigin-RevId: 611595426 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b091561..18176a42 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.4.1 + 1.4.2 http://github.com/google/compile-testing From fd98695c94c6bd387b14bae023467f5ab66cfb8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 06:58:30 -0700 Subject: [PATCH 224/300] Bump org.apache.maven.plugins:maven-gpg-plugin from 3.1.0 to 3.2.0 Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.1.0 to 3.2.0.
Release notes

Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.

3.2.0

Release Notes - Maven GPG Plugin - Version 3.2.0

... (truncated)

Commits
  • 4b23da8 [maven-release-plugin] prepare release maven-gpg-plugin-3.2.0
  • 56645dd Fix tag template
  • 036dfe0 [MGPG-105] [MGPG-108] Make plugin backward compat and update site and doco (#77)
  • 0771b61 [MGPG-110] SignAndDeployFileMojo validation is off (#78)
  • 23b64f2 [MGPG-99] Make sure newline is added to input stream (#76)
  • 9a73f90 [MGPG-105] Make possible backward compatibility (#74)
  • 6a94f3a Bump apache/maven-gh-actions-shared from 3 to 4 (#75)
  • 6f50819 [MGPG-106] Introduce new signer: BC (#72)
  • ea35e2c [MGPG-105] Stop propagating bad practices (#71)
  • 6081ad4 [MGPG-107] Settle on JUnit 5 (#70)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-gpg-plugin&package-manager=maven&previous-version=3.1.0&new-version=3.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #411 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/411 from google:dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.2.0 cf2ec28780eca600f30b46340e3e9fda884e1cf5 PiperOrigin-RevId: 614649668 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 18176a42..3d684d76 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.0 sign-artifacts From aa3032498348016bbddf890cf5d0871b53041c75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 06:01:03 -0700 Subject: [PATCH 225/300] Bump com.google.errorprone:error_prone_annotations from 2.25.0 to 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.25.0 to 2.26.0.
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.26.0

Changes:

  • The 'annotations' artifact now includes a module-info.java for Java Platform Module System support, thanks to @​sgammon in #4311.
  • Disabled checks passed to -XepPatchChecks are now ignored, instead of causing a crash. Thanks to @​oxkitsune in #4028.

New checks:

  • SystemConsoleNull: Null-checking System.console() is not a reliable way to detect if the console is connected to a terminal.
  • EnumOrdinal: Discourage uses of Enum.ordinal()

Closed issues: #2649, #3908, #4028, #4311, #4314

Full Changelog: https://github.com/google/error-prone/compare/v2.25.0...v2.26.0

Commits
  • ad1c05b Release Error Prone 2.26.0
  • ea5ef6d Add the 'compile' goal for 'compile-java9'
  • 0e95364 feat: add jpms definition for annotations
  • 9da2d55 Ignore disabled checks passed to -XepPatchChecks
  • 3292632 Increase year range on Date usages.
  • ad513d5 Recommend using var for var unused = ...; and `var thrown = assertThrows(...
  • af37d35 ImpossibleNullComparison: emit empty fixes.
  • 297019c Fix some mistakes in the EnumOrdinal examples
  • f3dbb09 Move the EnumOrdinal.md doc to the right place (it got overwritten by automat...
  • f768b0b Fix handling of default cases in arrow switches
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.25.0&new-version=2.26.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #412 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/412 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.26.0 7d7b8ad48c3256a74cb6d9b0ae7d46a9cf2679fb PiperOrigin-RevId: 615011915 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d684d76..f15ba958 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.25.0 + 2.26.0 provided From 72e2e0c546b5336b1f22c92218a08e055db3c6b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:18:18 -0700 Subject: [PATCH 226/300] Bump com.google.errorprone:error_prone_annotations from 2.26.0 to 2.26.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.26.0 to 2.26.1.
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.26.1

This release contains all of the changes in 2.26.0, plus a bug fix to the module name of the annotations artifact com.google.errorprone.annotations (https://github.com/google/error-prone/commit/9d99ee76f2ca8568b69150f5df7fe845c8545d16)

Starting in 2.26.x, the 'annotations' artifact now includes a module-info.java for Java Platform Module System support, thanks to @​sgammon in #4311.

Compatibility note:

Now that the annotations artifact explicit declares a module instead of relying on Automatic-Module-Name, JDK 17 and newer perform stricter module encapsulation checks. Modularized libraries depending on Error Prone annotations 2.26.x and newer may see errors like:

error: package com.google.errorprone.annotations is not visible
import com.google.errorprone.annotations.CheckReturnValue;
                            ^
  (package com.google.errorprone.annotations is declared in module com.google.errorprone.annotations, but module ... does not read it)

The fix is to add requires static to the module declaration of modularized libraries that depend on Error Prone annotations:

 module your.module {
...
+  requires static com.google.errorprone.annotations;
 }

Full Changelog: https://github.com/google/error-prone/compare/v2.26.0...v2.26.1

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.26.0&new-version=2.26.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #414 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/414 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.26.1 c6cf1cb3aec8c6e5e9afb56fadeb131b1f229565 PiperOrigin-RevId: 615462236 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f15ba958..6ecc2f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.26.0 + 2.26.1 provided From b90849921f7291861869323fd9938013ea6cbc65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:18:27 -0700 Subject: [PATCH 227/300] Bump actions/checkout from 4.1.1 to 4.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2.
Release notes

Sourced from actions/checkout's releases.

v4.1.2

We are investigating the following issue with this release and have rolled-back the v4 tag to point to v4.1.1

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v4.1.1...v4.1.2

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.1.2

v4.1.1

v4.1.0

v4.0.0

v3.6.0

v3.5.3

v3.5.2

v3.5.1

v3.5.0

v3.4.0

v3.3.0

v3.2.0

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.1&new-version=4.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #413 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/413 from google:dependabot/github_actions/actions/checkout-4.1.2 2944274b8714b3600f42a8244e45ccf1ae4914fc PiperOrigin-RevId: 615462317 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85284e6a..bfceed25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 with: From 4280b83b20d1b15dfbe708b0bd16b9ff9366741e Mon Sep 17 00:00:00 2001 From: cpovirk Date: Wed, 13 Mar 2024 13:00:58 -0700 Subject: [PATCH 228/300] Bump Guava to 33.1.0. RELNOTES=n/a PiperOrigin-RevId: 615516851 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ecc2f5f..c91f355a 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.0.0-jre + 33.1.0-jre com.google.errorprone From 2d465779396525407b59c665d9fdab5c77591a89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 07:06:19 -0700 Subject: [PATCH 229/300] Bump actions/setup-java from 4.1.0 to 4.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.1.0 to 4.2.0.
Release notes

Sourced from actions/setup-java's releases.

v4.2.0

What's Changed

New Contributors

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.1.0&new-version=4.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #416 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/416 from google:dependabot/github_actions/actions/setup-java-4.2.0 dacbb2cd31a70d35c28c3e67fcf256837592d86c PiperOrigin-RevId: 615765451 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfceed25..906f0b1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 + uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 233a5708a665e1f99b7b87d496dd86413cd5be28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 06:54:08 -0700 Subject: [PATCH 230/300] Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.0 to 3.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.0 to 3.2.1.
Release notes

Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.

3.2.1

JIRA link

Release Notes - Maven GPG Plugin - Version 3.2.1

What's Changed

Full Changelog: https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.0...maven-gpg-plugin-3.2.1

Commits
  • 5b69086 [maven-release-plugin] prepare release maven-gpg-plugin-3.2.1
  • 28d298c [MGPG-111] Fix dependencies (#81)
  • 75d8ed5 [MGPG-112] serverId def value was unintentionally dropped (#80)
  • 2a11a2d [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-gpg-plugin&package-manager=maven&previous-version=3.2.0&new-version=3.2.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #418 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/418 from google:dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.2.1 4076aa8732601b50104c8884140221bc203940b7 PiperOrigin-RevId: 616813438 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c91f355a..62b39210 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.0 + 3.2.1 sign-artifacts From 21a424d81e22837e303b222099d29fefe05b8d26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:56:01 -0700 Subject: [PATCH 231/300] Bump actions/setup-java from 4.2.0 to 4.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.0 to 4.2.1.
Release notes

Sourced from actions/setup-java's releases.

v4.2.1

What's Changed

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.2.1

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.2.0&new-version=4.2.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #417 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/417 from google:dependabot/github_actions/actions/setup-java-4.2.1 fb3c5895a651da65b5d8fe1698420f001bb2a847 PiperOrigin-RevId: 616902477 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 906f0b1e..88da3098 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 818683dc99af372e8580ecfbd818f7db80365a7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 06:36:12 -0700 Subject: [PATCH 232/300] Bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.1 to 3.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.12.1 to 3.13.0.
Release notes

Sourced from org.apache.maven.plugins:maven-compiler-plugin's releases.

3.13.0

🚀 New features and improvements

📦 Dependency updates

📝 Documentation updates

👻 Maintenance

Commits
  • a1415aa [maven-release-plugin] prepare release maven-compiler-plugin-3.13.0
  • b2b9196 [MCOMPILER-574] Propagate cause of exception in AbstractCompilerMojo
  • 6d2ce5a [MCOMPILER-584] Refresh page - Using Non-Javac Compilers
  • eebad60 [MCOMPILER-585] Refresh plugins versions in ITs
  • ceacf68 [MCOMPILER-582] Automatic detection of release option for JDK < 9
  • 110293f [MCOMPILER-583] Require Maven 3.6.3
  • 90131df [MCOMPILER-575] Bump plexusCompilerVersion from 2.14.2 to 2.15.0 (#227)
  • 74cfc72 [MCOMPILER-548] JDK 21 throws annotations processing warning that can not be ...
  • f85aa27 Bump apache/maven-gh-actions-shared from 3 to 4
  • d59ef49 extract Maven 3.3.1 specific method call
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.12.1&new-version=3.13.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #419 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/419 from google:dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.13.0 71ca0b41ebf8c02943b6307432312f0ecfc6edcb PiperOrigin-RevId: 617153770 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62b39210..914c5918 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ maven-compiler-plugin - 3.12.1 + 3.13.0 1.8 1.8 From a94ff34fb53f88e4085a8eab4f36ec2b8265a13d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 06:12:19 -0700 Subject: [PATCH 233/300] Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.1 to 3.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.1 to 3.2.2.
Release notes

Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.

3.2.2

JiRA link

Release Notes - Maven GPG Plugin - Version 3.2.2

What's Changed

Full Changelog: https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.1...maven-gpg-plugin-3.2.2

Commits
  • ab97064 [maven-release-plugin] prepare release maven-gpg-plugin-3.2.2
  • 2be0a00 [MGPG-115] Show more info about key used to sign (#84)
  • 3631830 [MGPG-114] Allow max key size of 16KB (#83)
  • 528fab9 [MGPG-113] SignAndDeployFileMojo results in 401 (#82)
  • 770636b [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-gpg-plugin&package-manager=maven&previous-version=3.2.1&new-version=3.2.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #420 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/420 from google:dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.2.2 74484d5b23396df11332a2f22bdc3682c4f859a6 PiperOrigin-RevId: 619165792 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 914c5918..45fad326 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.1 + 3.2.2 sign-artifacts From 4c733e3923d60dbc12050166582fd47b9ca7d769 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 07:47:17 -0700 Subject: [PATCH 234/300] Bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.3.0 to 3.3.1.
Commits
  • f80596e [maven-release-plugin] prepare release maven-source-plugin-3.3.1
  • 7626998 Bump apache/maven-gh-actions-shared from 3 to 4
  • 83c963c Bump org.apache.maven.plugins:maven-plugins from 39 to 41 (#18)
  • 40ae495 Bump org.codehaus.plexus:plexus-archiver from 4.8.0 to 4.9.1 (#20)
  • 073462b Bump org.apache.maven:maven-archiver from 3.6.0 to 3.6.1 (#21)
  • 0b1c823 Fix typos in AbstractSourceJarMojo exception
  • 099c65a [MSOURCES-142] Bump org.codehaus.plexus:plexus-archiver from 4.7.1 to 4.8.0 (...
  • 1edeea4 [MSOURCES-139] Fix typo in AbstractSourceJarMojo exception
  • 436966e [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-source-plugin&package-manager=maven&previous-version=3.3.0&new-version=3.3.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #421 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/421 from google:dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1 aea8749a1a215edcae2aa9cf6ff7d1ec28b9cb59 PiperOrigin-RevId: 622177203 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45fad326..86199d75 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources From ec30b2e04a367a0a8fe43d2a3c6e504e322e9bd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 06:09:56 -0700 Subject: [PATCH 235/300] Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.2 to 3.2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.2 to 3.2.3.
Release notes

Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.

3.2.3

Release Notes - Maven GPG Plugin - Version 3.2.3

📦 Dependency updates

... (truncated)

Commits
  • 89b91a4 [maven-release-plugin] prepare release maven-gpg-plugin-3.2.3
  • fc2efa3 [MGPG-123][MGPG-124] Dependency upgrades (#93)
  • 50222d3 [MGPG-120] New mojo sign-deployed (#88)
  • a6c3a09 [MGPG-122] Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.0 to 3...
  • 78f5e37 [MGPG-121] Return the workaround for pseudo security (#90)
  • 582df74 [MGPG-117] Improve passphrase handling (#86)
  • 0adc6b8 [MGPG-118] Bump commons-io:commons-io from 2.15.1 to 2.16.0 (#87)
  • ef57091 [MGPG-116] Up max key file size to 64K (#85)
  • 944be4e [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-gpg-plugin&package-manager=maven&previous-version=3.2.2&new-version=3.2.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #422 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/422 from google:dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.2.3 425cb7ceafbf853d96ada34bebb5055be7c9dd7a PiperOrigin-RevId: 623803334 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 86199d75..84a4ae15 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.2 + 3.2.3 sign-artifacts From 4d4d64e9fbae1d14d08f038e42e4659e33001119 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 06:17:13 -0700 Subject: [PATCH 236/300] Bump org.apache.maven.plugins:maven-jar-plugin from 3.3.0 to 3.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.3.0 to 3.4.0.
Release notes

Sourced from org.apache.maven.plugins:maven-jar-plugin's releases.

3.4.0

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

Commits
  • 992f44a [maven-release-plugin] prepare release maven-jar-plugin-3.4.0
  • 5e31b99 [MJAR-296] Allow including files excluded by default. (#67)
  • ddfb635 [MJAR-306] Use properties for plugins versions in LifecycleMapping
  • aeffa39 [MJAR-304] Refresh download page
  • ee85d59 [MJAR-303] Cleanup declared dependencies
  • 845c120 Bump org.junit:junit-bom from 5.10.1 to 5.10.2
  • 8dd0d3f [MJAR-298] Update Maven-Archiver to 3.6.2
  • 1b958d1 [MJAR-302] Require Maven 3.6.3
  • fa4330f [MJAR-62] Set Build-Jdk according to used toolchain
  • adf1c76 Bump apache/maven-gh-actions-shared from 2 to 4
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-jar-plugin&package-manager=maven&previous-version=3.3.0&new-version=3.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #423 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/423 from google:dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.4.0 c4797fa6a18acbe8fcd2e145ee00d187bbd93189 PiperOrigin-RevId: 624936755 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84a4ae15..982438c4 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ maven-jar-plugin - 3.3.0 + 3.4.0 maven-javadoc-plugin From b11426945b2a1cecec7c8180a872053e87127fe6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 07:21:09 -0700 Subject: [PATCH 237/300] Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.3 to 3.2.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.3 to 3.2.4.
Release notes

Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.

3.2.4

Release Notes - Maven GPG Plugin - Version 3.2.4

📦 Dependency updates

Commits
  • 789149e [maven-release-plugin] prepare release maven-gpg-plugin-3.2.4
  • 893aedc [MGPG-125] Fix "bestPractices" (#95)
  • b6f0324 [MGPG-126] Bump commons-io:commons-io from 2.16.0 to 2.16.1 (#94)
  • 3c5878b [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-gpg-plugin&package-manager=maven&previous-version=3.2.3&new-version=3.2.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #424 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/424 from google:dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.2.4 82318baa06fa194c2cbdb04727ce2308c90c8e6d PiperOrigin-RevId: 626358026 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 982438c4..872e7389 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sign-artifacts From c2fe60e0d41e45d01915712b55b6a3c30c9371cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 07:24:00 -0700 Subject: [PATCH 238/300] Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.0 to 3.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.0 to 3.4.1.
Release notes

Sourced from org.apache.maven.plugins:maven-jar-plugin's releases.

3.4.1

🐛 Bug Fixes

📦 Dependency updates

Commits
  • 8b29adc [maven-release-plugin] prepare release maven-jar-plugin-3.4.1
  • 325b299 [MJAR-308] Bump org.apache.maven.plugins:maven-plugins from 41 to 42 (#85)
  • 52111cc [MJAR-307] Wrong version of commons-io cause a ClassNotFound o.a.commons.io.f...
  • 902d4c5 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-jar-plugin&package-manager=maven&previous-version=3.4.0&new-version=3.4.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #425 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/425 from google:dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.4.1 3e37892338db289c6babaad15f8fb0f18b9a303c PiperOrigin-RevId: 627028500 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 872e7389..bda757cf 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ maven-jar-plugin - 3.4.0 + 3.4.1 maven-javadoc-plugin From af609cd0ebca3ea8ff5d8cde00d57faef501e3ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 07:24:00 -0700 Subject: [PATCH 239/300] Bump actions/checkout from 4.1.2 to 4.1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3.
Release notes

Sourced from actions/checkout's releases.

v4.1.3

What's Changed

Full Changelog: https://github.com/actions/checkout/compare/v4.1.2...v4.1.3

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.2&new-version=4.1.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #426 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/426 from google:dependabot/github_actions/actions/checkout-4.1.3 6b2377cb145dd90557e405ecc79dec9be5932e59 PiperOrigin-RevId: 627028503 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88da3098..327675c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: From dfa38d27233f5ef944558bef9b61a48f54fa11ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 04:49:34 -0700 Subject: [PATCH 240/300] Bump actions/checkout from 4.1.3 to 4.1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4.
Release notes

Sourced from actions/checkout's releases.

v4.1.4

What's Changed

Full Changelog: https://github.com/actions/checkout/compare/v4.1.3...v4.1.4

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.1.4

v4.1.3

v4.1.2

v4.1.1

v4.1.0

v4.0.0

v3.6.0

v3.5.3

v3.5.2

v3.5.1

v3.5.0

v3.4.0

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.3&new-version=4.1.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #427 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/427 from google:dependabot/github_actions/actions/checkout-4.1.4 7161c87730e49bdd298ab86c5778df2da83f8987 PiperOrigin-RevId: 628035128 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 327675c1..89ec9e4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: From efabc6fe05af718913390f7b1a7402f5df6efb38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 06:39:02 -0700 Subject: [PATCH 241/300] Bump com.google.errorprone:error_prone_annotations from 2.26.1 to 2.27.0 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.26.1 to 2.27.0.
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.27.0

New checks:

  • ClassInitializationDeadlock detects class initializers that reference subtypes of the current class, which can result in deadlocks.
  • MockitoDoSetup suggests using when/thenReturn over doReturn/when for additional type safety.
  • VoidUsed suggests using a literal null instead of referring to a Void-typed variable.

Modified checks:

Closed issues: #4291. #4308, #4343, #4320

Full Changelog: https://github.com/google/error-prone/compare/v2.26.1...v2.27.0

Commits
  • ebe0a01 Release Error Prone 2.27.0
  • fd9b826 Remove a very literal change-detector test, and move the comment to the produ...
  • f289d9e VoidUsed: flag Void variables being used, where they can simply be repl...
  • 3ee6f41 Fix for a crash in RedundantSetterCall.
  • 92c106d Encourage when/thenReturn over doReturn/when.
  • 07c1a7c Stop mentioning @Var in[]
  • 9d66272 Correction to UseCorrectAssertInTests.
  • a6ab21a Fix a crash in JUnitIncompatibleType
  • 5a7b8d9 NearbyCallers: scan the body of expression lambdas.
  • 53d787c Don't suggest ImmutableSet if ImmutableList is unused.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.26.1&new-version=2.27.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #428 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/428 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.27.0 de50a115a59f1b0f9a987f0f5afba81e23caa736 PiperOrigin-RevId: 629051462 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bda757cf..8d0972bd 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.26.1 + 2.27.0 provided From c28566ece893e0d8a4e4962c943eb2b267567051 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 06:49:15 -0700 Subject: [PATCH 242/300] Bump org.checkerframework:checker-qual from 3.42.0 to 3.43.0 Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.42.0 to 3.43.0.
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.43.0

Version 3.43.0 (May 1, 2024)

User-visible changes:

Method, constructor, lambda, and method reference type inference has been greatly improved. The -AconservativeUninferredTypeArguments option is no longer necessary and has been removed.

Renamed command-line arguments:

  • -AskipDirs has been renamed to -AskipFiles. -AskipDirs will continue to work for the time being.

New command-line arguments:

  • -AonlyFiles complements -AskipFiles

A specialized inference algorithm for the Resource Leak Checker runs automatically as part of whole-program inference.

Implementation details:

Deprecated ObjectCreationNode#getConstructor in favor of new ObjectCreationNode#getTypeToInstantiate().

Renamed AbstractCFGVisualizer.visualizeBlockHelper() to visualizeBlockWithSeparator().

Moved methods from TreeUtils to subclasses of TreeUtilsAfterJava11:

  • isConstantCaseLabelTree
  • isDefaultCaseLabelTree
  • isPatternCaseLabelTree

Renamed BaseTypeVisitor.checkForPolymorphicQualifiers() to warnInvalidPolymorphicQualifier().

Closed issues:

#979, #4559, #4593, #5058, #5734, #5781, #6071, #6093, #6239, #6297, #6317, #6322, #6346, #6373, #6376, #6378, #6379, #6380, #6389, #6393, #6396, #6402, #6406, #6407, #6417, #6421, #6430, #6433, #6438, #6442, #6473, #6480, #6507, #6531, #6535.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.43.0 (May 1, 2024)

User-visible changes:

Method, constructor, lambda, and method reference type inference has been greatly improved. The -AconservativeUninferredTypeArguments option is no longer necessary and has been removed.

Renamed command-line arguments:

  • -AskipDirs has been renamed to -AskipFiles. -AskipDirs will continue to work for the time being.

New command-line arguments:

  • -AonlyFiles complements -AskipFiles

A specialized inference algorithm for the Resource Leak Checker runs automatically as part of whole-program inference.

Implementation details:

Deprecated ObjectCreationNode#getConstructor in favor of new ObjectCreationNode#getTypeToInstantiate().

Renamed AbstractCFGVisualizer.visualizeBlockHelper() to visualizeBlockWithSeparator().

Moved methods from TreeUtils to subclasses of TreeUtilsAfterJava11:

  • isConstantCaseLabelTree
  • isDefaultCaseLabelTree
  • isPatternCaseLabelTree

Renamed BaseTypeVisitor.checkForPolymorphicQualifiers() to warnInvalidPolymorphicQualifier().

Closed issues:

#979, #4559, #4593, #5058, #5734, #5781, #6071, #6093, #6239, #6297, #6317, #6322, #6346, #6373, #6376, #6378, #6379, #6380, #6389, #6393, #6396, #6402, #6406, #6407, #6417, #6421, #6430, #6433, #6438, #6442, #6473, #6480, #6507, #6531, #6535.

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.42.0&new-version=3.43.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #430 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/430 from google:dependabot/maven/org.checkerframework-checker-qual-3.43.0 c65dd1f2bfe7167a2b81c069b0b4a290afdfdca5 PiperOrigin-RevId: 630048498 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d0972bd..9da091db 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.42.0 + 3.43.0 From 2abc57627830172aaf2561e8284fa74e415df81a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 06:53:49 -0700 Subject: [PATCH 243/300] Bump com.google.errorprone:error_prone_annotations from 2.27.0 to 2.27.1 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.27.0 to 2.27.1.
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.27.1

This release contains all of the changes in 2.27.0, plus a bug fix to ClassInitializationDeadlock (google/error-prone#4378)

Full Changelog: https://github.com/google/error-prone/compare/v2.27.0...v2.27.1

Commits
  • 464bb93 Release Error Prone 2.27.1
  • bc3309a Flag comparisons of SomeEnum.valueOf(...) to null.
  • 6a8f493 Don't scan into nested enums in ClassInitializationDeadlock
  • c8df502 Make the logic of detecting at least one allowed usage more explicit.
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.27.0&new-version=2.27.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #429 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/429 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.27.1 844f7cdd572e7a7421cfbc8e60ff51159abfb913 PiperOrigin-RevId: 630049643 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9da091db..26f575dc 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.27.0 + 2.27.1 provided From 87ae35186ab68df34059ab2297af1e5d21fdc7bc Mon Sep 17 00:00:00 2001 From: cpovirk Date: Thu, 2 May 2024 07:29:52 -0700 Subject: [PATCH 244/300] Bump Guava to 33.2.0. RELNOTES=n/a PiperOrigin-RevId: 630057578 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26f575dc..5bc8eddf 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.1.0-jre + 33.2.0-jre com.google.errorprone From d079c30954fbe3e02300ad4a388b3d6b95ee2958 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 06:16:46 -0700 Subject: [PATCH 245/300] Bump actions/checkout from 4.1.4 to 4.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5.
Release notes

Sourced from actions/checkout's releases.

v4.1.5

What's Changed

Full Changelog: https://github.com/actions/checkout/compare/v4.1.4...v4.1.5

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.4&new-version=4.1.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #432 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/432 from google:dependabot/github_actions/actions/checkout-4.1.5 7e4cf307d6547d6590fd6459c6eacff971d076ce PiperOrigin-RevId: 631399976 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89ec9e4c..db0846c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: From e1573edf37767614a983d5eb47bf55663321729b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 08:06:17 -0700 Subject: [PATCH 246/300] Bump actions/checkout from 4.1.5 to 4.1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5 to 4.1.6.
Release notes

Sourced from actions/checkout's releases.

v4.1.6

What's Changed

Full Changelog: https://github.com/actions/checkout/compare/v4.1.5...v4.1.6

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.1.6

v4.1.5

v4.1.4

v4.1.3

v4.1.2

v4.1.1

v4.1.0

v4.0.0

v3.6.0

v3.5.3

v3.5.2

v3.5.1

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.5&new-version=4.1.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #433 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/433 from google:dependabot/github_actions/actions/checkout-4.1.6 0a5500f97a5b83a7182eeac1736437dd0937de2e PiperOrigin-RevId: 634779143 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db0846c0..06f2d5d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: From 1c3e3f24d3ae27bf00d864175c0b5ced9a8b4350 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 31 May 2024 12:18:11 -0700 Subject: [PATCH 247/300] Bump Guava to 33.2.1. RELNOTES=n/a PiperOrigin-RevId: 639114032 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bc8eddf..b50e9e70 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.2.0-jre + 33.2.1-jre com.google.errorprone From 26fa28348d4b3e7a983402dedd754512c59b5d3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 05:31:04 -0700 Subject: [PATCH 248/300] Bump com.google.errorprone:error_prone_annotations from 2.27.1 to 2.28.0 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.27.1 to 2.28.0.
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.28.0

Error Prone nows supports the latest JDK 23 EA builds (#4412, #4415).

Closed issues:

  • Improved errors for invalid check severities (#4306).
  • Fix a crash with nested instanceof patterns (#4349).
  • Fix a crash in JUnitIncompatibleType (#4377).
  • In ObjectEqualsForPrimitives, don't suggest replacing equal with == for floating-point values (#4392).

New checks:

Full Changelog: https://github.com/google/error-prone/compare/v2.27.1...v2.28.0

Commits
  • c71fd4e Release Error Prone 2.28.0
  • 32997f7 Bugfix assignment switch analysis in StatementSwitchToExpressionSwitch: if an...
  • 2dde254 Update references to javadoc APIs after the introduction of Markdown doc comm...
  • 5fef6e0 Yet another JUnitIncompatibleType crash fix.
  • c2df1b6 Refactor comment handling in tokenization to use a new ErrorProneComment clas...
  • 3fff610 Update hamcrest to v2.2
  • 6f265dd Add a disabled regression test for an UnusedVariable bug
  • 5eded87 Add an Error Prone check that reimplements javac sunapi warnings
  • 9e0fbf7 Prepare for a change to the return type of JCCompilationUnit#getImports in ...
  • 13be411 Handle null != CONST_CASE in YodaCondition
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.27.1&new-version=2.28.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #437 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/437 from google:dependabot/maven/com.google.errorprone-error_prone_annotations-2.28.0 c2e49b3b62ce009b61c433dccd112037b8c7d08a PiperOrigin-RevId: 639746597 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b50e9e70..14abdcb0 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.27.1 + 2.28.0 provided From 55340f5086074f6de39d9e033f2d6387eeee4755 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 05:07:53 -0700 Subject: [PATCH 249/300] Bump org.checkerframework:checker-qual from 3.43.0 to 3.44.0 Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.43.0 to 3.44.0.
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.44.0

Version 3.44.0 (June 3, 2024)

Implementation details:

Removed methods:

  • AbstractAnalysis.readFromStore(): use Map.get()

Renamed methods:

  • CFAbstractStore.methodValues() => methodCallExpressions()
  • AbstractCFGVisualizer.format() => escapeString()

Renamed fields:

  • AnalysisResult.stores => inputs

Deprecated methods:

  • AbstractAnalysis.getContainingMethod() => getEnclosingMethod()
  • AbstractAnalysis.getContainingClass() => getEnclosingMethod()
  • ControlFlowGraph.getContainingMethod() => getEnclosingMethod()
  • ControlFlowGraph.getContainingClass() => getEnclosingClass()
  • JavaExpression.isUnassignableByOtherCode() => isAssignableByOtherCode()
  • JavaExpression.isUnmodifiableByOtherCode() => isModifiableByOtherCode()

BaseTypeVisitor#visitMethod(MethodTree, Void) is now final. Subclasses should override BaseTypeVisitor#processMethodTree(MethodTree).

Closed issues:

#802, #2676, #2780, #2926, #3378, #3612, #3764, #4007, #4964, #5070, #5176, #5237, #5541, #6046, #6382, #6388, #6566, #6568, #6570, #6576, #6577, #6631, #6635, #6636, #6644.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.44.0 (June 3, 2024)

Implementation details:

Removed methods:

  • AbstractAnalysis.readFromStore(): use Map.get()

Renamed methods:

  • CFAbstractStore.methodValues() => methodCallExpressions()
  • AbstractCFGVisualizer.format() => escapeString()

Renamed fields:

  • AnalysisResult.stores => inputs

Deprecated methods:

  • AbstractAnalysis.getContainingMethod() => getEnclosingMethod()
  • AbstractAnalysis.getContainingClass() => getEnclosingMethod()
  • ControlFlowGraph.getContainingMethod() => getEnclosingMethod()
  • ControlFlowGraph.getContainingClass() => getEnclosingClass()
  • JavaExpression.isUnassignableByOtherCode() => isAssignableByOtherCode()
  • JavaExpression.isUnmodifiableByOtherCode() => isModifiableByOtherCode()

BaseTypeVisitor#visitMethod(MethodTree, Void) is now final. Subclasses should override BaseTypeVisitor#processMethodTree(MethodTree).

Closed issues:

#802, #2676, #2780, #2926, #3378, #3612, #3764, #4007, #4964, #5070, #5176, #5237, #5541, #6046, #6382, #6388, #6566, #6568, #6570, #6576, #6577, #6631, #6635, #6636, #6644.

Commits
  • 9ae1463 new release 3.44.0
  • a4a4232 Prep for release.
  • cac43aa Use instantiation of inference variable. (#6638)
  • 463c4eb Don't use -XDrawDiagnostics in testing framework (#6647)
  • b188046 Don't use -XDrawDiagnostics in jtreg tests when it is not necessary (#6646)
  • c85eb69 Preprocess unicode escapes when parsing using JavaParser (#6632)
  • 959822a Update versions.autoValue to v1.11.0 (#6640)
  • 869577b Update versions.errorprone to v2.28.0 (#6643)
  • 8a25d99 Update dependency gradle to v8.8 (#6639)
  • 9657f9f Update dependency com.amazonaws:aws-java-sdk-bom to v1.12.734
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.43.0&new-version=3.44.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #438 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/438 from google:dependabot/maven/org.checkerframework-checker-qual-3.44.0 e196893a18cc4f8e819cc8503018e8fb771e5de8 PiperOrigin-RevId: 640114363 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14abdcb0..583b0efe 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.43.0 + 3.44.0 From bbab47942e91e53d421c3a036ff75f5849159530 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 07:12:08 -0700 Subject: [PATCH 250/300] Bump com.google.auto.value:auto-value from 1.10.4 to 1.11.0 Bumps [com.google.auto.value:auto-value](https://github.com/google/auto) from 1.10.4 to 1.11.0.
Release notes

Sourced from com.google.auto.value:auto-value's releases.

AutoValue 1.11.0

What's Changed

  • AutoValue (including AutoBuilder) no longer bundles the Kotlin metadata API. This may require adding an explicit dependency on org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0 or org.jetbrains.kotlin:kotlin-metadata-jvm:2.0.0 to client code that uses AutoBuilder to build Kotlin classes. The metadata API has changed from kotlinx.metadata to kotlin.metadata, but AutoBuilder uses reflection to function with either. (260b61ec7)
  • Support for generating Java 7 code has been removed from AutoValue, AutoAnnotation, and AutoBuilder. You must be on at least Java 8, or an Android version with desugaring that allows it to pass for Java 8. 1.10.4 is the last AutoValue version with support for Java 7. (b9142b7cd)
  • AutoBuilder now reports an error if it encounters a @Nullable primitive parameter. Primitive types cannot be null, and should not be annotated for nullness. (7cbdeb43b)
  • Annotations on type parameters, like abstract @Nullable T foo(), are now better propagated to fields and constructor parameters. (92d881ed9)
  • The generated toBuilder() method now says new AutoValue_Foo.Builder(this) rather than just new Builder(this), to do the right thing if an extension generates its own subclass of Builder. (324470ba2)
  • The "copy constructor" in a generated Builder is no longer private. (6730615c9)
  • Added support for extending AutoValue.Builder with abstract methods. (7d4b020dd)
  • The annotation processors now support all kinds of resource URLs when loading template resources. This change only affects the case where the AutoValue (etc) processors are being invoked in an unusual environment, for example from a GraalVM app. It does not affect code that is merely being compiled for such an environment. (80b0ada75)

Full Changelog: https://github.com/google/auto/compare/auto-value-1.10.4...auto-value-1.11.0

Commits
  • 5e02d64 Set version number for auto-value-parent to 1.11.0.
  • 80b0ada Support all kinds of resource URLs when loading template resources.
  • 260b61e Use reflection to avoid referencing the Kotlin metadata API directly.
  • 76be89a Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.1 to 3.7.0 in /fa...
  • c11484e Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.1 to 3.7.0 in /value
  • b21d69d Bump kotlin.version from 1.9.24 to 2.0.0 in /value
  • e55e60a Update AutoValue to reflect recent Kotlin Metadata API changes.
  • 29f739b Bump actions/checkout from 4.1.5 to 4.1.6
  • 199a727 Bump kotlin.version from 1.9.23 to 1.9.24 in /value
  • f2b22e3 Bump actions/checkout from 4.1.4 to 4.1.5
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.auto.value:auto-value&package-manager=maven&previous-version=1.10.4&new-version=1.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #436 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/436 from google:dependabot/maven/com.google.auto.value-auto-value-1.11.0 0c4f4f74e0d07e93b604a8a4d5d36866c0d8b8c7 PiperOrigin-RevId: 640142560 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 583b0efe..95cac30e 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.auto.value auto-value - 1.10.4 + 1.11.0 com.google.auto From 932aa44db4ba82ffdd6ee9062b519459c7d029f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 07:25:50 -0700 Subject: [PATCH 251/300] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.3 to 3.7.0.
Commits
  • 2c28b8d [maven-release-plugin] prepare release maven-javadoc-plugin-3.7.0
  • 5530d68 [MJAVADOC-793] java.lang.NullPointerException: Cannot invoke "String.length()...
  • 08cf68e Revert "Bump org.codehaus.plexus:plexus-archiver from 4.9.1 to 4.9.2"
  • 6446822 Bump org.apache.maven.shared:maven-invoker from 3.2.0 to 3.3.0
  • 49c93ad Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
  • 4e72048 [MJAVADOC-795] Upgrade to Parent 42 and Maven 3.6.3
  • b55dd96 Bump org.codehaus.plexus:plexus-archiver from 4.9.1 to 4.9.2
  • 77ad410 Bump org.apache.commons:commons-text from 1.11.0 to 1.12.0
  • c21568a Bump commons-io:commons-io from 2.16.0 to 2.16.1
  • ded56a9 Exclude JDK 8 - temurin, adopt-openj9 on macos
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-javadoc-plugin&package-manager=maven&previous-version=3.6.3&new-version=3.7.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Fixes #435 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/435 from google:dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.7.0 318f0e9be403fe0e022c651bb45e19de3a2e44fb PiperOrigin-RevId: 640145705 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 95cac30e..4e844da1 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.6.3 + 3.7.0 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -230,7 +230,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-docs From 7b0f804d4a381a01a28128ee264bbe1b1a72e2ce Mon Sep 17 00:00:00 2001 From: Chaoren Lin Date: Tue, 4 Jun 2024 10:05:22 -0700 Subject: [PATCH 252/300] Group all dependabot updates together in the same commit to avoid merge conflicts. Also change the interval from daily to weekly so there's only one update commit per triage rotation. See https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#configuration-options-for-the-dependabotyml-file for documentation on the configuration options. RELNOTES=n/a PiperOrigin-RevId: 640191662 --- .github/dependabot.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b76b8957..8519eb9a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,8 +3,18 @@ updates: - package-ecosystem: "maven" directory: "/" schedule: - interval: "daily" + interval: "weekly" + groups: + dependencies: + applies-to: version-updates + patterns: + - "*" - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" + interval: "weekly" + groups: + github-actions: + applies-to: version-updates + patterns: + - "*" From 7774e5e83335c7d40d69d54d41d9f2f76e5b1cdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 06:47:03 -0700 Subject: [PATCH 253/300] Bump the dependencies group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 2 updates: [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) and [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire). Updates `org.apache.maven.plugins:maven-release-plugin` from 3.0.1 to 3.1.0
Release notes

Sourced from org.apache.maven.plugins:maven-release-plugin's releases.

3.1.0

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

Commits
  • f2f9f4e [maven-release-plugin] prepare release maven-release-3.1.0
  • e109d3b Bump scmVersion from 2.0.1 to 2.1.0
  • 5f794a1 Bump org.apache.maven.shared:maven-invoker from 3.2.0 to 3.3.0
  • 28201bb Bump org.codehaus.plexus:plexus-interactivity-api from 1.2 to 1.3
  • 8547606 Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27
  • adf6aaf Bump org.xmlunit:xmlunit-core from 2.9.1 to 2.10.0
  • f3bbb77 [MRELEASE-1064] [REGRESSION] release:branch uses @​releaseLabel instead of @​br...
  • fa6c3db [MRELEASE-1145] Upgrade to Maven 3.6.3
  • 167db81 [MRELEASE-1147] @​junitVersion@ never replaced in UTs (make explicit)
  • 7249d1f [MRELEASE-1148] Release Manager pulls in transitive dependencies
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.2.5 to 3.3.0
Release notes

Sourced from org.apache.maven.plugins:maven-surefire-plugin's releases.

3.3.0

Release Notes - Maven Surefire - Version 3.3.0

What's Changed

... (truncated)

Commits
  • d0b96a4 [maven-release-plugin] prepare release surefire-3.3.0
  • 71796af Bump org.codehaus.plexus:plexus-component-annotations
  • afb2d4e Bump org.codehaus.plexus:plexus-interpolation from 1.25 to 1.27
  • e6287dd [SUREFIRE-2232] [REGRESSION] StatelessXmlReporter fails to process failed res...
  • 57b7837 Bump org.htmlunit:htmlunit from 3.11.0 to 4.2.0
  • fd440c4 Bump org.xmlunit:xmlunit-core from 2.9.1 to 2.10.0
  • 5c34c43 Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
  • 680fb00 Bump org.apache.commons:commons-compress from 1.26.1 to 1.26.2
  • cad0931 [SUREFIRE-2248] Make "type" attribute on failures and errors in (surefire|fai...
  • a88d786 [SUREFIRE-2047] Upgrade to maven-common-artifact-filters 3.4.0
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #440 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/440 from google:dependabot/maven/dependencies-76d754ca3e 08557cb24ff98866b2f3174a73bd359e22b4fe5d PiperOrigin-RevId: 643990067 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4e844da1..3e38e16b 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ maven-release-plugin - 3.0.1 + 3.1.0 sonatype-oss-release deploy @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.3.0 ${test.jvm.flags} From 0359e7cb83bd6f58a8fad6fa0528f7fec0ae86f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 06:47:20 -0700 Subject: [PATCH 254/300] Bump actions/checkout from 4.1.6 to 4.1.7 in the github-actions group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 4.1.6 to 4.1.7
Release notes

Sourced from actions/checkout's releases.

v4.1.7

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v4.1.6...v4.1.7

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.1.7

v4.1.6

v4.1.5

v4.1.4

v4.1.3

v4.1.2

v4.1.1

v4.1.0

v4.0.0

v3.6.0

v3.5.3

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.6&new-version=4.1.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #441 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/441 from google:dependabot/github_actions/github-actions-0bd1363a87 a9efe3f42415cf40d0efa82616924b793710ee2d PiperOrigin-RevId: 643990154 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06f2d5d4..962ef573 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: From 852453b66b2225c462944e9e6f4cc6c2c49389d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 06:52:37 -0700 Subject: [PATCH 255/300] Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 in the dependencies group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 1 update: [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin). Updates `org.apache.maven.plugins:maven-jar-plugin` from 3.4.1 to 3.4.2
Release notes

Sourced from org.apache.maven.plugins:maven-jar-plugin's releases.

3.4.2

🐛 Bug Fixes

👻 Maintenance

Commits
  • 95007e8 [maven-release-plugin] prepare release maven-jar-plugin-3.4.2
  • 99584ce Build with Maven 4
  • e9c98a4 [MJAR-310] fixed toolchain version detection when toolchain paths contain whi...
  • a5554bb [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-jar-plugin&package-manager=maven&previous-version=3.4.1&new-version=3.4.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #442 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/442 from google:dependabot/maven/dependencies-c7d7b53540 9522d14b3cdc8f0d8ead7040644df5d167a125c1 PiperOrigin-RevId: 646078482 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3e38e16b..6fcc3d44 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ maven-jar-plugin - 3.4.1 + 3.4.2 maven-javadoc-plugin From e730271b15e664f1798970091caed5e4840bb477 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Thu, 27 Jun 2024 10:22:11 -0700 Subject: [PATCH 256/300] Bump Truth to 1.4.3. RELNOTES=n/a PiperOrigin-RevId: 647363452 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fcc3d44..fe717104 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.4.2 + 1.4.3 http://github.com/google/compile-testing From f79fc6f1ff230d5102702b490f620ca819605be9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 07:16:27 -0700 Subject: [PATCH 257/300] Bump org.checkerframework:checker-qual from 3.44.0 to 3.45.0 in the dependencies group Bumps the dependencies group with 1 update: [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework). Updates `org.checkerframework:checker-qual` from 3.44.0 to 3.45.0
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.45.0

Version 3.45.0 (July 1, 2024)

Implementation details:

Added a Tree argument to AnnotatedTypes.adaptParameters()

Deprecated methods:

  • TreeUtils.isVarArgs() => isVarargsCall()
  • TreeUtils.isVarArgMethodCall() => isVarargsCall()

Closed issues:

#152, #5575, #6630, #6641, #6648, #6676.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.45.0 (July 1, 2024)

Implementation details:

Added a Tree argument to AnnotatedTypes.adaptParameters()

Deprecated methods:

  • TreeUtils.isVarArgs() => isVarargsCall()
  • TreeUtils.isVarArgMethodCall() => isVarargsCall()

Closed issues:

#152, #5575, #6630, #6641, #6648, #6676.

Commits
  • 9723ea7 new release 3.45.0
  • 83a8a55 Update for release.
  • 8d50b59 Update dependency com.amazonaws:aws-java-sdk-bom to v1.12.753 (#6690)
  • e3a0b54 Update dependency org.projectlombok:lombok to v1.18.34 (#6689)
  • 71f21f1 Update to Stubparser version 3.26.1
  • 6147c82 Remove references to the defunct Object Construction Checker
  • 936a6d0 Fix typo
  • 4b236c1 Project: replace JavaParser by javac (#6678)
  • 6cc0cd3 Non-Empty Checker (#6679)
  • 5c98838 Add a complete example of a resource wrapper type to the manual (#6680)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.44.0&new-version=3.45.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #444 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/444 from google:dependabot/maven/dependencies-06488b085f dfdf298d69ea491214d63042be2bbb4f652f26f0 PiperOrigin-RevId: 650240093 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe717104..7e648e20 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.44.0 + 3.45.0 From 2cfeefc460ea32a81613d2cee80addddca1f7419 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 12 Jul 2024 16:06:34 -0700 Subject: [PATCH 258/300] Bump Truth to 1.4.4. RELNOTES=n/a PiperOrigin-RevId: 651912281 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e648e20..4aed1b08 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Utilities for testing compilation. - 1.4.3 + 1.4.4 http://github.com/google/compile-testing From aa0afd67c8212de44e57831e7bbb5ee80f10c469 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 06:44:29 -0700 Subject: [PATCH 259/300] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) and [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire). Updates `org.apache.maven.plugins:maven-release-plugin` from 3.1.0 to 3.1.1
Commits
  • 4f350d4 [maven-release-plugin] prepare release maven-release-3.1.1
  • 06f6de4 [MRELEASE-1153] Revert parts of MRELEASE-1109 (8dfcb47996320af5e6f0b2d50eac20...
  • 985d0bc [MRELEASE-1149] Current release of the plugin has configuration docs missing
  • 47e94b4 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.3.0 to 3.3.1
Commits
  • 7e45620 [maven-release-plugin] prepare release surefire-3.3.1
  • 561b4ca [SUREFIRE-2250] Surefire Test Report Schema properties element is not consist...
  • 6aaea8a [SUREFIRE-1360] Ability to disable properties for successfully passed tests
  • c17b92b Bump org.codehaus.mojo:animal-sniffer-maven-plugin from 1.23 to 1.24
  • 748d9dc Fix typos
  • f8092e9 Improve time units
  • c670335 [SUREFIRE-1934] Ability to disable system-out/system-err for successfully pas...
  • bce1b39 Improve docs of linkXRef
  • 3c49ebd Bump org.htmlunit:htmlunit from 4.2.0 to 4.3.0
  • 6ff0f83 [SUREFIRE-2242] Plain test report does not include names of the skipped tests
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #446 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/446 from google:dependabot/maven/dependencies-68092eadb5 b655df1c11647c54dcd7bad65967f4329b03da0f PiperOrigin-RevId: 652463798 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4aed1b08..5305eebc 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ maven-release-plugin - 3.1.0 + 3.1.1 sonatype-oss-release deploy @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.3.1 ${test.jvm.flags} From 868362bd0f61538df02df094418a8b80828312cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 07:09:53 -0700 Subject: [PATCH 260/300] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) and [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin). Updates `com.google.errorprone:error_prone_annotations` from 2.28.0 to 2.29.2
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.29.2

This release contains all of the changes in 2.29.0 and 2.29.1, plus:

Full Changelog: https://github.com/google/error-prone/compare/v2.29.1...v2.29.2

Error Prone 2.29.1

This release contains all of the changes in 2.29.0, plus:

Full Changelog: https://github.com/google/error-prone/compare/v2.29.0...v2.29.1

Error Prone 2.29.0

New checks:

Closed issues: #4318, #4429, #4467

Full Changelog: https://github.com/google/error-prone/compare/v2.28.0...v2.29.0

Commits
  • 436f891 Release Error Prone 2.29.2
  • 526aa72 Restore module-info.
  • a19bcbc StatementSwitchToExpressionSwitch: Enhance code comment handling for direct c...
  • 5c26d0d Fix ASTHelpers#isRuleKind on JDK versions without CaseTree#getCaseKind
  • 81d3127 Fix an NPE in SetUnrecognized
  • bc33976 Use JSpecify 1.0!
  • 385e43a Disallow using traditional :-style switches as switch expressions
  • 2656f48 Create ThreadSafeTypeParameter to replace ThreadSafe.TypeParameter.
  • 6bd568d Don't complain about unused variables named _
  • 7f90df7 Improve docs for URLEqualsHashCode.
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.7.0 to 3.8.0
Commits
  • 621cba6 [maven-release-plugin] prepare release maven-javadoc-plugin-3.8.0
  • eab964c [MJAVADOC-603] javadoc:fix failure on JDK10: java.lang.ClassNotFoundException...
  • 0a26a7e Update since tags
  • 08205b1 Add compile step for MJAVADOC-365 IT
  • 4c8ca8e [MJAVADOC-804] Remove temporary directories created by tests
  • 91369fa [MJAVADOC-775] Option 'taglets/taglet/tagletpath' ignored when pointing to a JAR
  • be2fa20 [MJAVADOC-783] Invalid path when using TagletArtifact and TagletPath
  • 3eb47c5 [MJAVADOC-791] maven-javadoc-plugin not working correctly together with maven...
  • d3afd39 [MJAVADOC-803] Add default parameter to force root locale
  • 4904e08 [MJAVADOC-802] Set default value of defaultAuthor parameter in fix goals to $...
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #447 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/447 from google:dependabot/maven/dependencies-3c43a4367a eeaaf2652d94e583a8865bd1668f48991059ac21 PiperOrigin-RevId: 654733422 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5305eebc..a88580a4 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.28.0 + 2.29.2 provided @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.7.0 + 3.8.0 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -230,7 +230,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 attach-docs From 7a3b903f680bec4e1451e915c4963ecdf2b3793c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 06:50:40 -0700 Subject: [PATCH 261/300] Bump org.checkerframework:checker-qual from 3.45.0 to 3.46.0 in the dependencies group Bumps the dependencies group with 1 update: [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework). Updates `org.checkerframework:checker-qual` from 3.45.0 to 3.46.0
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.46.0

Version 3.46.0 (August 1, 2024)

User-visible changes:

Renamed @EnsuresCalledMethodsVarArgsto @EnsuresCalledMethodsVarargs.

Closed issues:

#4923, #6420, #6469, #6652, #6664.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.46.0 (August 1, 2024)

User-visible changes:

Renamed @EnsuresCalledMethodsVarArgsto @EnsuresCalledMethodsVarargs.

Closed issues:

#4923, #6420, #6469, #6652, #6664.

Commits
  • 58640e2 new release 3.46.0
  • e1d12ee Prep for release.
  • 239937d Update dependency com.amazonaws:aws-java-sdk-bom to v1.12.767 (#6735)
  • 7eb39fa Added a new task to resolve dependencies
  • d0fe98d Unlimited fetch depth for misc jobs (as claimed by documentation) (#6734)
  • f94817b More informative exception in callTransferFunction
  • 90fcbe3 Use Error Prone 2.29.2
  • 32ef093 Remove EnsuresCalledMethodsVarArgs.java
  • 034a63c Fix order that constraints/variables are resolved in type arg inference
  • f3dee6c Add example to documentation of skipReceiverSubtypeCheck
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.45.0&new-version=3.46.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #448 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/448 from google:dependabot/maven/dependencies-222199fb37 a5818981456818391ffe132b73b4a5d981021100 PiperOrigin-RevId: 659537981 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a88580a4..b52abdee 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.45.0 + 3.46.0 From 0ad982f70aa2a3c74bc3fe39c1a267969f09a5ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 07:10:49 -0700 Subject: [PATCH 262/300] Bump actions/setup-java from 4.2.1 to 4.2.2 in the github-actions group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/setup-java](https://github.com/actions/setup-java). Updates `actions/setup-java` from 4.2.1 to 4.2.2
Release notes

Sourced from actions/setup-java's releases.

v4.2.2

What's Changed



Bug fixes:

Documentation changes

Dependency updates:

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.2.2

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.2.1&new-version=4.2.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #449 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/449 from google:dependabot/github_actions/github-actions-3b6b8ed95c 2e38839987d8a38e55277042ccdcd77a452a35ae PiperOrigin-RevId: 662072158 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 962ef573..36fbc56d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 with: java-version: ${{ matrix.java }} distribution: 'zulu' From bffd8a6c7a490fcdf6825638d35aa7ebd8ff2457 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 07:10:53 -0700 Subject: [PATCH 263/300] Bump the dependencies group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 2 updates: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) and [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin). Updates `com.google.errorprone:error_prone_annotations` from 2.29.2 to 2.30.0
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.30.0

New checks:

Closed issues: #632, #4487

Full changelog: https://github.com/google/error-prone/compare/v2.29.2...v2.30.0

Commits
  • 5ada179 Release Error Prone 2.30.0
  • af175b0 Don't fire the CanIgnoreReturnValueSuggester for `dagger.producers.Producti...
  • ba8f9a2 Do not update getters that override methods from a superclass.
  • a706e8d Add ability to suppress warning for the entire AutoValue class
  • 86df5cf Convert some simple blocks to return switches using yield
  • 474554a Remove // fall out comments, which are sometimes used to document an empty ...
  • ac7ebf5 Handle var in MustBeClosedChecker
  • ccd3ca6 Add handling of toBuilder()
  • d887307 Omit some unnecessary break statements when translating to -> switches
  • fe07236 Add Error Prone check for unnecessary boxed types in AutoValue classes.
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-gpg-plugin` from 3.2.4 to 3.2.5
Release notes

Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.

3.2.5

Release Notes - Maven GPG Plugin - Version 3.2.5

📦 Dependency updates

Commits
  • 737d4ee [maven-release-plugin] prepare release maven-gpg-plugin-3.2.5
  • 7747063 [MGPG-134] Update maven-invoker (#110)
  • 3df5f83 [MGPG-133] Bump org.simplify4u.plugins:pgpverify-maven-plugin from 1.17.0 to ...
  • 58a2069 [MGPG-132] Bump com.kohlschutter.junixsocket:junixsocket-core from 2.9.1 to 2...
  • e911b43 [MGPG-131] Bump org.apache.maven.plugins:maven-plugins from 42 to 43 (#108)
  • d2b60d3 [MGPG-130] Update sigstore extension for exclusion (#109)
  • 091f388 Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.1 to 3.7.0
  • 899f410 [MGPG-128] Parent POM 42, prerequisite 3.6.3 (#100)
  • f0be6f3 [MGPG-127] Bump bouncycastleVersion from 1.78 to 1.78.1 (#98)
  • 7dd5166 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #450 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/450 from google:dependabot/maven/dependencies-664e1ae5d2 b603d519a0c64dce27aa8dd182fcec3abec24148 PiperOrigin-RevId: 662072169 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b52abdee..9caffeb8 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.29.2 + 2.30.0 provided @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.5 sign-artifacts From fbba40a941568260fd853ef9de3b19077d49ae00 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 16 Aug 2024 16:45:32 -0700 Subject: [PATCH 264/300] Bump Guava to 33.3.0. RELNOTES=n/a PiperOrigin-RevId: 663916312 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9caffeb8..72ab51d1 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.2.1-jre + 33.3.0-jre com.google.errorprone From 4337655fbcebd0f24343927993733289e001eee4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 06:10:54 -0700 Subject: [PATCH 265/300] Bump the dependencies group with 2 updates Bumps the dependencies group with 2 updates: [org.apache.maven.plugins:maven-site-plugin](https://github.com/apache/maven-site-plugin) and [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire). Updates `org.apache.maven.plugins:maven-site-plugin` from 3.12.1 to 3.20.0
Commits
  • fd65715 [maven-release-plugin] prepare release maven-site-plugin-3.20.0
  • be35f64 [MSITE-945] Remove dependency on Commons IO
  • 6fc5d17 [MSITE-945] More modern temporary file handling (#203)
  • eb0b0f6 Remove debugging strings from test output (#204)
  • 54faaa8 Earlier detection of mkdirs failure (#201)
  • 73b57d3 Replace deprecated methods (#198)
  • cf5c504 Add version to mrm-maven-plugin
  • 688714c Use charset in test (#199)
  • adc67e1 Use try with resources to avoid deprecated class (#200)
  • 2e867c6 Update history
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.3.1 to 3.4.0
Commits
  • 3ae062d [maven-release-plugin] prepare release surefire-3.4.0
  • f0de8c0 Bump org.htmlunit:htmlunit from 4.3.0 to 4.4.0
  • 817695a Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.16.0
  • 675c02a Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.0
  • 4bd36a1 [SUREFIRE-1385] Add new parameter "promoteUserPropertiesToSystemProperties" (...
  • 1d19ec8 [Doc] Failsafe Verify goal should mention failsafe
  • a93783a [SUREFIRE-2251] [REGRESSION] java.lang.NoSuchMethodException: org.apache.mave...
  • daa011b Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
  • 805f6b7 Improve internal field order
  • 26ae10d Remove outdated invoker conditions
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #452 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/452 from google:dependabot/maven/dependencies-d1c747e6a7 a28f1ef7c9b28fca4939aa4ddf5c9c5572382268 PiperOrigin-RevId: 664773668 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 72ab51d1..95b5991a 100644 --- a/pom.xml +++ b/pom.xml @@ -145,12 +145,12 @@ maven-site-plugin - 3.12.1 + 3.20.0 org.apache.maven.plugins maven-surefire-plugin - 3.3.1 + 3.4.0 ${test.jvm.flags} From 5d8ca78b9599833a6d58ac4cbd520c9850de2123 Mon Sep 17 00:00:00 2001 From: Nathan Naze Date: Mon, 26 Aug 2024 10:14:47 -0700 Subject: [PATCH 266/300] Fix a syntactical error in example code. The opening parathesis in the call to `compile` is never closed. RELNOTES=n/a PiperOrigin-RevId: 667625884 --- src/main/java/com/google/testing/compile/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/testing/compile/package-info.java b/src/main/java/com/google/testing/compile/package-info.java index dd055836..c3df7693 100644 --- a/src/main/java/com/google/testing/compile/package-info.java +++ b/src/main/java/com/google/testing/compile/package-info.java @@ -46,7 +46,7 @@ * Compilation compilation = * javac() * .withProcessors(new MyAnnotationProcessor()) - * .compile(JavaFileObjects.forSourceString("HelloWorld", "final class HelloWorld {}"); + * .compile(JavaFileObjects.forSourceString("HelloWorld", "final class HelloWorld {}")); * assertThat(compilation).succeededWithoutWarnings(); * * From 42b0652051b910408cc08f32aaf44f22432963e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 09:33:51 -0700 Subject: [PATCH 267/300] Bump the dependencies group with 3 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 3 updates: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone), [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) and [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire). Updates `com.google.errorprone:error_prone_annotations` from 2.30.0 to 2.31.0
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.31.0

This is the last planned minor release of Error Prone that will support running on JDK 11, see #3803. Using Error Prone to compile code that is deployed to earlier versions will continue to be fully supported, but will require using JDK 17 or newer for compilation and setting --release or -source/-target/-bootclasspath.

Changes:

New checks:

  • AutoValueBoxedValues: AutoValue instances should not usually contain boxed types that are not Nullable. We recommend removing the unnecessary boxing.

Full changelog: https://github.com/google/error-prone/compare/v2.30.0...v2.31.0

Commits
  • 4294aac Release Error Prone 2.31.0
  • 5bf91fb Replace {@link ThreadSafeTypeParameter} with {@code ThreadSafeTypeParameter}
  • a5a7189 Replace ComparisonChain with a Comparator chain.
  • 7e9a100 Make ThreadSafeTypeParameter useful in the open-source version of ErrorProne.
  • b4cebef Fix typo noted by @​Stephan202.
  • 354104e Remove ThreadSafe.TypeParameter now that it's been replaced by `ThreadSafeT...
  • 7542d36 Don't fire CanIgnoreReturnValueSuggester for simple return param; impleme...
  • 0a5a5b8 Migrate CollectionIncompatibleType from the deprecated withSignature to `...
  • 78218f2 Write more about withSignature.
  • 90d9390 Mark some Kotlin ranges as Immutable.
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.8.0 to 3.10.0
Commits
  • 487e479 [maven-release-plugin] prepare release maven-javadoc-plugin-3.10.0
  • 9638a6a [MJAVADOC-785] Align plugin implementation with AbstractMavenReport (maven-re...
  • 9d33925 [MJAVADOC-784] Upgrade to Doxia 2.0.0 Milestone Stack
  • a11b921 [MJAVADOC-809] Align Mojo class names
  • 7c4b467 Bump org.apache.maven.plugins:maven-plugins from 42 to 43
  • 636442b Improve ITs
  • dbca15a Bump org.hamcrest:hamcrest-core from 2.2 to 3.0
  • d02bb88 Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.16.0
  • 0a850a1 [MJAVADOC-807] Simplify IT for MJAVADOC-498
  • 43e901f Improve URL handling
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.4.0 to 3.5.0
Commits
  • c78365f [maven-release-plugin] prepare release surefire-3.5.0
  • 05e4681 [SUREFIRE-2227] Dynamically calculate xrefTestLocation
  • f1a419a [SUREFIRE-2228] Upgrade to Doxia 2.0.0 Milestone Stack
  • 5e14d4f [SUREFIRE-2161] Align Mojo class names and output names
  • c0784ab Bump org.apache.commons:commons-compress from 1.27.0 to 1.27.1
  • 79ea717 [SUREFIRE-2256] Upgrade to Parent 43
  • 4648b47 add Reproducible Builds badge
  • f64c1b3 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #454 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/454 from google:dependabot/maven/dependencies-bf40edc211 ad222968e02a3bbbc2fbdd277d5361701a82a07f PiperOrigin-RevId: 670241908 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 95b5991a..a2b3bb1c 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.30.0 + 2.31.0 provided @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.8.0 + 3.10.0 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.4.0 + 3.5.0 ${test.jvm.flags} @@ -230,7 +230,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 attach-docs From 5c77ccf6790b25cec617944feb18584c969dbade Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 06:59:39 -0700 Subject: [PATCH 268/300] Bump org.checkerframework:checker-qual from 3.46.0 to 3.47.0 in the dependencies group Bumps the dependencies group with 1 update: [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework). Updates `org.checkerframework:checker-qual` from 3.46.0 to 3.47.0
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.47.0

Version 3.47.0 (September 3, 2024)

User-visible changes:

The Checker Framework runs under JDK 22 -- that is, it runs on a version 22 JVM. The Checker Framework runs under JDK 23 -- that is, it runs on a version 23 JVM.

The Optional Checker no longer supports the @OptionalBottom annotation.

Implementation details:

Removed annotations:

  • @OptionalBottom

Closed issues:

#6510, #6704, #6743, #6749, #6760, #6761.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.47.0 (October 1, 2024)

User-visible changes:

Implementation details:

Closed issues:

Version 3.47.0 (September 3, 2024)

User-visible changes:

The Checker Framework runs under JDK 22 -- that is, it runs on a version 22 JVM. The Checker Framework runs under JDK 23 -- that is, it runs on a version 23 JVM.

The Optional Checker no longer supports the @OptionalBottom annotation.

Implementation details:

Removed annotations:

  • @OptionalBottom

Closed issues:

#6510, #6704, #6743, #6749, #6760, #6761.

Commits
  • 2f788fe new release 3.47.0
  • 2d0d20b Prep for release.
  • 0aeb0a4 Removing the @OptionalBottom type and annotation (#6772)
  • 87f9d44 Support Java 23
  • c16094b Remove resolveDependencies target (#6775)
  • c27f651 Don't use /// comments, whose content must be Markdown in Java 23
  • cb70fb7 Update dependency com.amazonaws:aws-java-sdk-bom to v1.12.770 (#6773)
  • 07940f7 Update versions.errorprone to v2.31.0 (#6771)
  • 7b2378e Support Java 22
  • c5cc9d8 Update dependency io.github.classgraph:classgraph to v4.8.175 (#6766)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.46.0&new-version=3.47.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #455 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/455 from google:dependabot/maven/dependencies-913e77514b 2571f31f33a0709f1b8d2cdd2c61408ad4866ae1 PiperOrigin-RevId: 672530806 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2b3bb1c..fd4efcf5 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.46.0 + 3.47.0 From af78b172b4f589acc6e146f8493c945222147411 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 07:39:59 -0700 Subject: [PATCH 269/300] Bump the dependencies group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 2 updates: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) and [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin). Updates `com.google.errorprone:error_prone_annotations` from 2.31.0 to 2.32.0
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.32.0

The minimum support JDK version to run Error Prone is now JDK 17 (#3803).

Using Error Prone to compile code that is deployed to earlier versions is still fully supported, but will requires using JDK 17 or newer for compilation and setting --release or -source/-target/-bootclasspath.

Full changelog: https://github.com/google/error-prone/compare/v2.31.0...v2.32.0

Commits
  • 0fe0961 Release Error Prone 2.32.0
  • 655bdc4 Update release.yml: remove JDK 11
  • a9ff9b1 Update ci.yml: remove JDK 11
  • 4e0b19c Start using Java > 11 language features in Error Prone tests
  • 4b5ee1e Update ci.yml: always set up JDK 17
  • 494e2c6 Don't perform the inlining if parameter names are stripped.
  • dab4089 Add the name of the method to the diagnostic message for MemberName.
  • 671ac41 Update ci.yml to use javadoc:javadoc
  • See full diff in compare view

Updates `org.apache.maven.plugins:maven-gpg-plugin` from 3.2.5 to 3.2.6
Release notes

Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.

3.2.6

Release Notes - Maven GPG Plugin - Version 3.2.6

What's Changed

New Contributors

Full Changelog: https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.5...maven-gpg-plugin-3.2.6

Commits
  • 1c9a14c [maven-release-plugin] prepare release maven-gpg-plugin-3.2.6
  • bbe6156 Add FAQ for "no pinentry" issue (#118)
  • 5b94273 [MGPG-141] Remove use of deprecated classes (#117)
  • afdfd28 [MGPG-138] Drop direct use of plexus-cipher and secdispatcher (#115)
  • 7516e7c [MGPG-140] Update Maven to 3.9.9 (#116)
  • 4ec571f [MGPG-139] Bump org.apache.maven.plugins:maven-invoker-plugin from 3.7.0 to 3...
  • 1126b7b use new Reproducible Central badge endpoint
  • 1b40a05 [MGPG-135] Support Overriding / Enhance the signer in AbstractGpgMojo (#112)
  • 3a31714 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #456 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/456 from google:dependabot/maven/dependencies-dff092f2d9 987df7fa0f2ba07f488bd7efcc5a592b5514f3d0 PiperOrigin-RevId: 675143324 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fd4efcf5..4d02ccc4 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.31.0 + 2.32.0 provided @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.5 + 3.2.6 sign-artifacts From cb49660626f6886a03a6d850c952dee1b052d9d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 07:40:06 -0700 Subject: [PATCH 270/300] Bump actions/setup-java from 4.2.2 to 4.3.0 in the github-actions group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/setup-java](https://github.com/actions/setup-java). Updates `actions/setup-java` from 4.2.2 to 4.3.0
Release notes

Sourced from actions/setup-java's releases.

v4.3.0

What's Changed

steps:
 - name: Checkout
   uses: actions/checkout@v4
 - name: Setup-java
   uses: actions/setup-java@v4
   with:
     distribution: ‘sapmachine’
     java-version: ’21’

Bug fixes :

  • Fix typos on Corretto by @johnshajiang in [#666](https://github.com/actions/setup-java/issues/666)

  • IBM Semeru Enhancement on arm64 by @mahabaleshwars in [#677](https://github.com/actions/setup-java/issues/677)

  • Resolve Basic Validation Check Failures by @aparnajyothi-y
 in [#682](https://github.com/actions/setup-java/issues/682)

New Contributors :

  • @johnshajiang made their first contribution in [#666](https://github.com/actions/setup-java/issues/666)

  • @Shegox made their first contribution in [#614](https://github.com/actions/setup-java/issues/614)

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.3.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.2.2&new-version=4.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #457 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/457 from google:dependabot/github_actions/github-actions-bc3bba8501 5bfd20e43a3e1f2292c436f43d2815f62e831ed6 PiperOrigin-RevId: 675143371 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36fbc56d..c928a0b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 8cb6846f653d4f6df7708a3725a9c58265c98953 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 23 Sep 2024 14:03:03 -0700 Subject: [PATCH 271/300] Bump Guava to 33.3.1. RELNOTES=n/a PiperOrigin-RevId: 677931079 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d02ccc4..6af0664f 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.3.0-jre + 33.3.1-jre com.google.errorprone From 6204b4c1ab02b10a7b825409fe708f4ee3c97025 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 07:21:54 -0700 Subject: [PATCH 272/300] Bump the github-actions group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/setup-java](https://github.com/actions/setup-java). Updates `actions/checkout` from 4.1.7 to 4.2.0
Release notes

Sourced from actions/checkout's releases.

v4.2.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v4.1.7...v4.2.0

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.2.0

v4.1.7

v4.1.6

v4.1.5

v4.1.4

v4.1.3

v4.1.2

v4.1.1

v4.1.0

v4.0.0

v3.6.0

... (truncated)

Commits

Updates `actions/setup-java` from 4.3.0 to 4.4.0
Release notes

Sourced from actions/setup-java's releases.

v4.4.0

What's Changed

Add-ons :

steps:
 - name: Checkout
   uses: actions/checkout@v4
 - name: Setup-java
   uses: actions/setup-java@v4
   with:
     distribution: 'graalvm'
     java-version: '21'

Bug fixes :

  • Add architecture to cache key by @​Zxilly in actions/setup-java#664 This addresses issues with caching by adding the architecture (arch) to the cache key, ensuring that cache keys are accurate to prevent conflicts. Note: This change may break previous cache keys as they will no longer be compatible with the new format.
  • Resolve check failures by @​aparnajyothi-y in actions/setup-java#687

New Contributors

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.4.0

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #460 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/460 from google:dependabot/github_actions/github-actions-eb204747db 638ce54cc5fd82c486c9e6fbbb3ac45aa9d0793c PiperOrigin-RevId: 680564872 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c928a0b9..25c1e6b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,9 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 397316a2948a57bde8cdd9b5aa11df29bb796b44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 07:22:21 -0700 Subject: [PATCH 273/300] Bump the dependencies group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 2 updates: [org.codehaus.plexus:plexus-java](https://github.com/codehaus-plexus/plexus-languages) and [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin). Updates `org.codehaus.plexus:plexus-java` from 1.2.0 to 1.3.0
Release notes

Sourced from org.codehaus.plexus:plexus-java's releases.

1.3.0

🚀 New features and improvements

📦 Dependency updates

👻 Maintenance

Commits
  • 40e19a2 [maven-release-plugin] prepare release plexus-languages-1.3.0
  • 71b2147 Project cleanups
  • 83c78a7 Bump org.codehaus.plexus:plexus from 18 to 19 (#192)
  • abcb0a6 Read only first 8 bytes of class in JavaClassfileVersion
  • 132aa7b Merge pull request #190 from codehaus-plexus/rename-test-resources
  • 216e33d Rename resources of test data
  • 61e68b6 fix Reproducible Central README link
  • 7ef4e5e use new Reproducible Central badge endpoint
  • 8b5240d Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
  • eda608d Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-gpg-plugin` from 3.2.6 to 3.2.7
Release notes

Sourced from org.apache.maven.plugins:maven-gpg-plugin's releases.

3.2.7

Fixes a lingering issue affecting whole 3.2.x lineage, that resulted in "bad passphrase" on Windows OS with GPG signer (see MGPG-136 for details).

What's Changed

Full Changelog: https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.6...maven-gpg-plugin-3.2.7

Commits
  • 43af21c [maven-release-plugin] prepare release maven-gpg-plugin-3.2.7
  • 8c5a8d2 [MGPG-144] Bump commons-io:commons-io from 2.16.1 to 2.17.0 (#119)
  • cb5422f [MGPG-143] Bump com.kohlschutter.junixsocket:junixsocket-core from 2.10.0 to ...
  • 6b2a27f [MGPG-136] Windows passphrase corruption (#120)
  • 31e87e0 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #459 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/459 from google:dependabot/maven/dependencies-03ced6258b b67559601ef395e1219016d17983c41078fcfa84 PiperOrigin-RevId: 680565012 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6af0664f..e280c284 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ org.codehaus.plexus plexus-java - 1.2.0 + 1.3.0 @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.6 + 3.2.7 sign-artifacts From a4c8e4518beb3a786928cefb296dc50a4621e472 Mon Sep 17 00:00:00 2001 From: Chaoren Lin Date: Thu, 3 Oct 2024 12:06:19 -0700 Subject: [PATCH 274/300] Fix missing parentheses in Javadoc. RELNOTES=n/a PiperOrigin-RevId: 681975991 --- src/main/java/com/google/testing/compile/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/testing/compile/package-info.java b/src/main/java/com/google/testing/compile/package-info.java index c3df7693..789c8900 100644 --- a/src/main/java/com/google/testing/compile/package-info.java +++ b/src/main/java/com/google/testing/compile/package-info.java @@ -34,7 +34,7 @@ * * 
  * Compilation compilation =
- *     javac().compile(JavaFileObjects.forSourceString("HelloWorld", "final class HelloWorld {}");
+ *     javac().compile(JavaFileObjects.forSourceString("HelloWorld", "final class HelloWorld {}"));
  * assertThat(compilation).succeeded();
  *
* From e9cb9cf9b1c867dde4f36cf09222b04174ae3b11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 17:34:48 -0700 Subject: [PATCH 275/300] Bump the dependencies group with 4 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 4 updates: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone), [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework), [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) and [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire). Updates `com.google.errorprone:error_prone_annotations` from 2.32.0 to 2.33.0
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.33.0

Similar to release 2.32.0, the minimum supported JDK version to run Error Prone is JDK 17 (#3803). Using Error Prone to compile code that is deployed to earlier versions is still fully supported, but will require using JDK 17 or newer for compilation and setting --release or -source/-target/-bootclasspath.

Changes:

  • Update protobuf version for CVE-2024-7254

New checks:

Full changelog: https://github.com/google/error-prone/compare/v2.32.0...v2.33.0

Commits
  • 7a67f20 Release Error Prone 2.33.0
  • f1f7955 Remove out of place .. Previously, the error message was:
  • c885150 Add a regression test for b/369862572
  • 2b78c1f Avoid a possible IndexOutOfBoundsException in MemberName.
  • 47dd2a8 Suggest Splitter.on(Pattern.compile(...)) instead of Splitter.onPattern
  • 50d0983 Add some missing testdata/ prefixes.
  • f82fb66 Fix typos
  • fb1a05b Update protobuf version
  • be99217 Extend MissingOverride to require @​Override on "an explicitly declared access...
  • 2c04ada Support toSeconds in DurationToLongTimeUnit
  • Additional commits viewable in compare view

Updates `org.checkerframework:checker-qual` from 3.47.0 to 3.48.0
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.48.0

Version 3.48.0 (October 2, 2024)

User-visible changes:

The new SqlQuotesChecker prevents errors in quoting in SQL queries. It prevents injection attacks that exploit quoting errors.

Aggregate Checkers now interleave error messages so that all errors about a line of code appear together.

Closed issues:

#3568, #6725, #6753, #6769, #6770, #6780, #6785, #6795, #6804, #6811, #6825.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.48.0 (October 2, 2024)

User-visible changes:

The new SqlQuotesChecker prevents errors in quoting in SQL queries. It prevents injection attacks that exploit quoting errors.

Aggregate Checkers now interleave error messages so that all errors about a line of code appear together.

Closed issues:

#3568, #6725, #6753, #6769, #6770, #6780, #6785, #6795, #6804, #6811, #6825.

Commits
  • 8a5b585 new release 3.48.0
  • 33dfb84 Fix links.
  • dda798d Prep for release.
  • fe16b7f Remove checker-qual files from shaded dataflow jar
  • 642a853 Add a capture in type argument inference
  • b96e777 Capture the type of field accesses
  • 3b03b37 Updating macOS installation instructions (#6827)
  • 3e837a5 Skip TreeUtils.toStringTruncated when debugging is disabled
  • fe7b19f Check for proper type
  • 97beabc Fix a resource leak false positive due to a cast (#6821)
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.10.0 to 3.10.1
Release notes

Sourced from org.apache.maven.plugins:maven-javadoc-plugin's releases.

maven-javadoc-plugin-3.10.1

What's Changed

Full Changelog: https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.0...maven-javadoc-plugin-3.10.1

Commits
  • 091785b [maven-release-plugin] prepare release maven-javadoc-plugin-3.10.1
  • cde7c56 [MJAVADOC-812] [REGRESSION] maven-javadoc-plugin 3.10.0 creates empty JARs
  • db6d7f6 [MJAVADOC-811] javadoc.bat fails to execute on Windows when project is not on...
  • a737e16 Bump commons-io:commons-io from 2.16.1 to 2.17.0
  • 577c204 Bump org.codehaus.plexus:plexus-io from 3.5.0 to 3.5.1
  • ff52cff Bump org.apache.commons:commons-lang3 from 3.16.0 to 3.17.0
  • 54a7651 Add goal prefix
  • a424c6b [MJAVADOC-810] [REGRESSION] MJAVADOC-791 causes forked Maven execution fail i...
  • d9c0002 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.0 to 3.5.1
Release notes

Sourced from org.apache.maven.plugins:maven-surefire-plugin's releases.

3.5.1

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

Commits
  • a69b0f8 [maven-release-plugin] prepare release surefire-3.5.1
  • ccc54d0 [SUREFIRE-2273] Bump org.hamcrest:hamcrest from 2.2 to 3.0 (#784)
  • ab77c35 [SUREFIRE-2272] Bump org.codehaus.plexus:plexus-java from 1.2.0 to 1.3.0 - JD...
  • 93317ff [SUREFIRE-2269] Allow fail during clean in surefire-its
  • d7f4dbb [SUREFIRE-2270] Use JUnit5 in surefire-shadefire
  • 7a98850 Drop comment from jira integration
  • b2aa8a6 [SUREFIRE-2267] Packages for commons-codec should be relocated in surefire-sh...
  • a928255 [SUREFIRE-1737] Fix disable in statelessTestsetReporter
  • 4584ebb [SUREFIRE-2226] Upgrade to Maven Verifier 2.0.0-M1
  • 5aa3515 [SUREFIRE-2266] Execute ITs in parallel
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #462 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/462 from google:dependabot/maven/dependencies-3653fd1ff9 7119354087c272edb7a771d49fc3db9fd14d3784 PiperOrigin-RevId: 683821543 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e280c284..29a16080 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.32.0 + 2.33.0 provided @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.47.0 + 3.48.0 @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.10.0 + 3.10.1 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.1 ${test.jvm.flags} @@ -230,7 +230,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.0 + 3.10.1 attach-docs From 3b5447b5747ff8dba036ddcd30573c217dc002e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 06:40:14 -0700 Subject: [PATCH 276/300] Bump actions/checkout from 4.2.0 to 4.2.1 in the github-actions group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 4.2.0 to 4.2.1
Release notes

Sourced from actions/checkout's releases.

v4.2.1

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v4.2.0...v4.2.1

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.2.1

v4.2.0

v4.1.7

v4.1.6

v4.1.5

v4.1.4

v4.1.3

v4.1.2

v4.1.1

v4.1.0

v4.0.0

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.2.0&new-version=4.2.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #464 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/464 from google:dependabot/github_actions/github-actions-a9bb80ae19 e9ca98b80c58a9be0b32f518de57b254a947134d PiperOrigin-RevId: 685688517 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25c1e6b0..cf09a90d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 with: From a6807db58d64764e6855bc42aca6533e44ac50d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 06:40:31 -0700 Subject: [PATCH 277/300] Bump org.checkerframework:checker-qual from 3.48.0 to 3.48.1 in the dependencies group Bumps the dependencies group with 1 update: [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework). Updates `org.checkerframework:checker-qual` from 3.48.0 to 3.48.1
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.48.1

Version 3.48.1 (October 11, 2024)

User-visible changes:

The Returns Receiver sub-checker is now disabled by default when running the Resource Leak Checker, as usually it is not needed and it adds overhead. To enable it, use the new -AenableReturnsReceiverForRlc command-line argument.

Closed issues:

#6434, #6810, #6839, #6842, #6856.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.48.1 (October 11, 2024)

User-visible changes:

The Returns Receiver sub-checker is now disabled by default when running the Resource Leak Checker, as usually it is not needed and it adds overhead. To enable it, use the new -AenableReturnsReceiverForRlc command-line argument.

Closed issues:

#6434, #6810, #6839, #6842, #6856.

Commits
  • d051fac new release 3.48.1
  • cb38512 Prep for release.
  • 69d703d More precise analysis of Signature string manipulation
  • 6e8ed8e Skip parens
  • b4e97b9 Update dependency org.plumelib:reflection-util to v1.1.4
  • f503ebc Change smart to dumb quotes
  • 15cb814 Fix problem with GLB
  • b9dd1af Improved documentation and naming for annotation comparisons
  • 09f423a Only capture fields that are not on the LHS of assignments
  • 238e276 Augment arrayaccess node
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.checkerframework:checker-qual&package-manager=maven&previous-version=3.48.0&new-version=3.48.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #463 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/463 from google:dependabot/maven/dependencies-4102e24f2b ac0a5c03b4fd7ab20ea8c740eaff9f7f41f6401a PiperOrigin-RevId: 685688569 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29a16080..9b569f7c 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.48.0 + 3.48.1 From 1483785a816199e9b880d7cd69188a778dab4a19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 06:27:15 -0700 Subject: [PATCH 278/300] Bump com.google.errorprone:error_prone_annotations from 2.33.0 to 2.34.0 in the dependencies group Bumps the dependencies group with 1 update: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone). Updates `com.google.errorprone:error_prone_annotations` from 2.33.0 to 2.34.0
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.34.0

Changes:

  • Passing the javac flag --should-stop=ifError=FLOW is now required when running Error Prone (#4595)
  • The MemberName check was renamed to IdentifierName

New checks:

Closed issues: #4595, #4598, #4620

Full changelog: https://github.com/google/error-prone/compare/v2.33.0...v2.34.0

Commits
  • bb113af Release Error Prone 2.34.0
  • 82a2168 Recognize that Runtime.halt and exit never return.
  • 1d04094 A couple of fixes in MoreAnnotations
  • 6203a0e Remove references to -XDshouldStopPolicyIfError now that `--should-stop=ifE...
  • 40bb976 Tweak ThrowIfUncheckedKnownChecked implementation to match `ThrowIfUnchecke...
  • 6380cc2 Warn about throwIfUnchecked(unchecked), which could be just throw unchecked.
  • 7a73690 Fix or suppress CheckReturnValue errors
  • ca50d5c Update --should-stop=ifError=FLOW flags
  • c897d8f Open-source more of check_api/src/test/java/com/google/errorprone/util
  • 4f630fc Rename MemberName to SymbolName, given it's handling classes too now.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.33.0&new-version=2.34.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #465 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/465 from google:dependabot/maven/dependencies-2d9f7035d8 9e533287c611015604e5ecfe1710bd5ae44d431b PiperOrigin-RevId: 688113663 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b569f7c..66574e78 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.33.0 + 2.34.0 provided From 14957fbe30f6f8b3303b323e191750d9220c167f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:34:43 -0700 Subject: [PATCH 279/300] Bump the dependencies group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 2 updates: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) and [org.apache.maven.plugins:maven-site-plugin](https://github.com/apache/maven-site-plugin). Updates `com.google.errorprone:error_prone_annotations` from 2.34.0 to 2.35.1
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.35.1

Error Prone's dependency on protobuf has been downgraded to 3.25.5 for this release.

Version 3.25.5 of protobuf still fixes CVE-2024-7254. This release is provided for users who aren't ready to update to 4.x, see also #4584 and #4634. Future versions of Error Prone will upgrade back to protobuf 4.x.

Full changelog: https://github.com/google/error-prone/compare/v2.35.0...v2.35.1

Error Prone 2.35.0

Changes:

  • Fix handling of \s before the trailing delimiter in MisleadingEscapedSpace
  • TimeUnitMismatch improvements: handle binary trees, consider trees like fooSeconds * 1000 to have units of millis

New checks:

Full changelog: https://github.com/google/error-prone/compare/v2.34.0...v2.35.0

Commits
  • 0e06cc2 Release Error Prone 2.35.1
  • db6c890 Downgrade protobuf version to 3.25.5
  • ed6b121 Add a repro test for broken behavior inlining the parameter value into the fu...
  • a931fa3 Remove DoNotUseRuleChain from JavaCodeClarity.
  • ec2983b compileUnsafe -> compile for compile-time-constant expressions.
  • 2ce9632 Strip the quotation marks from the source code when reconstructing the literal.
  • 99a0d9d TimeUnitMismatch: handle BinaryTrees.
  • 60c5f76 TimeUnitMismatch: consider trees like fooSeconds * 1000 to have units of `m...
  • 427b51d GetSeconds to ToSeconds error prone
  • See full diff in compare view

Updates `org.apache.maven.plugins:maven-site-plugin` from 3.20.0 to 3.21.0
Commits
  • 43f73ec [maven-release-plugin] prepare release maven-site-plugin-3.21.0
  • a2880fb [MSITE-1024] Remove IT for MSITE-901
  • 6171e7d [MSITE-1023] Upgrade plugins and components (in ITs)
  • efd8a57 [MSITE-1022] Upgrade to Maven Reporting Exec 2.0.0
  • f5c5fc9 Fix typos in history.apt and faq.fml
  • 64c4035 [MSITE-1021] Bump doxiaSitetoolsVersion from 2.0.0-M19 to 2.0.0
  • e26765c [MSITE-1020] Bump org.apache.maven.reporting:maven-reporting-api from 4.0.0-M...
  • 354cf19 [MSITE-1019] Bump doxiaVersion from 2.0.0-M12 to 2.0.0
  • 67b568a Use '@​project.' instead of '@​pom.' expression prefix
  • fdfd807 Add version 3.20.0 to plugin history
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #467 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/467 from google:dependabot/maven/dependencies-1f0b7ad716 2532f840976ff66de2e1d5d80a4fa7420788a3d8 PiperOrigin-RevId: 690588606 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 66574e78..c69ca03d 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.34.0 + 2.35.1 provided @@ -145,7 +145,7 @@ maven-site-plugin - 3.20.0 + 3.21.0 org.apache.maven.plugins From 4c399c0c96942a64a1fac81e0c0c53783fb0c02f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:34:56 -0700 Subject: [PATCH 280/300] Bump the github-actions group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/setup-java](https://github.com/actions/setup-java). Updates `actions/checkout` from 4.2.1 to 4.2.2
Release notes

Sourced from actions/checkout's releases.

v4.2.2

What's Changed

Full Changelog: https://github.com/actions/checkout/compare/v4.2.1...v4.2.2

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.2.2

v4.2.1

v4.2.0

v4.1.7

v4.1.6

v4.1.5

v4.1.4

v4.1.3

v4.1.2

v4.1.1

v4.1.0

... (truncated)

Commits

Updates `actions/setup-java` from 4.4.0 to 4.5.0
Release notes

Sourced from actions/setup-java's releases.

v4.5.0

What's Changed

Bug fixes:

New Contributors:

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.5.0

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #466 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/466 from google:dependabot/github_actions/github-actions-b5d68c1f0b ecd715fb62ccadba09ba8b0140fe2a6a67f35f28 PiperOrigin-RevId: 690588664 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf09a90d..228bc636 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,9 @@ jobs: with: access_token: ${{ github.token }} - name: 'Check out repository' - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 + uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: java-version: ${{ matrix.java }} distribution: 'zulu' From d1790ebd83941d3ea0e39135f794b9b0535a686d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:18:28 -0800 Subject: [PATCH 281/300] Bump the dependencies group with 3 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 3 updates: [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework), [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) and [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire). Updates `org.checkerframework:checker-qual` from 3.48.1 to 3.48.2
Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.48.2 (November 1, 2024)

Closed issues:

#6371, #6867.

Commits
  • 59f4594 new release 3.48.2
  • 93e8fac Prep for release.
  • 013a76c Update lists of aliases for @NonNull (#6883)
  • f23bf98 Update dependency com.amazonaws:aws-java-sdk-bom to v1.12.777 (#6882)
  • 07d8845 Don't re-compute the enclosing method (#6876)
  • a70e1e9 Update dependency org.plumelib:plume-util to v1.10.0 (#6877)
  • fc99f34 Update versions.errorprone to v2.35.1 (#6875)
  • b7d9092 Update versions.errorprone to v2.34.0 (#6870)
  • cfdd5c9 Expect crash due to javac bug
  • 19419ac Cleaner logic to handle types of extends and implements clauses and fixed `ge...
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.10.1 to 3.11.1
Commits
  • 619650c [maven-release-plugin] prepare release maven-javadoc-plugin-3.11.1
  • e314da0 [MJAVADOC-821] Align toolchain discovery code with Maven Compiler Plugin
  • 62a6861 [MJAVADOC-820] [REGRESSION] MJAVADOC-787 was merged incompletely
  • d1090c5 [maven-release-plugin] prepare for next development iteration
  • ee030f7 [maven-release-plugin] prepare release maven-javadoc-plugin-3.11.0
  • 6c5fdc0 [MJAVADOC-819] Align archive generation code with Maven Source Plugin
  • 3a90de5 [MJAVADOC-787] Automatic detection of release option for JDK < 9
  • 373172d [MJAVADOC-817] Upgrade to Doxia 2.0.0 GA Stack
  • ba266c0 Fix SCM tag
  • 5775ce1 Fix typo
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.1 to 3.5.2
Release notes

Sourced from org.apache.maven.plugins:maven-surefire-plugin's releases.

3.5.2

🚀 New features and improvements

📦 Dependency updates

👻 Maintenance

Full Changelog: https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2

Commits
  • ea9f049 [maven-release-plugin] prepare release surefire-3.5.2
  • e1f94a0 [SUREFIRE-2276] JUnit5's TestTemplate failures treated as flakes with retries
  • d24adb4 [SUREFIRE-2277] RunResult#getFlakes() is lost during serialisation/deserialis...
  • 4385e94 Remove links to non-existing report
  • 8881971 Remove outdated FAQ
  • 0121834 [SUREFIRE-2283] FAQ site contains broken link to failsafe-plugin
  • 91d16c3 Fix formatting of XML schema files
  • 6cb417a Add .xsd to .gitattributes
  • 9ce5221 [SUREFIRE-2282] surefire-report-plugin: Update Introduction documentation page
  • 620b983 [SUREFIRE-2281] Upgrade to Doxia 2.0.0 GA Stack
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #468 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/468 from google:dependabot/maven/dependencies-82357643f0 e1b2300cb0f5b2da5a52702c61cd03550ed0230f PiperOrigin-RevId: 692941578 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c69ca03d..f1492b40 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.48.1 + 3.48.2 @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.10.1 + 3.11.1 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 ${test.jvm.flags} @@ -230,7 +230,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 attach-docs From 985a2798d3af50a2ac8e69f11611c8386e387724 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 06:00:06 -0800 Subject: [PATCH 282/300] Bump com.google.errorprone:error_prone_annotations from 2.35.1 to 2.36.0 in the dependencies group Bumps the dependencies group with 1 update: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone). Updates `com.google.errorprone:error_prone_annotations` from 2.35.1 to 2.36.0
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.36.0

Changes:

New checks:

Closed issues: #4633, #4646

Commits
  • ab522c7 Release Error Prone 2.36.0
  • fc5aade Remove swathes of assume()s on the current runtime version.
  • b222ea8 Handle qualified enum elements in MissingCasesInEnumSwitch.
  • 332cbfa Support record destructuring in ArgumentSelectionDefectChecker.
  • 0db3360 UsafeLocaleUsage: update the proposed fix to use replace(char, char)
  • c816c8b StatementSwitchToExpressionSwitch - remove // fall out comments in switches
  • b5fa441 Consolidate javadoc plugin version
  • 2afd0cf Run StatementSwitchToExpressionSwitch_refactoring over EP.
  • 37895d3 Fix snapshot doc publishing after https://github.com/google/error-prone/commi...
  • c438756 StatementSwitchToExpressionSwitch: for "assignment switch" and "direct conver...
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.35.1&new-version=2.36.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #469 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/469 from google:dependabot/maven/dependencies-f244740e28 bc121e5603f476a806b13fc7962d2aebe2634cde PiperOrigin-RevId: 699953619 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1492b40..34a9235b 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.35.1 + 2.36.0 provided From 9a440b3388ad8d3e0dcc33126e4c951a327f4226 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 06:33:11 -0800 Subject: [PATCH 283/300] Bump the dependencies group with 2 updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 2 updates: [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) and [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin). Updates `org.checkerframework:checker-qual` from 3.48.2 to 3.48.3
Release notes

Sourced from org.checkerframework:checker-qual's releases.

Checker Framework 3.48.3

Version 3.48.3 (December 2, 2024)

Closed issues:

#6886.

Changelog

Sourced from org.checkerframework:checker-qual's changelog.

Version 3.48.3 (December 2, 2024)

Closed issues:

#6886.

Commits
  • 5cfc836 new release 3.48.3
  • 422a28d Fix broken links.
  • da611a5 Fix date.
  • 7b92f15 Prep for release.
  • b5479ee Subtypes of AggregateChecker should override getSupportedChecker (#6905)
  • f167fde Remove stray spaces
  • fc765f7 Fix typos: missing type in method signature
  • 3b99338 Update dependency com.amazonaws:aws-java-sdk-bom to v1.12.779 (#6906)
  • 4b24d19 Updating docs: "non-empty" to "present" Optional
  • e6aa0ff Rename variable
  • Additional commits viewable in compare view

Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.11.1 to 3.11.2
Release notes

Sourced from org.apache.maven.plugins:maven-javadoc-plugin's releases.

3.11.2

🚀 New features and improvements

📦 Dependency updates

👻 Maintenance

Commits
  • 44cbab7 [maven-release-plugin] prepare release maven-javadoc-plugin-3.11.2
  • 3de45d8 use github for scm
  • 45ccf06 Bump com.thoughtworks.qdox:qdox from 2.1.0 to 2.2.0
  • 530fa01 [MJAVADOC-823] legacyMode keeps using module-info.java (-sourcedirectory stil...
  • 3a16d92 Bump commons-io:commons-io from 2.17.0 to 2.18.0
  • 69c1ba7 Migrate from Plexus to Sisu Guice (#341)
  • 39857ea Remove usages of deprecated ReaderFactory class (#339)
  • 314203a [MJAVADOC-814] handle parameters such packages with multi lines (#337)
  • 3bb982d refactor: Replace Plexus AbstractLogEnabled with SLF4J (#338)
  • 76826c8 [MJAVADOC-822] skippedModules should be more scalable and support regex (#336)
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #470 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/470 from google:dependabot/maven/dependencies-7253c0f606 92aabc54a02a6c2a4b67bc524a16a5eb2c240c74 PiperOrigin-RevId: 704263468 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 34a9235b..536c05e2 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.checkerframework checker-qual - 3.48.2 + 3.48.3 @@ -134,7 +134,7 @@ maven-javadoc-plugin - 3.11.1 + 3.11.2 --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -230,7 +230,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 attach-docs From e1b6dd238b5031e2816b16ba59675e9f5eddf226 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 9 Dec 2024 06:45:22 -0800 Subject: [PATCH 284/300] Migrate from Checker Framework annotations to JSpecify. RELNOTES=n/a PiperOrigin-RevId: 704266700 --- pom.xml | 6 +++--- .../java/com/google/testing/compile/CompilationSubject.java | 2 +- .../google/testing/compile/CompilationSubjectFactory.java | 2 +- src/main/java/com/google/testing/compile/Compiler.java | 2 +- .../com/google/testing/compile/InMemoryJavaFileManager.java | 2 +- .../com/google/testing/compile/JavaFileObjectSubject.java | 2 +- .../testing/compile/JavaFileObjectSubjectFactory.java | 2 +- .../google/testing/compile/JavaSourceSubjectFactory.java | 2 +- .../java/com/google/testing/compile/JavaSourcesSubject.java | 2 +- .../google/testing/compile/JavaSourcesSubjectFactory.java | 2 +- src/main/java/com/google/testing/compile/MoreTrees.java | 2 +- src/main/java/com/google/testing/compile/TreeDiffer.java | 2 +- .../java/com/google/testing/compile/TreeDifference.java | 2 +- .../java/com/google/testing/compile/TypeEnumerator.java | 2 +- src/main/java/com/google/testing/compile/package-info.java | 2 ++ 15 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 536c05e2..eaa6076d 100644 --- a/pom.xml +++ b/pom.xml @@ -85,9 +85,9 @@ 1.2.2 - org.checkerframework - checker-qual - 3.48.3 + org.jspecify + jspecify + 1.0.0 diff --git a/src/main/java/com/google/testing/compile/CompilationSubject.java b/src/main/java/com/google/testing/compile/CompilationSubject.java index 2fd3f393..22b093ba 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubject.java +++ b/src/main/java/com/google/testing/compile/CompilationSubject.java @@ -57,7 +57,7 @@ import javax.tools.JavaFileManager.Location; import javax.tools.JavaFileObject; import javax.tools.StandardLocation; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A {@link Truth} subject for a {@link Compilation}. */ public final class CompilationSubject extends Subject { diff --git a/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java b/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java index 75eda87a..b2ff5ff4 100644 --- a/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/CompilationSubjectFactory.java @@ -18,7 +18,7 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import com.google.common.truth.Truth; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A {@link Truth} subject factory for a {@link Compilation}. */ final class CompilationSubjectFactory implements Subject.Factory { diff --git a/src/main/java/com/google/testing/compile/Compiler.java b/src/main/java/com/google/testing/compile/Compiler.java index f77d7e56..827f2912 100644 --- a/src/main/java/com/google/testing/compile/Compiler.java +++ b/src/main/java/com/google/testing/compile/Compiler.java @@ -45,7 +45,7 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An object that can {@link #compile} Java source files. */ @AutoValue diff --git a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java index d7f540a2..b2641b3a 100644 --- a/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java +++ b/src/main/java/com/google/testing/compile/InMemoryJavaFileManager.java @@ -43,7 +43,7 @@ import javax.tools.SimpleJavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A file manager implementation that stores all output in memory. diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java index 29211b6f..80df4894 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubject.java @@ -36,7 +36,7 @@ import java.nio.charset.Charset; import java.util.function.BiFunction; import javax.tools.JavaFileObject; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Assertions about {@link JavaFileObject}s. */ public final class JavaFileObjectSubject extends Subject { diff --git a/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java b/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java index daf7fc47..174c29af 100644 --- a/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/JavaFileObjectSubjectFactory.java @@ -18,7 +18,7 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import javax.tools.JavaFileObject; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A factory for {@link JavaFileObjectSubject}s. */ final class JavaFileObjectSubjectFactory diff --git a/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java b/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java index 9e807ab5..ba477913 100644 --- a/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/JavaSourceSubjectFactory.java @@ -18,7 +18,7 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import javax.tools.JavaFileObject; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A Truth {@link Subject.Factory} similar to diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java index a088c411..1687c2e8 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubject.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubject.java @@ -55,7 +55,7 @@ import javax.tools.Diagnostic.Kind; import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A Truth {@link Subject} that evaluates the result diff --git a/src/main/java/com/google/testing/compile/JavaSourcesSubjectFactory.java b/src/main/java/com/google/testing/compile/JavaSourcesSubjectFactory.java index 89cb800b..517e21e1 100644 --- a/src/main/java/com/google/testing/compile/JavaSourcesSubjectFactory.java +++ b/src/main/java/com/google/testing/compile/JavaSourcesSubjectFactory.java @@ -18,7 +18,7 @@ import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import javax.tools.JavaFileObject; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A Truth {@link Subject.Factory} for creating diff --git a/src/main/java/com/google/testing/compile/MoreTrees.java b/src/main/java/com/google/testing/compile/MoreTrees.java index 5a10e044..9c4fd1d6 100644 --- a/src/main/java/com/google/testing/compile/MoreTrees.java +++ b/src/main/java/com/google/testing/compile/MoreTrees.java @@ -35,7 +35,7 @@ import com.sun.source.util.TreePathScanner; import java.util.Arrays; import java.util.Optional; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class containing methods which are useful for gaining access to {@code Tree} instances from diff --git a/src/main/java/com/google/testing/compile/TreeDiffer.java b/src/main/java/com/google/testing/compile/TreeDiffer.java index 87344c22..9df5585d 100644 --- a/src/main/java/com/google/testing/compile/TreeDiffer.java +++ b/src/main/java/com/google/testing/compile/TreeDiffer.java @@ -54,7 +54,7 @@ import javax.lang.model.element.Name; import javax.lang.model.type.TypeMirror; import javax.tools.JavaFileObject; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class for determining how two compilation {@code Tree}s differ from each other. diff --git a/src/main/java/com/google/testing/compile/TreeDifference.java b/src/main/java/com/google/testing/compile/TreeDifference.java index 1170bbfd..f62481a1 100644 --- a/src/main/java/com/google/testing/compile/TreeDifference.java +++ b/src/main/java/com/google/testing/compile/TreeDifference.java @@ -22,7 +22,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.sun.source.tree.Tree; import com.sun.source.util.TreePath; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A data structure describing the set of syntactic differences between two {@link Tree}s. diff --git a/src/main/java/com/google/testing/compile/TypeEnumerator.java b/src/main/java/com/google/testing/compile/TypeEnumerator.java index a385ac75..ac65357d 100644 --- a/src/main/java/com/google/testing/compile/TypeEnumerator.java +++ b/src/main/java/com/google/testing/compile/TypeEnumerator.java @@ -29,7 +29,7 @@ import com.sun.source.tree.Tree; import com.sun.source.util.TreeScanner; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides information about the set of types that are declared by a {@code CompilationUnitTree}. diff --git a/src/main/java/com/google/testing/compile/package-info.java b/src/main/java/com/google/testing/compile/package-info.java index 789c8900..24015b5a 100644 --- a/src/main/java/com/google/testing/compile/package-info.java +++ b/src/main/java/com/google/testing/compile/package-info.java @@ -83,6 +83,8 @@ * */ @CheckReturnValue +@NullMarked package com.google.testing.compile; import com.google.errorprone.annotations.CheckReturnValue; +import org.jspecify.annotations.NullMarked; From 554d01e9d02992d14c34c0b69207a71cfda54f63 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 17 Dec 2024 06:10:36 -0800 Subject: [PATCH 285/300] Bump Guava to 33.4.0. RELNOTES=n/a PiperOrigin-RevId: 707067227 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eaa6076d..5d4887af 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.3.1-jre + 33.4.0-jre com.google.errorprone From 697ea4ab4cd1df94f1ac46c98d0461c326112df2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:00:31 -0800 Subject: [PATCH 286/300] Bump actions/setup-java from 4.5.0 to 4.6.0 in the github-actions group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/setup-java](https://github.com/actions/setup-java). Updates `actions/setup-java` from 4.5.0 to 4.6.0
Release notes

Sourced from actions/setup-java's releases.

v4.6.0

What's Changed

Add-ons:

 - name: Checkout
   uses: actions/checkout@v4
 - name: Setup-java
   uses: actions/setup-java@v4
   with:
     distribution: ‘jetbrains’
     java-version: '21'

Bug fixes:

New Contributors

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.6.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.5.0&new-version=4.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #473 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/473 from google:dependabot/github_actions/github-actions-1698d9c701 585ee854fcfd645222602f0faeca73da54fb67ae PiperOrigin-RevId: 709075233 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 228bc636..b61dffa8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b + uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b with: java-version: ${{ matrix.java }} distribution: 'zulu' From 1ae8a206f84c43fe67907ec072e89ebd72d4f4c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 06:30:49 -0800 Subject: [PATCH 287/300] Bump actions/setup-java from 4.6.0 to 4.7.0 in the github-actions group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/setup-java](https://github.com/actions/setup-java). Updates `actions/setup-java` from 4.6.0 to 4.7.0
Release notes

Sourced from actions/setup-java's releases.

v4.7.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.7.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.6.0&new-version=4.7.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #474 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/474 from google:dependabot/github_actions/github-actions-937a6f8793 247bbd3ba976756e009315bfd5e71bc8bec7cb87 PiperOrigin-RevId: 722635277 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b61dffa8..6cf719e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b + uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 with: java-version: ${{ matrix.java }} distribution: 'zulu' From 99e32928c2672b2c937252b0bcea48c75fc290dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 07:31:24 -0800 Subject: [PATCH 288/300] Bump org.codehaus.plexus:plexus-java from 1.3.0 to 1.4.0 in the dependencies group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 1 update: [org.codehaus.plexus:plexus-java](https://github.com/codehaus-plexus/plexus-languages). Updates `org.codehaus.plexus:plexus-java` from 1.3.0 to 1.4.0
Release notes

Sourced from org.codehaus.plexus:plexus-java's releases.

1.4.0

🚀 New features and improvements

  • Bump org.ow2.asm:asm from 9.7 to 9.7.1 - JDK 24 support (#194) @​jorsol

📦 Dependency updates

👻 Maintenance

Commits
  • 04fc2d1 [maven-release-plugin] prepare release plexus-languages-1.4.0
  • 452c8f1 Bump org.codehaus.plexus:plexus from 19 to 20 (#203)
  • 77283f3 Disable deploy job on GitHub
  • 1e651ae Bump org.assertj:assertj-core from 3.27.2 to 3.27.3
  • fe8e367 Bump org.assertj:assertj-core from 3.27.1 to 3.27.2
  • e50bd08 Bump org.assertj:assertj-core from 3.27.0 to 3.27.1
  • 859c03f Bump org.assertj:assertj-core from 3.26.3 to 3.27.0
  • 390c513 Bump com.thoughtworks.qdox:qdox from 2.1.0 to 2.2.0
  • 9767a26 Added sample helloworld compiled with Java 23 and 24
  • 1978ee7 Bump org.ow2.asm:asm from 9.7 to 9.7.1 - JDK 24 support
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=1.3.0&new-version=1.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #475 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/475 from google:dependabot/maven/dependencies-f9492783bc 648ec3c7a063070be38f9833157f89043a321a8c PiperOrigin-RevId: 725207337 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d4887af..063f9649 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ org.codehaus.plexus plexus-java - 1.3.0 + 1.4.0 From a4646b8a1f17971c5d4446a650d8d5d0fe4d04bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 06:09:46 -0800 Subject: [PATCH 289/300] Bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.14.0 in the dependencies group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 1 update: [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin). Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.13.0 to 3.14.0
Release notes

Sourced from org.apache.maven.plugins:maven-compiler-plugin's releases.

3.14.0

🚀 New features and improvements

🐛 Bug Fixes

📦 Dependency updates

👻 Maintenance

🔧 Build

Commits
  • b5e7d9b [maven-release-plugin] prepare release maven-compiler-plugin-3.14.0
  • 9134f12 Enable GitHub Issues
  • 19b8b12 Update scm tag according to branch
  • 09dce4e [MCOMPILER-579] allow module-version configuration (#273)
  • f7c3c5f Bump org.codehaus.plexus:plexus-java from 1.2.0 to 1.4.0
  • 764a54b [MNGSITE-529] Rename "Goals" to "Plugin Documentation"
  • cfacbc1 PR Automation only on close event
  • 5c26bba Use JUnit version from parent
  • 5449407 [MCOMPILER-529] Update docs about version schema (Maven 3)
  • 01d5b88 Bump mavenVersion from 3.6.3 to 3.9.9 (#283)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-compiler-plugin&package-manager=maven&previous-version=3.13.0&new-version=3.14.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #476 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/476 from google:dependabot/maven/dependencies-98d613b785 81072d3f2ce57f8bd0c73b524145ad58d15e899b PiperOrigin-RevId: 730421460 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 063f9649..fdcc82e1 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ maven-compiler-plugin - 3.13.0 + 3.14.0 1.8 1.8 From 8259709a0f5995c7cc89f28425ca1a055bc5b24d Mon Sep 17 00:00:00 2001 From: cpovirk Date: Thu, 20 Mar 2025 10:31:56 -0700 Subject: [PATCH 290/300] Bump Guava, usually to 33.4.5. ...but only to 33.4.3 in Truth: 33.4.4 and higher contain type-use annotations, which [confuse old version of GWT unless we declare a GWT module for them](https://github.com/jspecify/jspecify/issues/184). And we can't upgrade our version of GWT for [multiple reasons](https://github.com/google/truth/pull/1378). RELNOTES=n/a PiperOrigin-RevId: 738856241 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fdcc82e1..f7c74253 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.4.0-jre + 33.4.5-jre com.google.errorprone From d99af5188da08ba800f902b609a3607da07be535 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 21 Mar 2025 14:12:01 -0700 Subject: [PATCH 291/300] Standardize Dependabot configs on "Maven weekly, GitHub Actions monthly." This includes: - setting up Dependabot _at all_ for a few projects - dropping GitHub Actions from weekly to monthly for the rest My feeling on the latter is that GitHub Actions upgrades never feel urgent: Even when GitHub stopped supporting old versions of `actions/cache`, they gave plenty of warning. I'd also note that I don't think we've had trouble much (if ever?) with upgrades to GitHub Actions, so there's even less reason to fear batching of updates than usual. Given that, we might as well try to batch together as many updates as we can so as to marginally reduce toil. (And if an upgrade it ever truly urgent for security reasons, I expect that Dependabot would push us to it promptly, anyway, perhaps even for projects without a Dependabot config at all.) RELNOTES=n/a PiperOrigin-RevId: 739294702 --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8519eb9a..1a6f7b71 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,7 +12,7 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "weekly" + interval: "monthly" groups: github-actions: applies-to: version-updates From 9afd7779adf499b772f48490b3e2000688174357 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 14:43:25 -0700 Subject: [PATCH 292/300] Bump com.google.errorprone:error_prone_annotations from 2.36.0 to 2.37.0 in the dependencies group Bumps the dependencies group with 1 update: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone). Updates `com.google.errorprone:error_prone_annotations` from 2.36.0 to 2.37.0
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.37.0

Changes:

  • The annotations that were previously in error_prone_type_annotations have been been merged into error_prone_annotations. error_prone_type_annotations is now deprecated, and will be removed in a future release.

New checks:

  • AssignmentExpression - The use of an assignment expression can be surprising and hard to read; consider factoring out the assignment to a separate statement.
  • IntFloatConversion - Detect calls to scalb that should be using the double overload instead
  • InvalidSnippet - Detects snippets which omit the : required for inline code.
  • JUnit4EmptyMethods - Detects empty JUnit4 @Before, @After, @BeforeClass, and @AfterClass methods.
  • MockIllegalThrows - Detects cases where Mockito is configured to throw checked exception types which are impossible.
  • NegativeBoolean - Prefer positive boolean names.
  • RuleNotRun - Detects TestRules not annotated with @Rule, that won't be run.
  • StringConcatToTextBlock - Replaces concatenated multiline strings with text blocks.
  • TimeInStaticInitializer - Detects accesses of the system time in static contexts.

Closed issues:

  • Propagate check flags in patch mode (#4699)
  • Fixes a crash in ComputeIfAbsentAmbiguousReference (#4736)
  • Show the field name in HidingField diagnostics (#4775)
  • Add support for jakarta annotations to some checks (#4782)
  • FloatingPointAssertionWithinEpsilonTest depends on default locale (#4815)
  • @InlineMe patching of Strings.repeat produces broken code (#4819)
  • Fix a crash in IdentifierName on unnamed (_) variables (#4847)
  • Fix a crash in ArgumentParameterSwap (#490)

Full changelog: https://github.com/google/error-prone/compare/v2.36.0...v2.37.0

Commits
  • a453935 Release Error Prone 2.37.0
  • 81faa5a Update JDK versions in release.yml
  • 62086b7 Handle multiple arguments in thenThrow.
  • 7440ff1 In StringConcatToTextBlock, don't assume that string literals always have sou...
  • 04fe835 Adds type_annotations back but as a relocation to annotations
  • 1ad73c2 Handle yield in Reachability
  • b1b521f Sniff out the canonical constructor using detective work rather than a flag w...
  • 86e5c95 Optimization: Abort class scan in JUnit4TestNotRun if all suspicious method...
  • c139e7f [StatementSwitchToExpressionSwitch] for the return switch pattern, fix a bug ...
  • 296fb4e Hardcode BoxedPrimitiveEquality:ExemptStaticConstants = false.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.36.0&new-version=2.37.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #479 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/479 from google:dependabot/maven/dependencies-1205c89287 2c64a90377b652d747ba2d42beb0c423191b5155 PiperOrigin-RevId: 739304082 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7c74253..5b6a7642 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.36.0 + 2.37.0 provided From 88d48f6aca28c08a63feb9326699e99b0a1b66f8 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 25 Mar 2025 09:48:54 -0700 Subject: [PATCH 293/300] Bump Guava to 33.4.6. RELNOTES=n/a PiperOrigin-RevId: 740383320 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b6a7642..89a8f102 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.4.5-jre + 33.4.6-jre com.google.errorprone From 8c890e2a4c77451183231ace7dde74f537c5dd5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 08:35:42 -0700 Subject: [PATCH 294/300] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.2 to 3.5.3 in the dependencies group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 1 update: [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire). Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.2 to 3.5.3
Release notes

Sourced from org.apache.maven.plugins:maven-surefire-plugin's releases.

3.5.3

🐛 Bug Fixes

👻 Maintenance

📦 Dependency updates

Commits
  • 4434650 [maven-release-plugin] prepare release surefire-3.5.3
  • 1270950 use github directly
  • 59f3a1f release tag name backward compatible
  • dfbabe2 assertj-core must be test scope (#826)
  • e1f8119 back to 3.5.3-SNAPSHOT
  • c497559 [maven-release-plugin] prepare for next development iteration
  • 3962112 [maven-release-plugin] prepare release v3.5.3
  • 227c134 surefire shared utils version current version (#825)
  • 1d34c34 Bump org.htmlunit:htmlunit from 4.10.0 to 4.11.1
  • 906b65a Update site descriptors
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-surefire-plugin&package-manager=maven&previous-version=3.5.2&new-version=3.5.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #481 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/481 from google:dependabot/maven/dependencies-9b5e3112d5 e8160d9a291ab8f3cbb1436634aaf5705b9c631f PiperOrigin-RevId: 742276163 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 89a8f102..9c2534a7 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + 3.5.3 ${test.jvm.flags} From a7b5c580bb631c3216fd8c3013b408c06130acad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 07:46:36 -0700 Subject: [PATCH 295/300] Bump org.codehaus.plexus:plexus-java from 1.4.0 to 1.5.0 in the dependencies group Bumps the dependencies group with 1 update: [org.codehaus.plexus:plexus-java](https://github.com/codehaus-plexus/plexus-languages). Updates `org.codehaus.plexus:plexus-java` from 1.4.0 to 1.5.0
Commits
  • c568b67 [maven-release-plugin] prepare release plexus-languages-1.5.0
  • cabd31e Bump org.ow2.asm:asm from 9.7.1 to 9.8 (#204)
  • 48e0108 [maven-release-plugin] prepare for next development iteration
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.codehaus.plexus:plexus-java&package-manager=maven&previous-version=1.4.0&new-version=1.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #482 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/482 from google:dependabot/maven/dependencies-569350e454 23c67f1e4a635201c651b18e4097c89c5a414645 PiperOrigin-RevId: 744719194 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9c2534a7..b8d6989a 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ org.codehaus.plexus plexus-java - 1.4.0 + 1.5.0 From 1310eeffd30d3d64f97d76ccd7de755ba8c4e165 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 7 Apr 2025 09:31:30 -0700 Subject: [PATCH 296/300] Remove `plexus-java` overrides. These override dates from cl/177360283 and cl/179690614, when they were perhaps necessary for Java 9 support? Our other projects doing fine with the default `plexus-java` version that `maven-compiler-plugin` pulls in nowadays, so I doubt that we need this configuration. So let's remove it and give Dependabot one less reason to send us [updates](https://github.com/google/compile-testing/pull/482). RELNOTES=n/a PiperOrigin-RevId: 744749356 --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index b8d6989a..37ad91e9 100644 --- a/pom.xml +++ b/pom.xml @@ -112,13 +112,6 @@ true true - - - org.codehaus.plexus - plexus-java - 1.5.0 - - maven-release-plugin From 6564cc2e311bddb5e76440491c0b21d0b894a053 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 8 Apr 2025 07:44:33 -0700 Subject: [PATCH 297/300] Bump Guava to 33.4.7. RELNOTES=n/a PiperOrigin-RevId: 745140661 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37ad91e9..6e56a9bf 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.4.6-jre + 33.4.7-jre com.google.errorprone From 9623773dceb63e72ceef8d0b7296919b69f18046 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 14 Apr 2025 11:39:56 -0700 Subject: [PATCH 298/300] Bump Guava to 33.4.8. RELNOTES=n/a PiperOrigin-RevId: 747504024 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e56a9bf..95dbf8cb 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ com.google.guava guava - 33.4.7-jre + 33.4.8-jre com.google.errorprone From 64117e964a86968c5e51902a1a8f7044ff4cbf4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Apr 2025 07:23:52 -0700 Subject: [PATCH 299/300] Bump com.google.errorprone:error_prone_annotations from 2.37.0 to 2.38.0 in the dependencies group Bumps the dependencies group with 1 update: [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone). Updates `com.google.errorprone:error_prone_annotations` from 2.37.0 to 2.38.0
Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.38.0

New checks:

Closed issues: #4924, #4897, #4995

Full changelog: https://github.com/google/error-prone/compare/v2.37.0...v2.38.0

Commits
  • a07bd3e Release Error Prone 2.38.0
  • 09fd394 Fix typo in NullTernary.md
  • 4171fd7 FindIdentifiers: find binding variables declared by enclosing or earlier if...
  • d78f515 Audit each use of ElementKind.LOCAL_VARIABLE, and add BINDING_VARIABLE if app...
  • 6f94a97 Tolerate default cases in switches as being present to handle version skew
  • 0223abb Support @LenientFormatString in LenientFormatStringValidation.
  • cb7dfaf Remove the Side enum.
  • d64c9ce Promote error prone check TestExceptionChecker to ERROR within Google (blaze ...
  • c0ce475 Move TargetType to a top-level class alongside ASTHelpers.
  • 90b8efb Allow binding to BINDING_VARIABLEs in GuardedByBinder.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=maven&previous-version=2.37.0&new-version=2.38.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #486 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/486 from google:dependabot/maven/dependencies-83099173fb d80ee04ae7564ab5f59517080df4b9bde1f3f21d PiperOrigin-RevId: 749790516 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95dbf8cb..efa72c06 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.google.errorprone error_prone_annotations - 2.37.0 + 2.38.0 provided From b559d2539683c689b1aab580b5cfa43b39f93e3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 May 2025 09:35:14 -0700 Subject: [PATCH 300/300] Bump actions/setup-java from 4.7.0 to 4.7.1 in the github-actions group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/setup-java](https://github.com/actions/setup-java). Updates `actions/setup-java` from 4.7.0 to 4.7.1
Release notes

Sourced from actions/setup-java's releases.

v4.7.1

What's Changed

Documentation changes

Dependency updates:

Full Changelog: https://github.com/actions/setup-java/compare/v4...v4.7.1

Commits
  • c5195ef actions/cache upgrade to 4.0.3 (#773)
  • dd38875 Bump ts-jest from 29.1.2 to 29.2.5 (#743)
  • 148017a Bump @​actions/glob from 0.4.0 to 0.5.0 (#744)
  • 3b6c050 Remove duplicated GraalVM section in documentation (#716)
  • b8ebb8b upgrade @​action/cache from 4.0.0 to 4.0.2 (#766)
  • 799ee7c Add Documentation to Recommend Using GraalVM JDK 17 Version to 17.0.12 to Ali...
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-java&package-manager=github_actions&previous-version=4.7.0&new-version=4.7.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Fixes #487 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/compile-testing/pull/487 from google:dependabot/github_actions/github-actions-195b2b4ccf c8e08fa228ce4c38a759be8475e2d32b39147ec5 PiperOrigin-RevId: 753621354 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cf719e6..6b7e2ae7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: 'Check out repository' uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 with: java-version: ${{ matrix.java }} distribution: 'zulu'