Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump error_prone_core from 2.3.4 to 2.5.1 #383

Merged
merged 6 commits into from
Mar 16, 2021
Merged

Bump error_prone_core from 2.3.4 to 2.5.1 #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a79fbc9
Bump error_prone_core from 2.3.4 to 2.5.1
dependabot[bot] Mar 15, 2021
89cf006
try to get errorprone to work on JDK 8
meltsufin Mar 15, 2021
3a1f5bb
formatting
meltsufin Mar 15, 2021
eba7018
formatting again
meltsufin Mar 15, 2021
f121c9e
Merge remote-tracking branch 'gcp/main' into dependabot/maven/com.goo…
meltsufin Mar 15, 2021
013bca0
try fixing errorprone
meltsufin Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<properties>
<app-engine-maven-plugin.version>2.4.0</app-engine-maven-plugin.version>
<asciidoctor-maven-plugin.version>2.0.0</asciidoctor-maven-plugin.version>
<errorprone.version>2.3.4</errorprone.version>
<errorprone.version>2.5.1</errorprone.version>
<integration-test.pattern>**/*IntegrationTest*</integration-test.pattern>
<java-cfenv.version>2.3.0</java-cfenv.version>
<javadoc.failOnError>false</javadoc.failOnError>
Expand Down Expand Up @@ -454,7 +454,7 @@
<profile>
<id>errorprone_java_9_and_up</id>
<activation>
<jdk>[9,13]</jdk>
<jdk>[9,]</jdk>
</activation>
<build>
<pluginManagement>
Expand All @@ -469,7 +469,6 @@
<compilerArgs>
<arg>-XDcompilePolicy=simple</arg>
<arg>-Xplugin:ErrorProne</arg>
<arg>-parameters</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
Expand All @@ -490,31 +489,22 @@
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<javac.version>9+181-r4173-1</javac.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<compilerArgs>
<!-- Enable all warnings -->
<compilerArg>-Xlint:all</compilerArg>
<!-- Disable options warning because we will have differences between the compiler and source code level-->
<compilerArg>-Xlint:-options</compilerArg>
<!-- Disable serialversionuid warnings -->
<compilerArg>-Xlint:-serial</compilerArg>
<!--compilerArg>-Werror</compilerArg-->
<arg>-parameters</arg>
<fork>true</fork>
<compilerArgs combine.children="append">
<arg>-J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar</arg>
</compilerArgs>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
Expand Down
1 change: 1 addition & 0 deletions ...om/google/cloud/spring/data/spanner/repository/query/SpannerQueryLookupStrategyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public class SpannerQueryLookupStrategyTests {
private SpelExpressionParser spelExpressionParser;

@Before
@SuppressWarnings("BadAnnotationImplementation")
public void initMocks() {
this.spannerMappingContext = new SpannerMappingContext();
this.spannerTemplate = mock(SpannerTemplate.class);
Expand Down