Update tycho to 2.5.0 and target platform to jgit-4.17
jgit-4.17 corresponds to Eclipse 2020-09, which is the first Eclipse version that required Java 11, and which is JGit's new baseline as of JGit 6.0. Remove pack200 which is deprecated in Java 11 and isn't supported by tycho 2.5.0 anymore. It was specified in JSR 200 (J2SE 1.5) [1], deprecated in JEP 336 (Java SE 11) [2] and removed in JEP 367 (Java SE 14) [3]. [1] https://www.jcp.org/en/jsr/detail?id=200 [2] https://openjdk.java.net/jeps/336 [3] https://openjdk.java.net/jeps/367 Change-Id: I12c196586397779d2be81d2374207703e3fc5dbf
This commit is contained in:
Matthias Sohn
parent
e4550807a3
commit
39d4daefd2
|
|
@ -23,9 +23,9 @@
|
|||
|
||||
<properties>
|
||||
<java.version>11</java.version>
|
||||
<tycho-version>1.7.0</tycho-version>
|
||||
<tycho-version>2.5.0</tycho-version>
|
||||
<tycho-extras-version>${tycho-version}</tycho-extras-version>
|
||||
<target-platform>jgit-4.6</target-platform>
|
||||
<target-platform>jgit-4.17</target-platform>
|
||||
</properties>
|
||||
|
||||
<pluginRepositories>
|
||||
|
|
@ -281,16 +281,6 @@
|
|||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200a-plugin</artifactId>
|
||||
<version>${tycho-extras-version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200b-plugin</artifactId>
|
||||
<version>${tycho-extras-version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.cbi.maven.plugins</groupId>
|
||||
<artifactId>eclipse-jarsigner-plugin</artifactId>
|
||||
|
|
@ -336,19 +326,6 @@
|
|||
<includePackedArtifacts>true</includePackedArtifacts>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200a-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pack200-normalize</id>
|
||||
<goals>
|
||||
<goal>normalize</goal>
|
||||
</goals>
|
||||
<phase>verify</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.cbi.maven.plugins</groupId>
|
||||
<artifactId>eclipse-jarsigner-plugin</artifactId>
|
||||
|
|
@ -362,19 +339,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200b-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pack200-pack</id>
|
||||
<goals>
|
||||
<goal>pack</goal>
|
||||
</goals>
|
||||
<phase>verify</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-plugin</artifactId>
|
||||
|
|
@ -405,30 +369,6 @@
|
|||
<includePackedArtifacts>true</includePackedArtifacts>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200a-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pack200-normalize</id>
|
||||
<goals>
|
||||
<goal>normalize</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200b-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pack200-pack</id>
|
||||
<goals>
|
||||
<goal>pack</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-p2-plugin</artifactId>
|
||||
|
|
|
|||
38
pom.xml
38
pom.xml
|
|
@ -168,7 +168,7 @@
|
|||
<slf4j-version>1.7.30</slf4j-version>
|
||||
<log4j-version>1.2.15</log4j-version>
|
||||
<maven-javadoc-plugin-version>3.3.1</maven-javadoc-plugin-version>
|
||||
<tycho-extras-version>1.7.0</tycho-extras-version>
|
||||
<tycho-extras-version>2.5.0</tycho-extras-version>
|
||||
<gson-version>2.8.7</gson-version>
|
||||
<bouncycastle-version>1.69</bouncycastle-version>
|
||||
<spotbugs-maven-plugin-version>4.3.0</spotbugs-maven-plugin-version>
|
||||
|
|
@ -325,16 +325,6 @@
|
|||
<artifactId>eclipse-jarsigner-plugin</artifactId>
|
||||
<version>1.3.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200a-plugin</artifactId>
|
||||
<version>${tycho-extras-version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200b-plugin</artifactId>
|
||||
<version>${tycho-extras-version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
|
|
@ -902,19 +892,6 @@
|
|||
<id>eclipse-sign</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200a-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pack200-normalize</id>
|
||||
<goals>
|
||||
<goal>normalize</goal>
|
||||
</goals>
|
||||
<phase>verify</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.cbi.maven.plugins</groupId>
|
||||
<artifactId>eclipse-jarsigner-plugin</artifactId>
|
||||
|
|
@ -928,19 +905,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-pack200b-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pack200-pack</id>
|
||||
<goals>
|
||||
<goal>pack</goal>
|
||||
</goals>
|
||||
<phase>verify</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
|
|
|||
Loading…
Reference in New Issue