Skip to content

Commit b64c7c8

Browse files
PhilMFischerPhilMFischer
authored
Merge pull request #80 from virtualsatellite/feature/task_78-Update_IDE
Updated IDE to latest versions Closes #78
2 parents 5087436 + 9919225 commit b64c7c8

File tree

19 files changed

+282
-232
lines changed

19 files changed

+282
-232
lines changed

‎.github/workflows/main.yml‎

Lines changed: 54 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,59 +37,92 @@ jobs:
3737
#---------------------------------------------
3838
verify:
3939
name: Verify
40-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-22.04
4141

4242
steps:
4343
# --------------------------------------------
4444
# Checks out a copy of the repository
4545
# --------------------------------------------
4646
- name: Setup - Checkout code
47-
uses: actions/checkout@v2
47+
uses: actions/[email protected]
48+
49+
- name: Setup - Java 17
50+
uses: actions/[email protected]
51+
with:
52+
java-version: 17
53+
distribution: "temurin"
4854

4955
# --------------------------------------------
5056
# Run a quick sanity check if all commits are
5157
# handed in by known users
5258
#---------------------------------------------
5359
- name: Verify - Authors Sanity Check
54-
uses: virtualsatellite/ci-actions/ci-verify-authors-action@v4
60+
uses: virtualsatellite/ci-actions/ci-verify-authors-action@v7
61+
5562

5663
# -----------------------------------------------------
5764
# Build, Assemble and Deploy Job
5865
# -----------------------------------------------------
5966
deploy:
6067
name: Build, Assemble and Deploy
61-
runs-on: ubuntu-20.04
68+
runs-on: ubuntu-22.04
6269
needs: [verify]
6370

6471
steps:
6572
# --------------------------------------------
6673
# Checks out a copy of your repository
6774
# --------------------------------------------
6875
- name: Setup - Checkout code
69-
uses: actions/checkout@v2
76+
uses: actions/[email protected]
77+
78+
- name: Setup - Java 17
79+
uses: actions/[email protected]
80+
with:
81+
java-version: 17
82+
distribution: "temurin"
83+
cache: 'maven'
84+
85+
- name: Setup - Maven 3.9.6
86+
uses: virtualsatellite/ci-actions/ci-maven-setup@v7
87+
with:
88+
maven-version: "3.9.6"
89+
90+
- name: Setup - Cache maven download
91+
uses: actions/[email protected]
92+
with:
93+
path: ./maven.tar.gz
94+
key: ${{ runner.os }}-local-maven-setup-${{ hashFiles('**/pom.xml') }}
95+
restore-keys: |
96+
${{ runner.os }}-local-maven-setup-
97+
${{ runner.os }}-local-maven-
98+
7099

71100
# --------------------------------------------
72101
# Setup caching for m2 repository
73102
# --------------------------------------------
74-
- name: Setup - Cache local m2 repository
75-
uses: actions/cache@v2
76-
with:
77-
path: ~/.m2/repository/
78-
key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }}
79-
restore-keys: |
80-
${{ runner.os }}-local-m2-deploy-
81-
${{ runner.os }}-local-m2-
103+
# - name: Setup - Cache local m2 repository
104+
# uses: actions/[email protected]
105+
# with:
106+
# cache-always: true
107+
# path: ~/.m2/repository/
108+
# key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }}
109+
# restore-keys: |
110+
# ${{ runner.os }}-local-m2-deploy-
111+
# ${{ runner.os }}-local-m2-
82112

83113
- name: Setup - Clean local m2 repository
84-
run: rm -rf ~/.m2/repository/de/dlr/sc/virsat
114+
run: |
115+
ls -d ~/.m2/repository/*/*/* || true
116+
rm -rf ~/.m2/repository/de/dlr/sc/virsat
85117
86118
# --------------------------------------------
87119
# Setup caching for p2 repository
88120
# --------------------------------------------
89121
- name: Setup - Cache local p2 repository
90-
uses: actions/cache@v2
122+
uses: actions/cache@v4.0.2
91123
with:
92124
path: ./p2Repo
125+
save-always: true
93126
key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }}
94127
restore-keys: |
95128
${{ runner.os }}-local-p2-deploy-
@@ -99,16 +132,16 @@ jobs:
99132
# Perform various setup operations
100133
# --------------------------------------------
101134
- name: Setup - Prepare OS
102-
uses: virtualsatellite/ci-actions/ci-setup-action@v5
135+
uses: virtualsatellite/ci-actions/ci-setup-action@v7
103136
with:
104-
jdk: 11
137+
jdk: no
105138

