Browse Source
Fix errorprone configuration for maven-compiler-plugin with javac
See https://errorprone.info/docs/installation. Add new profile jdk8 to enable running errorprone with javac on java 8 and java 11. Remove errorprone configuration from benchmark module, didn't find a way to make it work and this module does not contain any productive code. Change-Id: I6a84195af05e6cea9e7c04ad5cd4c79742e80cb3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.11.0.202103031150-rc1
Matthias Sohn
3 years ago
2 changed files with 37 additions and 84 deletions
+ 3
- 37
org.eclipse.jgit.benchmarks/pom.xml
View File
| @@ -70,47 +70,13 @@ | |||
| </executions> | |||
| </plugin> | |||
| <plugin> | |||
| <groupId>org.apache.maven.plugins</groupId> | |||
| <artifactId>maven-compiler-plugin</artifactId> | |||
| <version>3.8.1</version> | |||
| <configuration> | |||
| <compilerVersion>${javac.target}</compilerVersion> | |||
| <source>${javac.target}</source> | |||
| <target>${javac.target}</target> | |||
| <encoding>UTF-8</encoding> | |||
| <source>1.8</source> | |||
| <target>1.8</target> | |||
| <generatedSourcesDirectory>.apt_generated</generatedSourcesDirectory> | |||
| </configuration> | |||
| <executions> | |||
| <execution> | |||
| <id>compile-with-errorprone</id> | |||
| <phase>compile</phase> | |||
| <goals> | |||
| <goal>compile</goal> | |||
| </goals> | |||
| <configuration> | |||
| <compilerId>javac-with-errorprone</compilerId> | |||
| <forceJavacCompilerUse>true</forceJavacCompilerUse> | |||
| </configuration> | |||
| </execution> | |||
| </executions> | |||
| <dependencies> | |||
| <dependency> | |||
| <groupId>org.codehaus.plexus</groupId> | |||
| <artifactId>plexus-compiler-javac</artifactId> | |||
| <version>2.8.5</version> | |||
| </dependency> | |||
| <dependency> | |||
| <groupId>org.codehaus.plexus</groupId> | |||
| <artifactId>plexus-compiler-javac-errorprone</artifactId> | |||
| <version>2.8.5</version> | |||
| </dependency> | |||
| <!-- override plexus-compiler-javac-errorprone's dependency on | |||
| Error Prone with the latest version --> | |||
| <dependency> | |||
| <groupId>com.google.errorprone</groupId> | |||
| <artifactId>error_prone_core</artifactId> | |||
| <version>2.3.4</version> | |||
| </dependency> | |||
| </dependencies> | |||
| </plugin> | |||
| <plugin> | |||
| <groupId>org.apache.maven.plugins</groupId> | |||
+ 34
- 47
pom.xml
View File
| @@ -814,54 +814,41 @@ | |||
| <encoding>UTF-8</encoding> | |||
| <source>1.8</source> | |||
| <target>1.8</target> | |||
| <compilerArgs> | |||
| <arg>-XDcompilePolicy=simple</arg> | |||
| <arg>-Xplugin:ErrorProne</arg> | |||
| </compilerArgs> | |||
| <annotationProcessorPaths> | |||
| <path> | |||
| <groupId>com.google.errorprone</groupId> | |||
| <artifactId>error_prone_core</artifactId> | |||
| <version>2.4.0</version> | |||
| </path> | |||
| </annotationProcessorPaths> | |||
| </configuration> | |||
| </plugin> | |||
| </plugins> | |||
| </build> | |||
| </profile> | |||
| <profile> | |||
| <id>jdk8</id> | |||
| <activation> | |||
| <jdk>1.8</jdk> | |||
| </activation> | |||
| <properties> | |||
| <javac.version>9+181-r4173-1</javac.version> | |||
| </properties> | |||
| <build> | |||
| <plugins> | |||
| <plugin> | |||
| <groupId>org.apache.maven.plugins</groupId> | |||
| <artifactId>maven-compiler-plugin</artifactId> | |||
| <configuration> | |||
| <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> | |||
| <executions> | |||
| <execution> | |||
| <id>default-compile</id> | |||
| <phase>compile</phase> | |||
| <goals> | |||
| <goal>compile</goal> | |||
| </goals> | |||
| <configuration> | |||
| <includes> | |||
| <include>org/eclipse/jgit/transport/InsecureCipherFactory.java</include> | |||
| </includes> | |||
| </configuration> | |||
| </execution> | |||
| <execution> | |||
| <id>compile-with-errorprone</id> | |||
| <phase>compile</phase> | |||
| <goals> | |||
| <goal>compile</goal> | |||
| </goals> | |||
| <configuration> | |||
| <compilerId>javac-with-errorprone</compilerId> | |||
| <forceJavacCompilerUse>true</forceJavacCompilerUse> | |||
| <excludes> | |||
| <exclude>org/eclipse/jgit/transport/InsecureCipherFactory.java</exclude> | |||
| </excludes> | |||
| </configuration> | |||
| </execution> | |||
| </executions> | |||
| <dependencies> | |||
| <dependency> | |||
| <groupId>org.codehaus.plexus</groupId> | |||
| <artifactId>plexus-compiler-javac</artifactId> | |||
| <version>${plexus-compiler-version}</version> | |||
| </dependency> | |||
| <dependency> | |||
| <groupId>org.codehaus.plexus</groupId> | |||
| <artifactId>plexus-compiler-javac-errorprone</artifactId> | |||
| <version>${plexus-compiler-version}</version> | |||
| </dependency> | |||
| <!-- override plexus-compiler-javac-errorprone's dependency on | |||
| Error Prone with the latest version --> | |||
| <dependency> | |||
| <groupId>com.google.errorprone</groupId> | |||
| <artifactId>error_prone_core</artifactId> | |||
| <version>2.3.4</version> | |||
| </dependency> | |||
| </dependencies> | |||
| </plugin> | |||
| </plugins> | |||
| </build> | |||
Loading…