fix(deps): upgrade to Eclipse 2024-03

haxe4e · Mar 18, 2024 · 56870ad · 56870ad
1 parent 91a2c82
commit 56870ad
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -74,7 +74,7 @@ jobs:
 
 
     - name: "Install: Maven"
-      uses: stCarolas/setup-maven@v4.5 # https://github.com/stCarolas/setup-maven
+      uses: stCarolas/setup-maven@v5 # https://github.com/stCarolas/setup-maven
       with:
         maven-version: 3.9.6
 

diff --git a/build.target b/build.target
@@ -14,25 +14,25 @@
         </location>
 
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-            <repository location="https://download.eclipse.org/releases/2023-12/"/>
+            <repository location="https://download.eclipse.org/releases/2024-03/"/>
             <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"/>
-            <unit id="org.eclipse.mylyn.wikitext.editors_feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.wikitext.feature.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
         </location>
 
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-            <repository location="https://download.eclipse.org/eclipse/updates/4.30/"/>
+            <repository location="https://download.eclipse.org/eclipse/updates/4.31/"/>
             <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-12 see https://download.eclipse.org/tools/orbit/downloads
+        <!-- compatible with 2024-03 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-12/"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03/"/>
         </location>-->
 
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
@@ -66,7 +66,7 @@
 
         <!--<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
             <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0/"/>
-            <unit id="org.eclipse.mylyn.wikitext.editors_feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.wikitext.feature.feature.group" version="0.0.0"/>
         </location>-->
 
         <!--<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">

diff --git a/feature/feature.properties b/feature/feature.properties
@@ -2,7 +2,7 @@ name=Haxe Studio
 description=Eclipse based IDE for the Haxe programming language
 
 copyright=\
-Copyright 2021-2023 by the Haxe4E authors.\n\
+Copyright 2021-2024 by the Haxe4E authors.\n\
 \n\
 All rights reserved. This program and the accompanying materials \
 are made available under the terms of the Eclipse Public License v2.0 \

diff --git a/feature/feature.xml b/feature/feature.xml
@@ -50,7 +50,7 @@
       <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.29.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.platform" version="4.31.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>

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.29.0",
+Require-Bundle: org.eclipse.platform;bundle-version="4.31.0",
  org.eclipse.core.contenttype,
  org.eclipse.core.externaltools,
  org.eclipse.core.runtime,

diff --git a/plugin/plugin.xml b/plugin/plugin.xml
@@ -12,7 +12,7 @@
          <property name="appName" value="Haxe Studio"/>
          <property
                name="aboutText"
-               value="Haxe Studio - Eclipse based Haxe IDE&#x0A;https://github.com/haxe4e/haxe-studio&#x0A;&#x0A;Copyright 2021-2023 by the Haxe4E authors. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Eclipse Foundation, Inc., https://www.eclipse.org/ and Apache Software Foundation, https://www.apache.org/.">
+               value="Haxe Studio - Eclipse based Haxe IDE&#x0A;https://github.com/haxe4e/haxe-studio&#x0A;&#x0A;Copyright 2021-2024 by the Haxe4E authors. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Eclipse Foundation, Inc., https://www.eclipse.org/ and Apache Software Foundation, https://www.apache.org/.">
          </property>
          <property
                name="windowImages"

diff --git a/product/build-paf.sh b/product/build-paf.sh
@@ -53,7 +53,8 @@ echo "Determining PortalApps.com Launcher version..."
 launcher_version=$(curl -sSf "https://portableapps.com/apps/development/portableapps.com_launcher" | LC_ALL=en_US.utf8 grep -oP 'href="/downloading/.*\K(\d+\.\d+\.\d+)')
 
 echo "Downloading PortalApps.com Launcher $launcher_version..."
-curl -sSfL 'https://portableapps.com/redirect/?a=PortableApps.comLauncher&s=s&d=pa&f=PortableApps.comLauncher_2.2.3.paf.exe' -o target/launcher.paf.exe
+# https://portableapps.com/apps/development/portableapps.com_launcher
+curl -sSfL 'https://portableapps.com/redirect/?a=PortableApps.comLauncher&s=s&d=pa&f=PortableApps.comLauncher_2.2.6.paf.exe' -o target/launcher.paf.exe
 7z x target/launcher.paf.exe -otarget/launcher -y
 
 echo "Generating HaxeStudio launcher exe..."

diff --git a/product/haxe-studio.product b/product/haxe-studio.product
@@ -9,7 +9,7 @@
          Haxe Studio - Eclipse based Haxe IDE
 https://github.com/haxe4e/haxe-studio
 
-Copyright 2021-2023 by the Haxe4E authors. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
+Copyright 2021-2024 by the Haxe4E authors. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
 
 This product includes software developed by other open source projects including the Eclipse Foundation, Inc., https://www.eclipse.org/ and Apache Software Foundation, https://www.apache.org/.
       </text>
@@ -360,7 +360,7 @@ version(s), and exceptions or additional permissions here}.&quot;
       <feature id="org.eclipse.jgit.http.apache" installMode="root"/>
       <feature id="org.eclipse.jgit.ssh.apache" installMode="root"/>
       <feature id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped" installMode="root"/>
-      <feature id="org.eclipse.mylyn.wikitext.editors_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.wikitext.feature" installMode="root"/>
       <feature id="org.eclipse.shellwax.feature" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.connector.local.feature" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.connector.ssh.feature" installMode="root"/>