diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d42d8e..d897050 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,28 +37,35 @@ jobs: #--------------------------------------------- verify: name: Verify - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: # -------------------------------------------- # 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@v4.2.1 + with: + java-version: 17 + distribution: "temurin" # -------------------------------------------- # Run a quick sanity check if all commits are # 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 + # ----------------------------------------------------- # Build, Assemble and Deploy Job # ----------------------------------------------------- deploy: name: Build, Assemble and Deploy - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [verify] steps: @@ -66,30 +73,56 @@ 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@v4.2.1 + with: + java-version: 17 + distribution: "temurin" + cache: 'maven' + + - name: Setup - Maven 3.9.6 + uses: virtualsatellite/ci-actions/ci-maven-setup@v7 + with: + maven-version: "3.9.6" + + - name: Setup - Cache maven download + uses: actions/cache@v4.0.2 + 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 # -------------------------------------------- - - 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@v4.0.2 + # with: + # cache-always: true + # 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/*/*/* || true + rm -rf ~/.m2/repository/de/dlr/sc/virsat # -------------------------------------------- # Setup caching for p2 repository # -------------------------------------------- - name: Setup - Cache local p2 repository - uses: actions/cache@v2 + 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- @@ -99,16 +132,16 @@ 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 with: - jdk: 11 + jdk: no # -------------------------------------------- # Development and Feature branches # -------------------------------------------- - 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 # -------------------------------------------- # Prepare p2 Repos @@ -120,7 +153,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 with: build_job: assemble build_profile: ${{ steps.build_decision.outputs.build_type }} @@ -129,7 +162,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: | @@ -141,7 +174,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 with: build_profile: ${{ steps.build_decision.outputs.build_type }} gh_token: ${{ secrets.GITHUB_TOKEN }} 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 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 - + - + - + - + + + + + + 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..3f33bf0 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 @@ -57,22 +64,38 @@ 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 + 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 - - + + + + + + + + + + + + + + + + + + @@ -84,22 +107,14 @@ This product includes software developed by other open source projects including - - - - - - - - - - + + @@ -109,23 +124,22 @@ This product includes software developed by other open source projects including - - - - - + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven/pom.xml b/maven/pom.xml index fcb8454..f1b8516 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 + 3.0.5 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,13 +168,6 @@ - - maven-to-eclipse-tycho-feature - - ${project.baseUri}../p2Repo - p2 - - eclipse-simultaneous-release p2 @@ -183,42 +175,65 @@ - ${p2.repo.virsat.id} - ${p2.repo.virsat.url} + license-feature + http://download.eclipse.org/cbi/updates/license/ p2 - + + + justj + https://download.eclipse.org/justj/jres/21/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 + + ${p2.repo.overtarget.id} ${p2.repo.overtarget.url} p2 - + + + ${p2.repo.virsat.id} + ${p2.repo.virsat.url} + p2 + + + gitlab-mylyn-feature https://pweingardt.github.io/mylyn-gitlab/ p2 - - + + --> + - spotbugs-feature - - https://spotbugs.github.io/eclipse-stable-latest/ + p2-local-repos + ${project.baseUri}../p2Repo p2 - + - mylyn-feature - https://download.eclipse.org/mylyn/releases/3.25/ + spotbugs + https://spotbugs.github.io/eclipse/ p2 + - - github-mylyn-connector-feature - https://download.eclipse.org/egit/github/updates/ - p2 - @@ -230,35 +245,9 @@ true - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - true - - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - - - org.eclipse.tycho tycho-packaging-plugin - ${tycho-version} ${build.qualifier} @@ -325,4 +314,4 @@ - + diff --git a/pom.xml b/pom.xml index 1fabb2e..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/ @@ -68,17 +62,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/ @@ -91,11 +74,6 @@ p2 - - pydev - http://www.pydev.org/updates/ - p2 - ${project.projectDirectory}/p2Repo false