fix(deps): upgrade to Eclipse 2023-12

haxe4e · Dec 26, 2023 · a4e8978 · a4e8978
1 parent 18f22f5
commit a4e8978
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 66 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -76,7 +76,7 @@ jobs:
     - name: "Install: Maven"
       uses: stCarolas/[email protected] # https://github.com/stCarolas/setup-maven
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.6
 
 
     - name: Build with Maven

diff --git a/build.target b/build.target
@@ -14,7 +14,7 @@
         </location>
 
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-            <repository location="https://download.eclipse.org/releases/2023-09/"/>
+            <repository location="https://download.eclipse.org/releases/2023-12/"/>
             <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.egit.gitflow.feature.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
@@ -25,14 +25,14 @@
         </location>
 
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-            <repository location="https://download.eclipse.org/eclipse/updates/4.29/"/>
+            <repository location="https://download.eclipse.org/eclipse/updates/4.30/"/>
             <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
         </location>
 
-        <!-- compatible with 2023-09 see https://download.eclipse.org/tools/orbit/downloads
+        <!-- compatible with 2023-12 see https://download.eclipse.org/tools/orbit/downloads
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-            <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09/"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
         </location>-->
 
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

diff --git a/feature/feature.xml b/feature/feature.xml
@@ -50,44 +50,29 @@
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.platform" version="4.28.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.platform" version="4.29.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.commons-io" version="2.11.0" match="compatible"/>
       <import plugin="org.apache.commons.lang3" version="3.12.0" match="compatible"/>
    </requires>
 
    <plugin
          id="org.haxe4e.studio.plugin"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="de.sebthom.eclipse.commons"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="net.sf.jstuff.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.apache.commons.lang3"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.apache.commons.commons-io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/feature/pom.xml b/feature/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
    SPDX-FileCopyrightText: © Haxe4E authors
    SPDX-FileContributor: Sebastian Thomschke

diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Automatic-Module-Name: org.haxe4e.studio.plugin
 Bundle-Activator: org.haxe4e.studio.HaxeStudioPlugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ClassPath: .
-Require-Bundle: org.eclipse.platform;bundle-version="4.28.0",
+Require-Bundle: org.eclipse.platform;bundle-version="4.29.0",
  org.eclipse.core.contenttype,
  org.eclipse.core.externaltools,
  org.eclipse.core.runtime,

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
    SPDX-FileCopyrightText: © Haxe4E authors
    SPDX-FileContributor: Sebastian Thomschke

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
    SPDX-FileCopyrightText: © Haxe4E authors
    SPDX-FileContributor: Sebastian Thomschke
@@ -16,70 +16,78 @@
       <version>3.0.18</version>
    </parent>
 
-   <name>haxe4e-studio-parent</name>
    <groupId>org.haxe4e.studio</groupId>
    <artifactId>org.haxe4e.studio.parent</artifactId>
    <version>1.0.0-SNAPSHOT</version>
    <packaging>pom</packaging>
 
+
+   <name>haxe4e-studio-parent</name>
+   <inceptionYear>2021</inceptionYear>
    <organization>
       <name>The Haxe4E Project</name>
       <url>https://github.com/haxe4e</url>
    </organization>
-
-   <inceptionYear>2021</inceptionYear>
    <licenses>
       <license>
          <name>Eclipse Public License 2.0</name>
-         <url>https://spdx.org/licenses/EPL-2.0.html</url>
          <distribution>repo</distribution>
+         <url>https://spdx.org/licenses/EPL-2.0</url>
       </license>
    </licenses>
 
-   <properties>
-      <java.version>17</java.version>
-      <tycho.version>4.0.4</tycho.version>
-
-      <!-- to prevent:
-      [ERROR] Failed to execute goal com.hubspot.maven.plugins:dependency-scope-maven-plugin:0.10:check (check@validate) on project org.haxe4e:
-      Error building dependency graph: Could not resolve following dependencies: [
-         org.haxe4e:org.haxe4e:jar:target/libs/commons-io.jar:1.0.0.qualifier (system),
-         ...
-      ]
-      -->
-      <skip.dependency-scope-maven-plugin.check>true</skip.dependency-scope-maven-plugin.check>
-
-      <!-- to prevent dozen of warnings like:
-      [WARNING] System artifact: p2.eclipse-plugin:org.eclipse.mylyn.commons.notifications.ui:jar:1.17.2.v20200813-0821:system has no file attached
-
-      Try downloading the file manually from the project website.
-      -->
-      <skip.enforcer.ban-duplicate-classes>true</skip.enforcer.ban-duplicate-classes>
-      <skip.enforcer.enforce-bytecode-version>true</skip.enforcer.enforce-bytecode-version>
-   </properties>
 
    <modules>
       <module>plugin</module>
       <module>feature</module>
       <module>product</module>
    </modules>
 
