diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 104 |
1 files changed, 50 insertions, 54 deletions
@@ -18,7 +18,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>5.13.1-SNAPSHOT</version> + <version>6.0.0-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> @@ -168,7 +168,7 @@ <httpcore-version>4.4.14</httpcore-version> <slf4j-version>1.7.30</slf4j-version> <log4j-version>1.2.15</log4j-version> - <maven-javadoc-plugin-version>3.3.0</maven-javadoc-plugin-version> + <maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version> <tycho-extras-version>1.7.0</tycho-extras-version> <gson-version>2.8.7</gson-version> <bouncycastle-version>1.69</bouncycastle-version> @@ -204,14 +204,6 @@ <id>repo.eclipse.org.cbi-snapshots</id> <url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url> </pluginRepository> - <pluginRepository> - <id>repo.eclipse.org.dash-releases</id> - <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url> - </pluginRepository> - <pluginRepository> - <id>repo.eclipse.org.dash-snapshots</id> - <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url> - </pluginRepository> </pluginRepositories> <build> @@ -332,7 +324,7 @@ <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.3.1</version> + <version>1.1.7</version> </plugin> <plugin> <groupId>org.eclipse.tycho.extras</groupId> @@ -401,11 +393,6 @@ <artifactId>spring-boot-maven-plugin</artifactId> <version>2.4.4</version> </plugin> - <plugin> - <groupId>org.eclipse.dash</groupId> - <artifactId>license-tool-plugin</artifactId> - <version>0.0.1-SNAPSHOT</version> - </plugin> </plugins> </pluginManagement> @@ -564,10 +551,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> </plugin> - <plugin> - <groupId>org.eclipse.dash</groupId> - <artifactId>license-tool-plugin</artifactId> - </plugin> </plugins> </build> @@ -839,41 +822,54 @@ <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> |