Merge remote-tracking branch 'parent/main' into main

eMoflon · Dec 15, 2022 · 78aa5bf · 78aa5bf
2 parents 25cbe94 + e325e32
commit 78aa5bf
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ on:
 
 env:
   # Eclipse version to use in this CI
-  VERSION: "2022-09"
+  VERSION: "2022-12"
   # 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
@@ -66,12 +66,12 @@ jobs:
           wget "${IMPORT_PLUGIN_LATEST_SRC// }"
           mv com.seeq.eclipse.importprojects*.jar com.seeq.eclipse.importprojects.jar
       - name: Upload emoflon-headless updatesite artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: emoflon-headless-updatesite.zip
           path: emoflon-headless-updatesite.zip
       - name: Upload eclipse import plugin artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: com.seeq.eclipse.importprojects.jar
           path: com.seeq.eclipse.importprojects.jar
@@ -81,13 +81,13 @@ jobs:
     runs-on: [ubuntu-20.04]
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Start message
         run: echo "Creating splash image for version $VERSION."
       - name: Run splash creator script
         run: chmod +x splash.sh && ./splash.sh img $VERSION null
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: splash.bmp
           path: splash.bmp
@@ -100,28 +100,28 @@ jobs:
       - name: Start message
         run: echo "Started CI build (Eclipse eMoflon Linux user)."
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download splash image
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: splash.bmp
       - name: Download emoflon-headless updatesite
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: emoflon-headless-updatesite.zip
       - name: Move emoflon-headless updatesite
         run: |
           mkdir -p ./tmp/emoflon-headless
           mv emoflon-headless-updatesite.zip ./tmp/emoflon-headless/updatesite.zip
       - name: Download Eclipse import plugin JAR
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: com.seeq.eclipse.importprojects.jar
       - name: Run build script
         run: |
           chmod +x build.sh && ./build.sh -m user -o linux
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: eclipse-emoflon-linux-user
           path: eclipse-emoflon-linux-user.zip
@@ -134,25 +134,25 @@ jobs:
       - name: Start message
         run: echo "Started CI build (Eclipse eMoflon Linux user CI)."
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download emoflon-headless updatesite
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: emoflon-headless-updatesite.zip
       - name: Move emoflon-headless updatesite
         run: |
           mkdir -p ./tmp/emoflon-headless
           mv emoflon-headless-updatesite.zip ./tmp/emoflon-headless/updatesite.zip
       - name: Download Eclipse import plugin JAR
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: com.seeq.eclipse.importprojects.jar
       - name: Run build script
         run: chmod +x build.sh && ./build.sh -m user -o linux --skip-theme
       - name: Rename ZIP archive
         run: mv eclipse-emoflon-linux-user.zip eclipse-emoflon-linux-user-ci.zip
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: eclipse-emoflon-linux-user-ci
           path: eclipse-emoflon-linux-user-ci.zip
@@ -169,29 +169,29 @@ jobs:
           brew update
           brew install p7zip coreutils grep wget curl
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download splash image
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: splash.bmp
       - name: Download emoflon-headless updatesite
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: emoflon-headless-updatesite.zip
       - name: Move emoflon-headless updatesite
         run: |
           mkdir -p ./tmp/emoflon-headless
           mv emoflon-headless-updatesite.zip ./tmp/emoflon-headless/updatesite.zip
       - name: Download Eclipse import plugin JAR
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: com.seeq.eclipse.importprojects.jar
       - name: Run build script
         run: chmod +x build.sh && ./build.sh -m user -o macos
       - name: Fix permissions
         run: sudo xattr -cr ./eclipse/Eclipse.app
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: eclipse-emoflon-macos-user
           path: eclipse-emoflon-macos-user.zip
@@ -207,35 +207,35 @@ jobs:
         run: |
           choco install wget curl unzip zip --no-progress
       - name: Install correct Java version
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: '16'
       - name: Fix Git line endings
         run: git config --global core.autocrlf input
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download splash image
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: splash.bmp
       - name: Download emoflon-headless updatesite
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: emoflon-headless-updatesite.zip
       - name: Move emoflon-headless updatesite
         run: |
           mkdir -p ./tmp/emoflon-headless
           mv emoflon-headless-updatesite.zip ./tmp/emoflon-headless/updatesite.zip
       - name: Download Eclipse import plugin JAR
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: com.seeq.eclipse.importprojects.jar
       - name: Run build script
         run: |
           bash ./build.sh -m user -o windows
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: eclipse-emoflon-windows-user
           path: eclipse-emoflon-windows-user.zip

diff --git a/README.md b/README.md
@@ -15,7 +15,6 @@ This repository is used to automatically build an Eclipse [eMoflon::Neo](https:/
 **Additional packages** are installed for every non-CI build.
 Currently, the list of additional packages includes:
 - [EclEmma](https://www.eclemma.org/)
-- [PMD](https://pmd.github.io/latest/index.html)
 - [Checkstyle](https://checkstyle.org/eclipse-cs/#!/)
 - [SpotBugs](https://spotbugs.github.io/https://spotbugs.github.io/)
 

diff --git a/build.sh b/build.sh
@@ -33,7 +33,7 @@ OUTPUT_FILE_PREFIX_LINUX="eclipse-emoflon-linux"
 OUTPUT_FILE_PREFIX_WINDOWS="eclipse-emoflon-windows"
 OUTOUT_FILE_PREFIX_MACOS="eclipse-emoflon-macos"
 MIRROR="https://ftp.fau.de"
-UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://www.kermeta.org/k2/update,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://emoflon.org/emoflon-neo-updatesite/snapshot/"
+UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://www.kermeta.org/k2/update,https://www.genuitec.com/updates/devstyle/ci/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/,http://update.eclemma.org/,https://checkstyle.org/eclipse-cs-update-site/,https://spotbugs.github.io/eclipse/,https://emoflon.org/emoflon-neo-updatesite/snapshot/"
 EMOFLON_HEADLESS_SRC="https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest"
 
 # Import plug-in:

diff --git a/packages/additional-packages.list b/packages/additional-packages.list
@@ -1,4 +1,3 @@
 org.eclipse.eclemma.feature.feature.group
-net.sourceforge.pmd.eclipse.feature.group
 net.sf.eclipsecs.feature.group
 com.github.spotbugs.plugin.eclipse.feature.group
diff --git a/splash.sh b/splash.sh
@@ -9,7 +9,7 @@ ECLIPSE_BASE_PATH=$3
 
 # replacement regexs
 REGEX_ECLIPSE_INI='s/org.eclipse.epp.package.common/org.emoflon.splash/g'
-REGEX_CONFIG_INI='s/osgi.splashPath=platform\\:\/base\/plugins\/org.eclipse.platform/osgi.splashPath=platform\\:\/base\/plugins\/org.emoflon.splash/g'
+REGEX_CONFIG_INI='s/osgi.splashPath=platform\\:\/base\/plugins\/org.eclipse.epp.package.common/osgi.splashPath=platform\\:\/base\/plugins\/org.emoflon.splash/g'
 
 # Check for existing ENVs
 if [[ -z "$MODE" ]]; then