Skip to content

Commit a87f4e7

Browse files
authored
Merge pull request #67 from virtualsatellite/integration
Release 4.14.0
2 parents d84d2b2 + c1db4d2 commit a87f4e7

File tree

22 files changed

+180
-141
lines changed

22 files changed

+180
-141
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
# handed in by known users
5252
#---------------------------------------------
5353
- name: Verify - Authors Sanity Check
54-
uses: virtualsatellite/ci-actions/ci-verify-authors-action@v2
54+
uses: virtualsatellite/ci-actions/ci-verify-authors-action@v4
5555

5656
# -----------------------------------------------------
5757
# Build, Assemble and Deploy Job
@@ -99,14 +99,14 @@ jobs:
9999
# Perform various setup operations
100100
# --------------------------------------------
101101
- name: Setup - Prepare OS
102-
uses: virtualsatellite/ci-actions/ci-setup-action@v2
102+
uses: virtualsatellite/ci-actions/ci-setup-action@v4
103103

104104
# --------------------------------------------
105105
# Development and Feature branches
106106
# --------------------------------------------
107107
- name: Build - Build and Deploy Decision
108108
id: build_decision
109-
uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
109+
uses: virtualsatellite/ci-actions/ci-build-decision-action@v4
110110

111111
# --------------------------------------------
112112
# Prepare p2 Repos
@@ -118,7 +118,7 @@ jobs:
118118
# Development and Feature branches
119119
# --------------------------------------------
120120
- name: Build - Assemble
121-
uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v2
121+
uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v4
122122
with:
123123
build_job: assemble
124124
build_profile: ${{ steps.build_decision.outputs.build_type }}
@@ -127,7 +127,7 @@ jobs:
127127
# Deploying to github releases
128128
# --------------------------------------------
129129
- name: Build - Deploy GH
130-
uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v2
130+
uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v4
131131
with:
132132
build_profile: ${{ steps.build_decision.outputs.build_type }}
133133
gh_token: ${{ secrets.GITHUB_TOKEN }}

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ SaMuellerDLR <[email protected]> Sascha Müller <[email protected]>
1010

1111
PhilMFischer <[email protected]> Philipp M. Fischer <[email protected]>
1212
PhilMFischer <[email protected]> Philipp M. Fischer <[email protected]>
13+
PhilMFischer <[email protected]> fisc_ph <[email protected]>
1314

1415
TjorveKujathDLR <[email protected]> Tjorve Kujath <[email protected]>
1516

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ Virtual Satellite is based on Java / Eclipse and provides an installable feature
3333
3. Import all projects and working-sets via the ProjectSet file in _de.dlr.sc.virsat.ide/projectSet_
3434
6. Execute the Virtual Satellite DEV IDE build from _de.dlr.sc.virsat.ide/launchers_
3535

36-
## Travis CI and Releases
36+
## Github Actions and Releases
37+
Github Actions is set-up to start a build job for every branch and every new commit to the repository. It executes all relevant tests such as jUnit, SWTBot, Checkstyle, SpotBugs, etc. Making a successful pull-request into development requires all tests to pass.
3738

38-
Tarvis CI is set-up to start a build job for every branch and every new commit to the repository. It executes all relevant tests such as jUnit, SWTBot, Checkstyle, SpotBugs, etc. Making a successful pull-request into development requires all tests to pass.
39-
40-
Starting a Travis CI job on development or integration deploys all relevant artifacts.
39+
Starting a Github Actions job on development or integration deploys all relevant artifacts.
4140

4241
For creating a new release, create a tag starting with *Release_* on the *master* branch. All artifacts are automatically deployed.
4342

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
1313
Additional Build Preparations for VirSat
1414
</description>
1515

16-
<property name="version">4.13.0</property>
16+
<property name="version">4.14.0</property>
1717

