From 3d36ee45b3d86d984bf85287ef3c4d6027f3991d Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Thu, 28 Mar 2024 14:52:30 +0100 Subject: [PATCH 01/20] Updated build process to Eclipse 2024-03 - (Task #78) - Updated the product to contain the exact same packages as in RCP from the Eclipse Package Project EPP. Using now 4.31 which is (2024-03) - Update master pom to not include m2e repositories anymore. Seems like they are now integrated into Eclispe RCP - Cleaned up feature project dependencies - Updated parent pom with new links to repositories. setup of the target platforms as well as using latest tycho 4.07 - updated pom for product to correctly build p2 with adoptoium jdk from justj - updated versions in p2.inf files to be correct --- Task #78: Update IDE --- .../feature.xml | 4 - de.dlr.sc.virsat.ide.branding.feature/p2.inf | 2 +- de.dlr.sc.virsat.ide.product/p2.inf | 2 +- de.dlr.sc.virsat.ide.product/pom.xml | 42 ++++++-- .../virsat_ide.product | 59 ++++++---- maven/pom.xml | 101 ++++++++---------- pom.xml | 11 -- 7 files changed, 116 insertions(+), 105 deletions(-) diff --git a/de.dlr.sc.virsat.ide.branding.feature/feature.xml b/de.dlr.sc.virsat.ide.branding.feature/feature.xml index 663fde9..5d7de6b 100644 --- a/de.dlr.sc.virsat.ide.branding.feature/feature.xml +++ b/de.dlr.sc.virsat.ide.branding.feature/feature.xml @@ -26,16 +26,12 @@ by German Aerospace Center (DLR e.V.) - - diff --git a/de.dlr.sc.virsat.ide.branding.feature/p2.inf b/de.dlr.sc.virsat.ide.branding.feature/p2.inf index bf92cf1..6377c4a 100644 --- a/de.dlr.sc.virsat.ide.branding.feature/p2.inf +++ b/de.dlr.sc.virsat.ide.branding.feature/p2.inf @@ -22,6 +22,6 @@ requires.1.greedy=true # RCP/RAP package had been changed in Eclipse Mars (4.5) update.id = de.dlr.sc.virsat.ide.branding.feature.feature.group -update.range = [4.5, $version$) +update.range = [4.5, 5.0.0) update.severity = 0 update.description = Eclipse package upgrade from versions before Eclipse Mars (4.5) is not possible. See bug 332989. diff --git a/de.dlr.sc.virsat.ide.product/p2.inf b/de.dlr.sc.virsat.ide.product/p2.inf index 3661175..ae7f29c 100644 --- a/de.dlr.sc.virsat.ide.product/p2.inf +++ b/de.dlr.sc.virsat.ide.product/p2.inf @@ -22,6 +22,6 @@ properties.2.value = DLR (German Aerospace Center) # RCP/RAP package had been changed in Eclipse Mars (4.5) update.id = de.dlr.sc.virsat.ide.product -update.range = [4.5, $version$) +update.range = [4.5, 5.0.0) update.severity = 0 update.description = Eclipse package upgrade from versions before Eclipse Mars (4.5) is not possible. See bug 332989. diff --git a/de.dlr.sc.virsat.ide.product/pom.xml b/de.dlr.sc.virsat.ide.product/pom.xml index f0ebdef..58b8f49 100644 --- a/de.dlr.sc.virsat.ide.product/pom.xml +++ b/de.dlr.sc.virsat.ide.product/pom.xml @@ -39,7 +39,7 @@ org.eclipse.tycho tycho-p2-director-plugin - + maven-antrun-plugin @@ -53,8 +53,7 @@ - + @@ -79,18 +78,17 @@ - + - + - + - + - + + + + + + org.eclipse.tycho + target-platform-configuration + + + none + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + + + + \ No newline at end of file diff --git a/de.dlr.sc.virsat.ide.product/virsat_ide.product b/de.dlr.sc.virsat.ide.product/virsat_ide.product index ec48854..94d0cc4 100644 --- a/de.dlr.sc.virsat.ide.product/virsat_ide.product +++ b/de.dlr.sc.virsat.ide.product/virsat_ide.product @@ -1,7 +1,7 @@ - + @@ -33,11 +33,18 @@ This product includes software developed by other open source projects including -showsplash de.dlr.sc.virsat.ide.branding.ui --launcher.defaultAction openFile - -Dosgi.requiredJavaVersion=11 --Xms256m --Xmx1024m --XX:+UseG1GC + -Dosgi.requiredJavaVersion=17 +-Dosgi.instance.area.default=@user.home/eclipse-workspace +-Dosgi.dataAreaRequiresExplicitInit=true +-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true +-Declipse.e4.inject.javax.warning=false +-Dsun.java.command=Eclipse +-Xms256m +-Xmx2048m +-XX:+UseG1GC -XX:+UseStringDeduplication +--add-modules=ALL-SYSTEM +-Djava.security.manager=allow @@ -60,19 +67,35 @@ This product includes software developed by other open source projects including org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 - - + + + + + + + + + + + + + + + + + + @@ -84,22 +107,14 @@ This product includes software developed by other open source projects including - - - - - - - - - - + + @@ -109,14 +124,12 @@ This product includes software developed by other open source projects including - - @@ -124,8 +137,10 @@ This product includes software developed by other open source projects including - - + + + + diff --git a/maven/pom.xml b/maven/pom.xml index fcb8454..a9dad7e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -7,8 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 ******************************************************************************* --> - + 4.0.0 de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent @@ -16,7 +15,7 @@ pom - 2.6.0 + 4.0.7 2.6 UTF-8 @@ -34,7 +33,7 @@ test VirSat_IDE_Test.zip false - + 1.4.0 @@ -45,8 +44,8 @@ 0.7.7.201606060606 ${maven.build.timestamp} - 2022-03 Release - http://download.eclipse.org/releases/2022-03/ + 2024-03 Release + http://download.eclipse.org/releases/2024-03/ @@ -66,7 +65,7 @@ ${build.folder.target.secured}/${build.folder.p2} - + development @@ -169,17 +168,40 @@ + + eclipse-simultaneous-release + p2 + ${eclipse.simultaneous.release.repository} + + + license-feature + https://download.eclipse.org/cbi/updates/license/ + p2 + + + justj + https://download.eclipse.org/justj/jres/17/updates/release/latest/ + p2 + + + justj-epp + https://download.eclipse.org/justj/epp/milestone/latest/ + p2 + + + + maven-ant-repository2 + https://repo.eclipse.org/content/repositories/orbit-approved-artifacts + + maven-to-eclipse-tycho-feature ${project.baseUri}../p2Repo p2 - - - - eclipse-simultaneous-release - p2 - ${eclipse.simultaneous.release.repository} @@ -187,38 +209,28 @@ ${p2.repo.virsat.url} p2 - + ${p2.repo.overtarget.id} ${p2.repo.overtarget.url} p2 - + + gitlab-mylyn-feature https://pweingardt.github.io/mylyn-gitlab/ p2 - - + + --> + spotbugs-feature https://spotbugs.github.io/eclipse-stable-latest/ p2 - - - - mylyn-feature - https://download.eclipse.org/mylyn/releases/3.25/ - p2 - - - - github-mylyn-connector-feature - https://download.eclipse.org/egit/github/updates/ - p2 - + + @@ -230,31 +242,6 @@ true - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - true - - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - - - org.eclipse.tycho tycho-packaging-plugin @@ -325,4 +312,4 @@ - + diff --git a/pom.xml b/pom.xml index 1fabb2e..7dddd50 100644 --- a/pom.xml +++ b/pom.xml @@ -68,17 +68,6 @@ p2 - - m2eclipse - https://archive.eclipse.org/technology/m2e/releases/1.11/ - p2 - - - - https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.9.0/N/LATEST - p2 - - asciidoc-editor https://de-jcup.github.io/update-site-eclipse-asciidoctor-editor/update-site/ From 85331a03f5963468b8f14de5f8ffbb99ba8cb37b Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Thu, 28 Mar 2024 15:11:46 +0100 Subject: [PATCH 02/20] Updated github actions workflow - (Task #79) - switching to ubuntu 22.04 - trying to setup a jdk 17 --- Task #79: Update GitHub Actions Workflow Versions --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d42d8e..2e60b4b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,7 @@ jobs: #--------------------------------------------- verify: name: Verify - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: # -------------------------------------------- @@ -58,7 +58,7 @@ jobs: # ----------------------------------------------------- deploy: name: Build, Assemble and Deploy - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [verify] steps: @@ -101,7 +101,7 @@ jobs: - name: Setup - Prepare OS uses: virtualsatellite/ci-actions/ci-setup-action@v5 with: - jdk: 11 + jdk: 17 # -------------------------------------------- # Development and Feature branches From e334eaf0b3a361be754a5fc4286b43ee3ce9a746 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Thu, 28 Mar 2024 15:42:02 +0100 Subject: [PATCH 03/20] Updated java 17 installation - (Task #78) - Using standard github action to setup java 17 --- Task #78: Update IDE --- .github/workflows/main.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e60b4b..e031ff4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,6 +45,12 @@ jobs: # -------------------------------------------- - name: Setup - Checkout code uses: actions/checkout@v2 + + - name: Setup - Java 17 + uses: actions/setup-java@v2 + with: + java-version: 17 + distribution: "temurin" # -------------------------------------------- # Run a quick sanity check if all commits are @@ -53,6 +59,7 @@ jobs: - name: Verify - Authors Sanity Check uses: virtualsatellite/ci-actions/ci-verify-authors-action@v4 + # ----------------------------------------------------- # Build, Assemble and Deploy Job # ----------------------------------------------------- @@ -67,6 +74,12 @@ jobs: # -------------------------------------------- - name: Setup - Checkout code uses: actions/checkout@v2 + + - name: Setup - Java 17 + uses: actions/setup-java@v2 + with: + java-version: 17 + distribution: "temurin" # -------------------------------------------- # Setup caching for m2 repository @@ -100,8 +113,6 @@ jobs: # -------------------------------------------- - name: Setup - Prepare OS uses: virtualsatellite/ci-actions/ci-setup-action@v5 - with: - jdk: 17 # -------------------------------------------- # Development and Feature branches From e8d478a6cff91716de90864ff8a07f1e92191e14 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Thu, 28 Mar 2024 16:18:04 +0100 Subject: [PATCH 04/20] Install no jvm with os - (Task #78) - Don't install jdk with os preparation --- Task #78: Update IDE --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e031ff4..72a1333 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -113,6 +113,8 @@ jobs: # -------------------------------------------- - name: Setup - Prepare OS uses: virtualsatellite/ci-actions/ci-setup-action@v5 + with: + jdk: no # -------------------------------------------- # Development and Feature branches From 0488106a21836e3b8269459d4da4b1207c760b9c Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Mon, 15 Apr 2024 10:59:04 +0200 Subject: [PATCH 05/20] Trying to use new maven setup action - (Task #1182) - using new action to use maven 3.9.6 for the build --- Task #1182: Unpredicted Close behavior on Generic Editor --- .github/workflows/main.yml | 15 +++++++++++++++ .gitignore | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 72a1333..992a494 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,6 +80,21 @@ jobs: with: java-version: 17 distribution: "temurin" + + - name: Setup - Maven 3.9.6 + uses: actions/setup-maven@v7-beta2 + with: + maven-version: "3.9.6" + + - name: Setup - Cache maven download + uses: actions/cache@v2 + with: + path: ./maven.tar.gz + key: ${{ runner.os }}-local-maven-setup-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-local-maven-setup- + ${{ runner.os }}-local-maven- + # -------------------------------------------- # Setup caching for m2 repository diff --git a/.gitignore b/.gitignore index e30d132..a10b64b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ **/*._trace **/*.xtendbin /workspace/ -/deploy/ \ No newline at end of file +/deploy/ +/apache-maven-* +/maven.tar.gz From 3d3d2a65a625249a399f68f6944471ba9d350f14 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Mon, 15 Apr 2024 11:46:01 +0200 Subject: [PATCH 06/20] - --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 992a494..a022327 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: distribution: "temurin" - name: Setup - Maven 3.9.6 - uses: actions/setup-maven@v7-beta2 + uses: virtualsatellite/ci-actions/ci-maven-setup@v7-beta2 with: maven-version: "3.9.6" From 48dabc90f9a4ce023a042c61fc8deeb28f0f2d5b Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 11:04:03 +0200 Subject: [PATCH 07/20] trying to copy build process of RCP 2024-03 - (Task #21) - Trying to rebuild 2024-02 but with a few changes: -- Set justj to Version 21. Version 17 cannot be found as correct dependency. -- removed Pydev, since there are some issues with the update servers -- switched back to tycho 3.05 as in 2024-03, since tycho 4 had issues on finding files on the file system. --- Task #21: Add functionality to setup correct maven version --- maven/pom.xml | 59 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/maven/pom.xml b/maven/pom.xml index a9dad7e..38039f6 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -15,7 +15,7 @@ pom - 4.0.7 + 3.0.5 2.6 UTF-8 @@ -173,21 +173,25 @@ p2 ${eclipse.simultaneous.release.repository} + license-feature - https://download.eclipse.org/cbi/updates/license/ + http://download.eclipse.org/cbi/updates/license/ p2 + justj - https://download.eclipse.org/justj/jres/17/updates/release/latest/ + https://download.eclipse.org/justj/jres/21/updates/release/latest/ p2 + justj-epp https://download.eclipse.org/justj/epp/milestone/latest/ p2 + - ${project.baseUri}../p2Repo + ${p2.repo.overtarget.id} + ${p2.repo.overtarget.url} p2 @@ -210,19 +213,24 @@ p2 + + + + spotbugs-feature @@ -230,7 +238,37 @@ https://spotbugs.github.io/eclipse-stable-latest/ p2 + + + m2t-JET-feature + http://download.eclipse.org/modeling/m2t/updates/releases/ + p2 + + + edapt-feature + https://download.eclipse.org/edapt/releases/12x/120/ + p2 + + + + checkstyle-feature + https://checkstyle.org/eclipse-cs-update-site/ + p2 + + + + asciidoc-editor + https://de-jcup.github.io/update-site-eclipse-asciidoctor-editor/update-site/ + p2 + + + + yaml-editor-feature + https://de-jcup.github.io/update-site-eclipse-yaml-editor/update-site + p2 + + @@ -245,7 +283,6 @@ org.eclipse.tycho tycho-packaging-plugin - ${tycho-version} ${build.qualifier} From bebe2ef7d418d4b94671f0d694766a1642e06a95 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 11:06:45 +0200 Subject: [PATCH 08/20] Deactivated build of local p2 - (Task #21) - Local p2 is not build anymore. - All dependencies are directly retrieved by the product build --- Task #21: Add functionality to setup correct maven version --- .github/workflows/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a022327..9c536fd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,14 +114,14 @@ jobs: # -------------------------------------------- # Setup caching for p2 repository # -------------------------------------------- - - name: Setup - Cache local p2 repository - uses: actions/cache@v2 - with: - path: ./p2Repo - key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-local-p2-deploy- - ${{ runner.os }}-local-p2- + # - name: Setup - Cache local p2 repository + # uses: actions/cache@v2 + # with: + # path: ./p2Repo + # key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }} + # restore-keys: | + # ${{ runner.os }}-local-p2-deploy- + # ${{ runner.os }}-local-p2- # -------------------------------------------- # Perform various setup operations @@ -141,8 +141,8 @@ jobs: # -------------------------------------------- # Prepare p2 Repos # -------------------------------------------- - - name: Build - Prepare p2 repo - run: mvn install -P prepare-m2e-repo -B -V + # - name: Build - Prepare p2 repo + # run: mvn install -P prepare-m2e-repo -B -V # -------------------------------------------- # Development and Feature branches From 273645d99dee6b5c3bfca8408f05da0636c0ddea Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 11:09:32 +0200 Subject: [PATCH 09/20] Removed pydev from product - (Task #78) - there are issues accessing the pydev servers. --- Task #78: Update IDE --- .../virsat_ide.product | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/de.dlr.sc.virsat.ide.product/virsat_ide.product b/de.dlr.sc.virsat.ide.product/virsat_ide.product index 94d0cc4..5fd2fbf 100644 --- a/de.dlr.sc.virsat.ide.product/virsat_ide.product +++ b/de.dlr.sc.virsat.ide.product/virsat_ide.product @@ -33,17 +33,17 @@ This product includes software developed by other open source projects including -showsplash de.dlr.sc.virsat.ide.branding.ui --launcher.defaultAction openFile - -Dosgi.requiredJavaVersion=17 --Dosgi.instance.area.default=@user.home/eclipse-workspace --Dosgi.dataAreaRequiresExplicitInit=true --Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --Declipse.e4.inject.javax.warning=false --Dsun.java.command=Eclipse --Xms256m --Xmx2048m --XX:+UseG1GC --XX:+UseStringDeduplication ---add-modules=ALL-SYSTEM + -Dosgi.requiredJavaVersion=17 +-Dosgi.instance.area.default=@user.home/eclipse-workspace +-Dosgi.dataAreaRequiresExplicitInit=true +-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true +-Declipse.e4.inject.javax.warning=false +-Dsun.java.command=Eclipse +-Xms256m +-Xmx2048m +-XX:+UseG1GC +-XX:+UseStringDeduplication +--add-modules=ALL-SYSTEM -Djava.security.manager=allow @@ -131,7 +131,6 @@ This product includes software developed by other open source projects including - @@ -139,7 +138,7 @@ This product includes software developed by other open source projects including - + From 65adb1fa4a904e720e0e962c81b3cbd986acfdda Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 12:57:25 +0200 Subject: [PATCH 10/20] Setting actions to v7-beta2 - (Task #78) - Setting all actions for github workflow to use the virtual satellite v7-beta2. This should fix the issues with the warnings. --- Task #78: Update IDE --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c536fd..ae03c95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,7 +57,7 @@ jobs: # handed in by known users #--------------------------------------------- - name: Verify - Authors Sanity Check - uses: virtualsatellite/ci-actions/ci-verify-authors-action@v4 + uses: virtualsatellite/ci-actions/ci-verify-authors-action@v7-beta2 # ----------------------------------------------------- @@ -127,7 +127,7 @@ jobs: # Perform various setup operations # -------------------------------------------- - name: Setup - Prepare OS - uses: virtualsatellite/ci-actions/ci-setup-action@v5 + uses: virtualsatellite/ci-actions/ci-setup-action@v7-beta2 with: jdk: no @@ -136,7 +136,7 @@ jobs: # -------------------------------------------- - name: Build - Build and Deploy Decision id: build_decision - uses: virtualsatellite/ci-actions/ci-build-decision-action@v4 + uses: virtualsatellite/ci-actions/ci-build-decision-action@v7-beta2 # -------------------------------------------- # Prepare p2 Repos @@ -148,7 +148,7 @@ jobs: # Development and Feature branches # -------------------------------------------- - name: Build - Assemble - uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v5 + uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v7-beta2 with: build_job: assemble build_profile: ${{ steps.build_decision.outputs.build_type }} @@ -169,7 +169,7 @@ jobs: # Deploying to github releases # -------------------------------------------- - name: Build - Deploy GH - uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v4 + uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v7-beta2 with: build_profile: ${{ steps.build_decision.outputs.build_type }} gh_token: ${{ secrets.GITHUB_TOKEN }} From 538251336f29118b9dc938a9e9322174ab22d14d Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 13:48:14 +0200 Subject: [PATCH 11/20] Reactivate local p2 repo - (Task #22) ... --- Task #22: Be more easy going with warnings in maven build --- .github/workflows/main.yml | 20 +++++++++--------- maven/pom.xml | 43 ++++---------------------------------- pom.xml | 11 ---------- 3 files changed, 14 insertions(+), 60 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ae03c95..c4f0e13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,14 +114,14 @@ jobs: # -------------------------------------------- # Setup caching for p2 repository # -------------------------------------------- - # - name: Setup - Cache local p2 repository - # uses: actions/cache@v2 - # with: - # path: ./p2Repo - # key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }} - # restore-keys: | - # ${{ runner.os }}-local-p2-deploy- - # ${{ runner.os }}-local-p2- + - name: Setup - Cache local p2 repository + uses: actions/cache@v2 + with: + path: ./p2Repo + key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-local-p2-deploy- + ${{ runner.os }}-local-p2- # -------------------------------------------- # Perform various setup operations @@ -141,8 +141,8 @@ jobs: # -------------------------------------------- # Prepare p2 Repos # -------------------------------------------- - # - name: Build - Prepare p2 repo - # run: mvn install -P prepare-m2e-repo -B -V + - name: Build - Prepare p2 repo + run: mvn install -P prepare-m2e-repo -B -V # -------------------------------------------- # Development and Feature branches diff --git a/maven/pom.xml b/maven/pom.xml index 38039f6..f1b8516 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -221,53 +221,18 @@ --> - - - - - - - spotbugs-feature - - https://spotbugs.github.io/eclipse-stable-latest/ - p2 - - m2t-JET-feature - http://download.eclipse.org/modeling/m2t/updates/releases/ - p2 - - - - edapt-feature - https://download.eclipse.org/edapt/releases/12x/120/ - p2 - - - - checkstyle-feature - https://checkstyle.org/eclipse-cs-update-site/ - p2 - - - - asciidoc-editor - https://de-jcup.github.io/update-site-eclipse-asciidoctor-editor/update-site/ - p2 - - - - yaml-editor-feature - https://de-jcup.github.io/update-site-eclipse-yaml-editor/update-site + spotbugs + https://spotbugs.github.io/eclipse/ p2 + diff --git a/pom.xml b/pom.xml index 7dddd50..a1d9c2e 100644 --- a/pom.xml +++ b/pom.xml @@ -44,12 +44,6 @@ - - license-feature - http://download.eclipse.org/cbi/updates/license/ - p2 - - m2t-JET-feature http://download.eclipse.org/modeling/m2t/updates/releases/ @@ -80,11 +74,6 @@ p2 - - pydev - http://www.pydev.org/updates/ - p2 - ${project.projectDirectory}/p2Repo false From b36ea4ef58b9e187862ba2e509c683d8b0949947 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 14:51:46 +0200 Subject: [PATCH 12/20] Bumping action versions - (Task #78) - set github checkout action to v4.1.1 - set github setup java action to v4.2.1 - set github deploy artifact to v4.3.1 --- Task #78: Update IDE --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4f0e13..ad3b924 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,10 +44,10 @@ jobs: # Checks out a copy of the repository # -------------------------------------------- - name: Setup - Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4.1.1 - name: Setup - Java 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4.2.1 with: java-version: 17 distribution: "temurin" @@ -73,10 +73,10 @@ jobs: # Checks out a copy of your repository # -------------------------------------------- - name: Setup - Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4.1.1 - name: Setup - Java 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4.2.1 with: java-version: 17 distribution: "temurin" @@ -157,7 +157,7 @@ jobs: # Upload deployable applications # -------------------------------------------- - name: Build - Upload Build Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.3.1 with: name: Deployable Applications path: | From 69f924f520cff09f12d79215c926f321fb43b5d5 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 15:08:14 +0200 Subject: [PATCH 13/20] Changed caching of m2 - (Task #78) - m2 is now cached with setup java --- Task #78: Update IDE --- .github/workflows/main.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad3b924..f002d81 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,6 +80,7 @@ jobs: with: java-version: 17 distribution: "temurin" + cache: 'maven' - name: Setup - Maven 3.9.6 uses: virtualsatellite/ci-actions/ci-maven-setup@v7-beta2 @@ -99,17 +100,19 @@ jobs: # -------------------------------------------- # Setup caching for m2 repository # -------------------------------------------- - - name: Setup - Cache local m2 repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository/ - key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-local-m2-deploy- - ${{ runner.os }}-local-m2- + # - name: Setup - Cache local m2 repository + # uses: actions/cache@v2 + # with: + # path: ~/.m2/repository/ + # key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }} + # restore-keys: | + # ${{ runner.os }}-local-m2-deploy- + # ${{ runner.os }}-local-m2- - name: Setup - Clean local m2 repository - run: rm -rf ~/.m2/repository/de/dlr/sc/virsat + run: | + ls -d ~/.m2/repository/*/*/* + rm -rf ~/.m2/repository/de/dlr/sc/virsat # -------------------------------------------- # Setup caching for p2 repository From 4885efa6d3a837fbaf39885a4a31303895c225b0 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 15:13:05 +0200 Subject: [PATCH 14/20] - --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f002d81..dc7a5fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -111,7 +111,7 @@ jobs: - name: Setup - Clean local m2 repository run: | - ls -d ~/.m2/repository/*/*/* + ls -d ~/.m2/repository/*/*/* || true rm -rf ~/.m2/repository/de/dlr/sc/virsat # -------------------------------------------- From a8f416f39df53e7bebb75105de7407ac7b335cd9 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 15:21:59 +0200 Subject: [PATCH 15/20] updating cache action - setting to version 4.0.2 --- Task #78: Update IDE --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dc7a5fa..d33fb9b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,7 +118,7 @@ jobs: # Setup caching for p2 repository # -------------------------------------------- - name: Setup - Cache local p2 repository - uses: actions/cache@v2 + uses: actions/cache@v4.0.2 with: path: ./p2Repo key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }} From 5417062184b4ec85ee3878e78a0ea16521323ffe Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 15:59:04 +0200 Subject: [PATCH 16/20] Enable save always on caching - (Task #78) - Enabled the save always on the p2 caches - m2 caches are now handled by setup java. Therefore the save always is not available. --- Task #78: Update IDE --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d33fb9b..6f133ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -121,6 +121,7 @@ jobs: uses: actions/cache@v4.0.2 with: path: ./p2Repo + save-always: true key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-local-p2-deploy- From 791e431314cdeecee01a7a66e4deedf772f5b5e2 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Tue, 16 Apr 2024 16:01:26 +0200 Subject: [PATCH 17/20] Fixing further cache actions - (Task #78) - adjusted some further cache actions to work on v4.0.2 --- Task #78: Update IDE --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6f133ca..a09af4d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: maven-version: "3.9.6" - name: Setup - Cache maven download - uses: actions/cache@v2 + uses: actions/cache@v4.0.2 with: path: ./maven.tar.gz key: ${{ runner.os }}-local-maven-setup-${{ hashFiles('**/pom.xml') }} @@ -101,8 +101,9 @@ jobs: # Setup caching for m2 repository # -------------------------------------------- # - name: Setup - Cache local m2 repository - # uses: actions/cache@v2 + # uses: actions/cache@v4.0.2 # with: + # cache-always: true # path: ~/.m2/repository/ # key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }} # restore-keys: | From 2291676f0714d2eab08e33769f1938e3c07598c4 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Wed, 7 Aug 2024 12:37:20 +0200 Subject: [PATCH 18/20] Did some minor fixes - (Task #78) - Development is building without issues --- Task #78: Update IDE --- de.dlr.sc.virsat.ide.branding.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../launch/VirSat IDE Application.launch | 2 +- .../virsat_ide.product | 28 ++++++------ known_authors.txt | 4 -- ...rSat IDE Build Development (Deploy).launch | 43 ++++++++++-------- launch/VirSat IDE Build Development.launch | 44 ++++++++++--------- launch/VirSat IDE Clean.launch | 41 +++++++++-------- .../VirSat IDE Setup Prepare P2 Mirror.launch | 44 ++++++++++--------- 10 files changed, 115 insertions(+), 101 deletions(-) diff --git a/de.dlr.sc.virsat.ide.branding.ui/.classpath b/de.dlr.sc.virsat.ide.branding.ui/.classpath index cbd391f..c362d17 100644 --- a/de.dlr.sc.virsat.ide.branding.ui/.classpath +++ b/de.dlr.sc.virsat.ide.branding.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs b/de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs index 7adc0fb..d4540a5 100644 --- a/de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs +++ b/de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF index e6f35d3..f80633d 100644 --- a/de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF +++ b/de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: VirSat Development IDE based on EPP RCP/RAP Bundle Bundle-SymbolicName: de.dlr.sc.virsat.ide.branding.ui;singleton:=true Bundle-Version: 4.16.0.qualifier Bundle-Vendor: DLR (German Aerospace Center) -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir diff --git a/de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch b/de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch index 71b404c..0d7cec5 100644 --- a/de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch +++ b/de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch @@ -66,7 +66,7 @@ - + diff --git a/de.dlr.sc.virsat.ide.product/virsat_ide.product b/de.dlr.sc.virsat.ide.product/virsat_ide.product index 5fd2fbf..3f33bf0 100644 --- a/de.dlr.sc.virsat.ide.product/virsat_ide.product +++ b/de.dlr.sc.virsat.ide.product/virsat_ide.product @@ -33,17 +33,17 @@ This product includes software developed by other open source projects including -showsplash de.dlr.sc.virsat.ide.branding.ui --launcher.defaultAction openFile - -Dosgi.requiredJavaVersion=17 --Dosgi.instance.area.default=@user.home/eclipse-workspace --Dosgi.dataAreaRequiresExplicitInit=true --Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --Declipse.e4.inject.javax.warning=false --Dsun.java.command=Eclipse --Xms256m --Xmx2048m --XX:+UseG1GC --XX:+UseStringDeduplication ---add-modules=ALL-SYSTEM + -Dosgi.requiredJavaVersion=17 +-Dosgi.instance.area.default=@user.home/eclipse-workspace +-Dosgi.dataAreaRequiresExplicitInit=true +-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true +-Declipse.e4.inject.javax.warning=false +-Dsun.java.command=Eclipse +-Xms256m +-Xmx2048m +-XX:+UseG1GC +-XX:+UseStringDeduplication +--add-modules=ALL-SYSTEM -Djava.security.manager=allow @@ -64,9 +64,9 @@ This product includes software developed by other open source projects including - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 diff --git a/known_authors.txt b/known_authors.txt index fb6f52e..e0b4678 100644 --- a/known_authors.txt +++ b/known_authors.txt @@ -1,8 +1,4 @@ -andriikovalov-dlr franzTobiasDLR -SaMuellerDLR PhilMFischer -Anna-Lena-DLR -GeorgeNasrDLR pchrszon-dlr dellerDLR \ No newline at end of file diff --git a/launch/VirSat IDE Build Development (Deploy).launch b/launch/VirSat IDE Build Development (Deploy).launch index c0ad87f..c2f9949 100644 --- a/launch/VirSat IDE Build Development (Deploy).launch +++ b/launch/VirSat IDE Build Development (Deploy).launch @@ -1,22 +1,27 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launch/VirSat IDE Build Development.launch b/launch/VirSat IDE Build Development.launch index 0ce2489..a03c513 100644 --- a/launch/VirSat IDE Build Development.launch +++ b/launch/VirSat IDE Build Development.launch @@ -1,23 +1,27 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launch/VirSat IDE Clean.launch b/launch/VirSat IDE Clean.launch index aa70fb4..e4cf5aa 100644 --- a/launch/VirSat IDE Clean.launch +++ b/launch/VirSat IDE Clean.launch @@ -1,21 +1,26 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launch/VirSat IDE Setup Prepare P2 Mirror.launch b/launch/VirSat IDE Setup Prepare P2 Mirror.launch index e23e1ad..8b9d6de 100644 --- a/launch/VirSat IDE Setup Prepare P2 Mirror.launch +++ b/launch/VirSat IDE Setup Prepare P2 Mirror.launch @@ -1,23 +1,27 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + From 923a44c9ac72a005b8d4cc29d8f09750e64dbd7b Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" Date: Wed, 7 Aug 2024 14:36:53 +0200 Subject: [PATCH 19/20] Trigger build - (Task #78) - Due to deactivated workflows --- Task #78: Update IDE --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 3441afe..792001a 100644 --- a/build.xml +++ b/build.xml @@ -66,7 +66,7 @@ SPDX-License-Identifier: EPL-2.0 - +