+
    <scm>
+      <!-- https://maven.apache.org/scm/git.html -->
       <url>https://github.com/haxe4e/haxe4e-studio</url>
       <connection>scm:git:https://github.com/haxe4e/haxe4e-studio.git</connection>
       <developerConnection>scm:git:https://github.com/haxe4e/haxe4e-studio.git</developerConnection>
+      <tag>HEAD</tag>
    </scm>
 
+
    <issueManagement>
       <system>github.com</system>
       <url>https://github.com/haxe4e/haxe4e-studio/issues</url>
    </issueManagement>
 
+
    <ciManagement>
       <system>github.com</system>
       <url>https://github.com/haxe4e/haxe4e-studio/actions</url>
    </ciManagement>
 
+
+   <properties>
+      <java.version>17</java.version>
+      <tycho.version>4.0.4</tycho.version>
+
+      <!-- to prevent:
+      [ERROR] Failed to execute goal com.hubspot.maven.plugins:dependency-scope-maven-plugin:0.10:check (check@validate) on project org.haxe4e:
+      Error building dependency graph: Could not resolve following dependencies: [
+         org.haxe4e:org.haxe4e:jar:target/libs/commons-io.jar:1.0.0.qualifier (system),
+         ...
+      ]
+      -->
+      <skip.dependency-scope-maven-plugin.check>true</skip.dependency-scope-maven-plugin.check>
+
+      <!-- to prevent dozen of warnings like:
+      [WARNING] System artifact: p2.eclipse-plugin:org.eclipse.mylyn.commons.notifications.ui:jar:1.17.2.v20200813-0821:system has no file attached
+
+      Try downloading the file manually from the project website.
+      -->
+      <skip.enforcer.ban-duplicate-classes>true</skip.enforcer.ban-duplicate-classes>
+      <skip.enforcer.enforce-bytecode-version>true</skip.enforcer.enforce-bytecode-version>
+   </properties>
+
+
    <build>
       <pluginManagement>
          <plugins>
@@ -105,6 +113,7 @@
                </configuration>
             </plugin>
             <plugin>
+               <!-- https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md#support-for-pde-declarative-component-annotation-processing -->
                <groupId>org.eclipse.tycho</groupId>
                <artifactId>tycho-ds-plugin</artifactId>
                <version>${tycho.version}</version>
@@ -208,17 +217,17 @@
                            </action>
                         </pluginExecution>
                         <pluginExecution>
-                            <pluginExecutionFilter>
-                                <groupId>org.eclipse.tycho</groupId>
-                                <artifactId>target-platform-configuration</artifactId>
-                                <versionRange>[1.0,)</versionRange>
-                                <goals>
-                                    <goal>target-platform</goal>
-                                </goals>
-                            </pluginExecutionFilter>
-                            <action>
-                                <ignore />
-                            </action>
+                           <pluginExecutionFilter>
+                              <groupId>org.eclipse.tycho</groupId>
+                              <artifactId>target-platform-configuration</artifactId>
+                              <versionRange>[1.0,)</versionRange>
+                              <goals>
+                                 <goal>target-platform</goal>
+                              </goals>
+                           </pluginExecutionFilter>
+                           <action>
+                              <ignore />
+                           </action>
                         </pluginExecution>
                      </pluginExecutions>
                   </lifecycleMappingMetadata>
@@ -288,4 +297,30 @@
          </plugin>
       </plugins>
    </build>
+
+   <profiles>
+      <profile>
+         <id>disable-tycho-packaging-plugin-if-executed-in-eclipse</id>
+         <activation>
+            <property>
+               <name>eclipse.application</name>
+            </property>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <!-- disable building of a new jar on each file change from within Eclipse -->
+                  <groupId>org.eclipse.tycho</groupId>
+                  <artifactId>tycho-packaging-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>default-package-plugin</id>
+                        <phase>none</phase>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
 </project>