1818
<property name="version.pattern.qualified">[\s]?[0-9]+\.[0-9]+\.[0-9]+\.qualifier</property>
1919
<property name="version.pattern">[\s]?[0-9]+\.[0-9]+\.[0-9]+</property>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="de.dlr.sc.virsat.ide.branding.feature"
44
label="VirSat Development IDE Branding and Package Feature"
5-
version="4.13.0.qualifier"
5+
version="4.14.0.qualifier"
66
provider-name="DLR (German Aerospace Center)"
77
plugin="de.dlr.sc.virsat.ide.branding.ui"
88
license-feature="de.dlr.sc.virsat.ide.license.feature">
@@ -29,8 +29,8 @@ by German Aerospace Center (DLR e.V.)
2929
<import feature="org.eclipse.epp.mpc"/>
3030
<import feature="org.eclipse.epp.logging.aeri.feature"/>
3131
<import feature="org.eclipse.oomph.setup"/>
32-
<import feature="de.dlr.sc.virsat.ide.license.feature" version="4.13.0.qualifier"/>
33-
<import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.13.0.qualifier"/>
32+
<import feature="de.dlr.sc.virsat.ide.license.feature" version="4.14.0.qualifier"/>
33+
<import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.14.0.qualifier"/>
3434
</requires>
3535

3636
<plugin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<relativePath>../maven/pom.xml</relativePath>
1515
<groupId>de.dlr.sc.virsat.ide</groupId>
1616
<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
17-
<version>4.13.0-SNAPSHOT</version>
17+
<version>4.14.0-SNAPSHOT</version>
1818
</parent>
1919

2020
<artifactId>de.dlr.sc.virsat.ide.branding.feature</artifactId>

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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: VirSat Development IDE based on EPP RCP/RAP Bundle
44
Bundle-SymbolicName: de.dlr.sc.virsat.ide.branding.ui;singleton:=true
5-
Bundle-Version: 4.13.0.qualifier
5+
Bundle-Version: 4.14.0.qualifier
66
Bundle-Vendor: DLR (German Aerospace Center)
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
88
Require-Bundle: org.eclipse.platform,

de.dlr.sc.virsat.ide.branding.ui/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<relativePath>../maven/pom.xml</relativePath>
1515
<groupId>de.dlr.sc.virsat.ide</groupId>
1616
<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
17-
<version>4.13.0-SNAPSHOT</version>
17+
<version>4.14.0-SNAPSHOT</version>
1818
</parent>
1919

2020
<artifactId>de.dlr.sc.virsat.ide.branding.ui</artifactId>

de.dlr.sc.virsat.ide.docs.feature/docs/VirSat_IDE_ReleaseNotes.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
11
VirSat IDE Release Notes
22
-------------------------
33

4+
Release 4.14.0 (18th February 2022)
5+
------------------------------------
6+
7+
New Features:
8+
Added Concept language and generators of Virtual Satellite Core 4.14.0
9+
10+
Usability Updates:
11+
Reactivated Checkstyle Feature with new repository dependency
12+
Reactivated Yaml Editor Feature with new repository dependency
13+
Reactivated AsciiDoc Editor Feature with new repository dependency
14+
15+
Fixed Bugs:
16+
17+
18+
Release 4.13.0 (5th May 2021)
19+
----------------------------------
20+
21+
New Features:
22+
Added Concept language and generators of Virtual Satellite Core 4.13.0
23+
24+
Usability Updates:
25+
Deactivated Checkstyle Feature since repo got shutdown on bintray
26+
Deactivated Yaml Editor Feature since repo got shutdown on bintray
27+
Deactivated AsciiDoc Editor Feature since repo got shutdown on bintray
28+
29+
Fixed Bugs:
30+
31+
432
Release 4.12.0 (31st July 2020)
533
----------------------------------
634

de.dlr.sc.virsat.ide.docs.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="de.dlr.sc.virsat.ide.docs.feature"
44
label="VirSat IDE Documents and Release Notes Feature"
5-
version="4.13.0.qualifier"
5+
version="4.14.0.qualifier"
66
provider-name="DLR (German Aerospace Center)"
77
plugin="de.dlr.sc.virsat.ide.branding.ui"
88
license-feature="de.dlr.sc.virsat.ide.license.feature">

0 commit comments

Comments
 (0)