106139
# --------------------------------------------
107140
# Development and Feature branches
108141
# --------------------------------------------
109142
- name: Build - Build and Deploy Decision
110143
id: build_decision
111-
uses: virtualsatellite/ci-actions/ci-build-decision-action@v4
144+
uses: virtualsatellite/ci-actions/ci-build-decision-action@v7
112145

113146
# --------------------------------------------
114147
# Prepare p2 Repos
@@ -120,7 +153,7 @@ jobs:
120153
# Development and Feature branches
121154
# --------------------------------------------
122155
- name: Build - Assemble
123-
uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v5
156+
uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v7
124157
with:
125158
build_job: assemble
126159
build_profile: ${{ steps.build_decision.outputs.build_type }}
@@ -129,7 +162,7 @@ jobs:
129162
# Upload deployable applications
130163
# --------------------------------------------
131164
- name: Build - Upload Build Artifacts
132-
uses: actions/upload-artifact@v2
165+
uses: actions/upload-artifact@v4.3.1
133166
with:
134167
name: Deployable Applications
135168
path: |
@@ -141,7 +174,7 @@ jobs:
141174
# Deploying to github releases
142175
# --------------------------------------------
143176
- name: Build - Deploy GH
144-
uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v4
177+
uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v7
145178
with:
146179
build_profile: ${{ steps.build_decision.outputs.build_type }}
147180
gh_token: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
**/*._trace
66
**/*.xtendbin
77
/workspace/
8-
/deploy/
8+
/deploy/
9+
/apache-maven-*
10+
/maven.tar.gz

‎build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ SPDX-License-Identifier: EPL-2.0
6666
<!-- =====================================================
6767
Task: updateVersion
6868
===================================================== -->
69-
<target name="updateVersions">
69+
<target name="updateVersions">
7070

7171
<!-- =====================================================
7272
Task: updateVersion - Ask for new Version String

‎de.dlr.sc.virsat.ide.branding.feature/feature.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,12 @@ by German Aerospace Center (DLR e.V.)
2626
</license>
2727

2828
<requires>
29-
<import feature="org.eclipse.epp.mpc"/>
30-
<import feature="org.eclipse.oomph.setup"/>
3129
<import feature="de.dlr.sc.virsat.ide.license.feature" version="4.16.0.qualifier"/>
3230
<import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.16.0.qualifier"/>
3331
</requires>
3432

3533
<plugin
3634
id="de.dlr.sc.virsat.ide.branding.ui"
37-
download-size="0"
38-
install-size="0"
3935
version="0.0.0"/>
4036

4137
</feature>

‎de.dlr.sc.virsat.ide.branding.feature/p2.inf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ requires.1.greedy=true
2222
# RCP/RAP package had been changed in Eclipse Mars (4.5)
2323

2424
update.id = de.dlr.sc.virsat.ide.branding.feature.feature.group
25-
update.range = [4.5, $version$)
25+
update.range = [4.5, 5.0.0)
2626
update.severity = 0
2727
update.description = Eclipse package upgrade from versions before Eclipse Mars (4.5) is not possible. See bug 332989.

‎de.dlr.sc.virsat.ide.branding.ui/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="output" path="target/classes"/>
66
</classpath>

‎de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4-
org.eclipse.jdt.core.compiler.compliance=11
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.compliance=17
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
77
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
88
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
99
org.eclipse.jdt.core.compiler.release=enabled
10-
org.eclipse.jdt.core.compiler.source=11
10+
org.eclipse.jdt.core.compiler.source=17

‎de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: VirSat Development IDE based on EPP RCP/RAP Bundle
44
Bundle-SymbolicName: de.dlr.sc.virsat.ide.branding.ui;singleton:=true
55
Bundle-Version: 4.16.0.qualifier
66
Bundle-Vendor: DLR (German Aerospace Center)
7-
Bundle-RequiredExecutionEnvironment: JavaSE-11
7+
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Require-Bundle: org.eclipse.platform,
99
org.eclipse.equinox.app
1010
Eclipse-BundleShape: dir

‎de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎de.dlr.sc.virsat.ide.product/p2.inf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ properties.2.value = DLR (German Aerospace Center)
2222
# RCP/RAP package had been changed in Eclipse Mars (4.5)
2323

2424
update.id = de.dlr.sc.virsat.ide.product
25-
update.range = [4.5, $version$)
25+
update.range = [4.5, 5.0.0)
2626
update.severity = 0
2727
update.description = Eclipse package upgrade from versions before Eclipse Mars (4.5) is not possible. See bug 332989.

0 commit comments

Comments
 (0)