diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2021-09-29 02:03:02 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-09-29 17:13:07 +0200 |
| commit | 39d4daefd2f6853404d507b5b9e67fcf34915623 (patch) | |
| tree | d142f960c3743453c6d1508799cb437a33387a4d | |
| parent | e4550807a3eec3ea410d2b1604f99e0ab12426cf (diff) | |
| download | jgit-39d4daefd2f6853404d507b5b9e67fcf34915623.tar.gz jgit-39d4daefd2f6853404d507b5b9e67fcf34915623.zip | |
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
| -rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 64 | ||||
| -rw-r--r-- | pom.xml | 38 |
2 files changed, 3 insertions, 99 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 65c4587689..7b75c2eb68 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -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> @@ -282,16 +282,6 @@ <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> <version>1.3.2</version> @@ -337,19 +327,6 @@ </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> <executions> @@ -363,19 +340,6 @@ </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> <executions> @@ -406,30 +370,6 @@ </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> <executions> @@ -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> @@ -326,16 +326,6 @@ <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> <version>0.8.7</version> @@ -903,19 +893,6 @@ <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> <executions> @@ -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> |