Merge remote-tracking branch 'ibex/main'

Author: maxkratz

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ on:
 
 env:
   # Eclipse version to use in this CI
-  VERSION: "2024-12"
+  VERSION: "2025-03"
   # emoflon-headless source URL (needed by macOS-based runner workaround)
   EMOFLON_HEADLESS_SRC: "https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest"
   # import plugin URL
@@ -165,7 +165,7 @@ jobs:
         run: echo "Started CI build (Eclipse GIPS macOS user)."
       - name: Install dependencies
         run: |
-          brew install p7zip coreutils grep wget curl gsed
+          brew install p7zip coreutils grep wget curl
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Download splash image
@@ -185,9 +185,7 @@ jobs:
         with:
           name: com.seeq.eclipse.importprojects.jar
       - name: Run build script
-        run: |
-          export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
-          chmod +x build.sh && ./build.sh -m user -o macos
+        run: chmod +x build.sh && ./build.sh -m user -o macos
       - name: Fix permissions
         run: sudo xattr -cr ./eclipse/Eclipse.app
       - name: Upload artifact
@@ -205,7 +203,7 @@ jobs:
         run: echo "Started CI build (Eclipse GIPS macOS user)."
       - name: Install dependencies
         run: |
-          brew install p7zip coreutils grep wget curl gsed
+          brew install p7zip coreutils grep wget curl
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Download splash image
@@ -225,9 +223,7 @@ jobs:
         with:
           name: com.seeq.eclipse.importprojects.jar
       - name: Run build script
-        run: |
-          export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
-          chmod +x build.sh && ./build.sh -m user -o macosarm
+        run: chmod +x build.sh && ./build.sh -m user -o macosarm
       - name: Fix permissions
         run: sudo xattr -cr ./eclipse/Eclipse.app
       - name: Upload artifact

build.sh

@@ -35,7 +35,7 @@ OUTPUT_FILE_PREFIX_WINDOWS="eclipse-gips-windows"
 OUTOUT_FILE_PREFIX_MACOS="eclipse-gips-macos"
 OUTOUT_FILE_PREFIX_MACOSARM="eclipse-gips-macos-arm"
 MIRROR="https://ftp.fau.de"
-UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://hipe-devops.github.io/HiPE-Updatesite/hipe.updatesite/,https://www.kermeta.org/k2/update,https://emoflon.org/emoflon-ibex-updatesite/snapshot/updatesite/,https://www.genuitec.com/updates/devstyle/ci/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/,http://update.eclemma.org/,https://pmd.github.io/pmd-eclipse-plugin-p2-site/,https://checkstyle.org/eclipse-cs-update-site/,https://spotbugs.github.io/eclipse/,https://download.eclipse.org/technology/m2e/releases/latest,https://echtzeitsysteme.github.io/gips-updatesite/snapshot/updatesite/"
+UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://hipe-devops.github.io/HiPE-Updatesite/hipe.updatesite/,https://www.kermeta.org/k2/update,https://emoflon.org/emoflon-ibex-updatesite/snapshot/updatesite/,https://devstyle.codetogether.io/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/,http://update.eclemma.org/,https://pmd.github.io/pmd-eclipse-plugin-p2-site/,https://checkstyle.org/eclipse-cs-update-site/,https://spotbugs.github.io/eclipse/,https://download.eclipse.org/technology/m2e/releases/latest,https://echtzeitsysteme.github.io/gips-updatesite/snapshot/updatesite/"
 EMOFLON_HEADLESS_SRC="https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest"
 
 # Import plug-in:
@@ -199,29 +199,6 @@ remove_update_sites () {
 	rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
 }
 
-# Removes broken org.apache.commons.logging JAR from plug-ins
-remove_broken_commons_logging () {
-	log "Removes broken org.apache.commons.logging JAR from plug-ins."
-	rm $ECLIPSE_BASE_PATH/plugins/org.apache.commons.logging_1.2.0.v20180409-1502.jar
-	# force org.eclipse.equinox to take correct JAR into account
-	# org.apache.commons.logging,1.2.0,plugins/org.apache.commons.logging_1.2.0.jar,4,false
-	sed -i '/org.apache.commons.lang3/a org.apache.commons.logging,1.2.0,plugins/org.apache.commons.logging_1.2.0.jar,4,false' $ECLIPSE_BASE_PATH/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-	# org.apache.commons.logging,1.2.0.v20180409-1502,plugins/org.apache.commons.logging_1.2.0.v20180409-1502.jar,4,false
-	sed -i '/org.apache.commons.logging,1.2.0.v20180409-1502,plugins\/org.apache.commons.logging_1.2.0.v20180409-1502.jar,4,false/d' $ECLIPSE_BASE_PATH/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-}
-
-# Copies the non-broken org.apache.commons.logging JAR from plug-ins
-save_non_broken_commons_logging () {
-	log "Save non-broken org.apache.commons.logging JAR from plug-ins."
-	cp $ECLIPSE_BASE_PATH/plugins/org.apache.commons.logging_1.2.0.jar /tmp/org.apache.commons.logging_1.2.0.jar
-}
-
-# Restores the non-broken org.apache.commons.logging JAR to plug-ins
-restore_non_broken_commons_logging () {
-	log "Restores the non-broken org.apache.commons.logging JAR from plug-ins."
-	cp /tmp/org.apache.commons.logging_1.2.0.jar $ECLIPSE_BASE_PATH/plugins/org.apache.commons.logging_1.2.0.jar
-	rm /tmp/org.apache.commons.logging_1.2.0.jar
-}
 
 #
 # Script
@@ -270,9 +247,6 @@ fi
 # Install global Eclipse settings from config file
 install_global_eclipse_settings
 
-# Save non-broken org.apache.commons.logging JAR from plug-ins
-save_non_broken_commons_logging
-
 log "Install Eclipse plug-ins."
 for p in ${ORDER[@]}; do
 	# Check if eMoflon packages must be skipped (for dev builds).
@@ -323,12 +297,6 @@ else
 	chmod +x splash.sh && ./splash.sh deploy $VERSION $ECLIPSE_BASE_PATH
 fi
 
-# Remove broken org.apache.commons.logging JAR
-remove_broken_commons_logging
-
-# Restore non-broken org.apache.commons.logging JAR
-restore_non_broken_commons_logging
-
 log "Clean-up old archives and create new archive."
 rm -f ./$OUTPUT_FILE
 zip -q -r $OUTPUT_FILE eclipse