reficio#297: WIP - Tycho 3.0.0 update

- prepare build setup for java 17
sparsick · Mar 17, 2023 · 352d015 · 352d015
1 parent b67dd80
commit 352d015
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,16 +13,16 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
-        <maven.version>3.6.3</maven.version>
-        <maven.annotations.version>3.6.0</maven.annotations.version>
-        <maven.plugin.plugin.version>3.6.0</maven.plugin.plugin.version>
+        <maven.version>3.8.1</maven.version>
+        <maven.annotations.version>3.8.1</maven.annotations.version>
+        <maven.plugin.plugin.version>3.8.1</maven.plugin.plugin.version>
         <!-- actually a dependency here. -->
         <dependency.maven.bundle.plugin.version>5.1.6</dependency.maven.bundle.plugin.version>
-        <tycho.version>2.7.5</tycho.version>
+        <tycho.version>3.0.0</tycho.version>
 
         <sonatype.aether.version>1.13.1</sonatype.aether.version>
         <eclipse.aether.version>1.1.0</eclipse.aether.version>
@@ -128,18 +128,21 @@
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-model</artifactId>
                 <version>${maven.version}</version>
+                <scope>provided</scope>
             </dependency>
             <!-- 3.0 used by tycho -->
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
                 <version>${maven.version}</version>
+                <scope>provided</scope>
             </dependency>
             <!-- 3.0 used by maven-plugin-annotations -->
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-artifact</artifactId>
                 <version>${maven.version}</version>
+                <scope>provided</scope>
             </dependency>
 
             <!-- 1.5.5 used by tycho, others use 1.6 -->
@@ -254,6 +257,11 @@
             <artifactId>sisu-equinox-launching</artifactId>
             <version>${tycho.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>sisu-osgi-api</artifactId>
+            <version>${tycho.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.groovy</groupId>
@@ -361,7 +369,7 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
-                <version>1.12.1</version>
+                <version>2.1.0</version>
                 <configuration>
                     <sourceEncoding>UTF-8</sourceEncoding>
                 </configuration>
@@ -390,7 +398,7 @@
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-metadata</artifactId>
-                <version>2.1.0</version>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -441,6 +449,7 @@
                         <exclude>target/**</exclude>
                         <exclude>**/resources/**</exclude>
                         <exclude>.dependabot/**</exclude>
+                        <exclude>**/org/eclipse/tycho/core/maven/P2ApplicationLauncher.java</exclude>
                     </excludes>
                     <useDefaultExcludes>true</useDefaultExcludes>
                     <mapping>