Skip to content

Commit

Permalink
Merge pull request #1241 from virtualsatellite/integration
Browse files Browse the repository at this point in the history
Release 4.18.0
  • Loading branch information
pchrszon-dlr authored Nov 14, 2024
2 parents aaa5063 + ba1d099 commit 565adc5
Show file tree
Hide file tree
Showing 452 changed files with 3,627 additions and 697 deletions.
48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/hotfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
name: Release - HotFix
about: Create a HotFix - Release for an existing Version of Virtual Satellite
title: 'Release Version 4.x.x '
labels: release
assignees: ''

---

Virtual Satellite Release Version 4.xx.x - HotFix

This ticket captures all release related work of VirtualSatellite4-Core

1. Create LTS Branches if not existing:
- [ ] Checkout/Update the `Release_4.xx.x` tag
- [ ] Create new `master_lts/Release_4.xx.x` if it does not exist

2. Create Branches (optional), in case several changes need to be hot fixed:
- [ ] Remove old `integration` branch
- [ ] Create new `integration` branch and checkout if necessary or do the following steps with your `hotfix/task_123_branch`

3. apply all fixes

4. Update master/release branch:
- [ ] Merge `hotfix/task_123_branch`or `integration` branch into `master_lts` branch (Pull Request named "Release 4.x.x- HotFixes")

5. Update Versions
- [ ] Run ant script to update version numbers (open build.xml and start the updateVersions task)
- [ ] Check if the server APIs had changes and update the version numbers in the servlets if necessary
- [ ] Check if there are unreleased changes on the Ecore data model (open dvlm.ecore, check if History > Release (not yet released is empty))
- [ ] Create a Edapt release of new changes (Open the DVLM-Ecore model; open the view "Operation Browser", click "Release" with "not yet released" selected, set the next version)
- [ ] Generate model and edit code from Ecore (Open dvlm.genmodel, right click on the context menu)
- [ ] Adjust DVLM version number in factory overwrite: in the plugin.xml of the de.dlr.sc.virsat.model project. (Extension point: org.eclipse.emf.ecore.factory_override)
- [ ] Adjust DVLM version number in ConceptLanguage.xtext and run GenerateConceptLanguage.mwe2
- [ ] Adjust DVLM version number in EquationDSL.xtext and run GenerateEquationDSL.mwe2
- [ ] Regenerate concept.xmi of all relevant projects (launch "VirSat Core Concept IDE", import projects (with nested), build all)
- [ ] Check that Java API Doc is working in our Concept-IDE - If not update the Java API Doc being registered in the Java doc plugin
- To check if it works, create a VirSat App and test if the Java API and Model APi from VirSat is backed by JavaDoc
- [ ] Make sure application launches without errors from the product launcher
- [ ] Merge `hotfix/task_123_branch`or `integration` branch into `master_lts` branch (Pull Request named "Release 4.x.x")
- [ ] Create GitHub Release including a Tag on `master_lts` branch. Name it "Release_4.xx.x".

6. Merge back integration branch:
- [ ] Merge `development` into `integration` or `hotfix` branch. Check that everything is working as expected.
- [ ] Merge `integration` or `hotfix` branch into `development` branch (Pull Request named "Integration 4.x.x - Remerge Fixes")

Well Done!! You should have a HotFix Virtual Satellite Release :rocket:

18 changes: 9 additions & 9 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ assignees: ''

Virtual Satellite Release Version 4.x.x

This ticket captures all release related work of the VirtualSatellite4-Core release
This ticket captures all release related work of VirtualSatellite4-Core

1. Perform version update:
- [ ] Checkout/Update the Development branch
- [ ] Remove current integration branch (Make sure no one else is integrating at the moment)
- [ ] Create new integration branch from development branch
- [ ] Checkout/Update the `Development` branch
- [ ] Remove current `integration` branch (Make sure no one else is integrating at the moment)
- [ ] Create new `integration` branch from development branch
- [ ] Run ant script to update version numbers (open build.xml and start the updateVersions task)
- [ ] Check if the server APIs had changes and update the version numbers in the servlets if necessary
- [ ] Check if there are unreleased changes on the Ecore data model (open dvlm.ecore, check if History > Release (not yet released is empty))
Expand All @@ -27,18 +27,18 @@ This ticket captures all release related work of the VirtualSatellite4-Core rele
- [ ] Check that Java API Doc is working in our Concept-IDE - If not update the Java API Doc being registered in the Java doc plugin
- To check if it works, create a VirSat App and test if the Java API and Model APi from VirSat is backed by JavaDoc
- [ ] Make sure application launches without errors from the product launcher
- [ ] Merge integration branch into development branch (Pull Request named "Integration 4.x.x - Remerge Versions")
- [ ] Merge `integration` branch into `development` branch (Pull Request named "Integration 4.x.x - Remerge Versions")

2. Perform integration on integration branch:
- [ ] Apply all needed fixes
- [ ] Update the release notes

3. Update master/release branch:
- [ ] Merge integration branch into master branch (Pull Request named "Release 4.x.x")
- [ ] Create Release Tag
- [ ] Merge `integration` branch into `master` branch (Pull Request named "Release 4.x.x")
- [ ] Create GitHub Release including a Tag on the 'master' branch. Name it "Release_4.xx.x".

4. Merge back integration branch:
- [ ] Merge integration branch into development branch (Pull Request named "Integration 4.x.x - Remerge Fixes")
- [ ] Merge `integration` branch into `development` branch (Pull Request named "Integration 4.x.x - Remerge Fixes")

Well Done!! You should have a new Virtual Satellite Release :rocket:

19 changes: 17 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
# --------------------------------------------
schedule:
- cron: '37 20 * * *'

# --------------------------------------------
# Run this workflow every time a new commit pushed to the repository
# --------------------------------------------
Expand All @@ -25,6 +25,10 @@ on:
branches:
- '**'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
# -------------------------------------------------------------
# Setting up locale to have correct keyboard mapping for swtbot
Expand Down Expand Up @@ -195,7 +199,7 @@ jobs:
# --------------------------------------------
- name: Build and Test - Upload SWTBot Screenshots on Failure
if: ${{ failure() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4.3.4
with:
name: SWTBot Screenshots
path:
Expand All @@ -211,6 +215,17 @@ jobs:
name: Surefire Reports
path:
./**/target/surefire-reports/*

# --------------------------------------------
# Upload Logs to github artifacts
# --------------------------------------------
- name: Build and Test - Upload Surefire Logs on Failure
# if: ${{ failure() }}
uses: actions/upload-artifact@v4.3.4
with:
name: Surefire Reports
path:
./**/*.log

# -----------------------------------------------------
# Build and Test - Checkstyle Job
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
**/*-sources.jar
/apache-maven-3.9.6/
/.overtarget/
surefire-work
6 changes: 6 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ andriikovalov-dlr <andrii.kovalov@dlr.de> kova_an <kova_an@SC-010213.intra.dlr.
franzTobiasDLR <tobias.franz@dlr.de> franzTobiasDLR <49645871+franzTobiasDLR@users.noreply.github.com>
franzTobiasDLR <tobias.franz@dlr.de> Tobias Franz <tobias.franz@dlr.de>
franzTobiasDLR <tobias.franz@dlr.de> fran_tb <fran_tb@SC-010209.intra.dlr.de>
franzTobiasDLR <tobias.franz@dlr.de> fran_tb <fran_tb@SC-010273.intra.dlr.de>
franzTobiasDLR <tobias.franz@dlr.de> tobias.franz@dlr.de <tobias.franz@dlr.de>

SaMuellerDLR <sa.mueller@dlr.de> Müller, Sascha ( SC-SRV ) <sa.mueller@dlr.de>
Expand Down Expand Up @@ -44,3 +45,8 @@ pchrszon-dlr <Philipp.Chrszon@dlr.de> Chrszon, Philipp <Philipp.Chrszon@dlr.de
pchrszon-dlr <Philipp.Chrszon@dlr.de> Philipp Chrszon <Philipp.Chrszon@dlr.de>

DimitriDiantos <dimitri.ngatchapokouane@dlr.de> ngat_di <ngat_di@SC-010135.intra.dlr.de>
DimitriDiantos <dimitri.ngatchapokouane@dlr.de> Dimitri Ngatcha Pokouane <ngat_di@SC-010135.intra.dlr.de>

kain-ap <kain_ap@SC-010285.intra.dlr.de> kain-ap <kain_ap@SC-010285.intra.dlr.de>
kain-ap <kain_ap@SC-010285.intra.dlr.de> kain_ap <kain_ap@SC-010285.intra.dlr.de>
kain-ap <kain_ap@SC-010285.intra.dlr.de> kain_ap <aprajita.kain@dlr.de>
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
Additional Build Preparations for VirSat
</description>

<property name="version">4.17.0</property>
<property name="version">4.18.0</property>

<property name="version.pattern.qualified">[\s]?[0-9]+\.[0-9]+\.[0-9]+\.qualifier</property>
<property name="version.pattern">[\s]?[0-9]+\.[0-9]+\.[0-9]+</property>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.apps.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<feature id="de.dlr.sc.virsat.apps.feature" label="VirSat Core Model Apps Feature" version="4.17.0.qualifier" provider-name="DLR (German Aerospace Center)" plugin="de.dlr.sc.virsat.branding.ui" license-feature="de.dlr.sc.virsat.license.feature">
<feature id="de.dlr.sc.virsat.apps.feature" label="VirSat Core Model Apps Feature" version="4.18.0.qualifier" provider-name="DLR (German Aerospace Center)" plugin="de.dlr.sc.virsat.branding.ui" license-feature="de.dlr.sc.virsat.license.feature">

<description>
VirSat Apps Feature
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.apps.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat</groupId>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.apps.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.apps.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Java Model Access Tests
Bundle-SymbolicName: de.dlr.sc.virsat.apps.test
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Fragment-Host: de.dlr.sc.virsat.apps
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: DLR (German Aerospace Center)
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.apps.test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
<parent>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<groupId>de.dlr.sc.virsat</groupId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
<relativePath>../maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.apps.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Model Apps UI
Bundle-SymbolicName: de.dlr.sc.virsat.apps.ui;singleton:=true
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Bundle-Activator: de.dlr.sc.virsat.apps.ui.Activator
Bundle-Vendor: DLR (German Aerospace Center)
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.apps.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
<parent>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<groupId>de.dlr.sc.virsat</groupId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
<relativePath>../maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.apps/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Model Apps
Bundle-SymbolicName: de.dlr.sc.virsat.apps;singleton:=true
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Bundle-Activator: de.dlr.sc.virsat.apps.Activator
Bundle-Vendor: DLR (German Aerospace Center)
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.apps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
<parent>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<groupId>de.dlr.sc.virsat</groupId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
<relativePath>../maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.branding.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<feature id="de.dlr.sc.virsat.branding.feature" label="VirSat Core Branding Feature" version="4.17.0.qualifier" provider-name="DLR (German Aerospace Center)" license-feature="de.dlr.sc.virsat.license.feature">
<feature id="de.dlr.sc.virsat.branding.feature" label="VirSat Core Branding Feature" version="4.18.0.qualifier" provider-name="DLR (German Aerospace Center)" license-feature="de.dlr.sc.virsat.license.feature">

<description>
Branding Feature
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.branding.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat</groupId>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.branding.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.branding.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Branding UI
Bundle-SymbolicName: de.dlr.sc.virsat.branding.ui;singleton:=true
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Bundle-Activator: de.dlr.sc.virsat.branding.ui.Activator
Bundle-Vendor: DLR (German Aerospace Center)
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.branding.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</property>
<property
name="aboutText"
value="Virtual Satellite 4 - DVLM Core&#x0A;&#x0A;Version 4.17.0&#x0A;&#x0A;© Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2020. &#x0A;&#x0A;The DLR trade mark (as the word mark DLR or as combination DLR with the DLR Logo) is a registered and protected trade mark and may not be used without DLR´s prior written permission. &#x0A;&#x0A;Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as images, photographs, videos and texts which are indicated as being under DLR´s copyright through copyright notice (i. g. © DLR 2020) are provided for use under the Terms of use as provided for on DLRs webpage www.dlr.de&#x0A;&#x0A;&#x0A;German Aerospace Center (DLR) e.V.&#x0A;Lilienthalplatz 7&#x0A;38108 Braunschweig&#x0A;Germany">
value="Virtual Satellite 4 - DVLM Core&#x0A;&#x0A;Version 4.18.0&#x0A;&#x0A;© Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2020. &#x0A;&#x0A;The DLR trade mark (as the word mark DLR or as combination DLR with the DLR Logo) is a registered and protected trade mark and may not be used without DLR´s prior written permission. &#x0A;&#x0A;Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as images, photographs, videos and texts which are indicated as being under DLR´s copyright through copyright notice (i. g. © DLR 2020) are provided for use under the Terms of use as provided for on DLRs webpage www.dlr.de&#x0A;&#x0A;&#x0A;German Aerospace Center (DLR) e.V.&#x0A;Lilienthalplatz 7&#x0A;38108 Braunschweig&#x0A;Germany">
</property>
<property
name="aboutImage"
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.branding.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
<parent>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<groupId>de.dlr.sc.virsat</groupId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
<relativePath>../maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.build.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<feature id="de.dlr.sc.virsat.build.feature" label="VirSat Core Project Builder Feature" version="4.17.0.qualifier" provider-name="DLR (German Aerospace Center)" plugin="de.dlr.sc.virsat.branding.ui" license-feature="de.dlr.sc.virsat.license.feature">
<feature id="de.dlr.sc.virsat.build.feature" label="VirSat Core Project Builder Feature" version="4.18.0.qualifier" provider-name="DLR (German Aerospace Center)" plugin="de.dlr.sc.virsat.branding.ui" license-feature="de.dlr.sc.virsat.license.feature">

<description>
VirSat Builder Feature
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.build.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat</groupId>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.build.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.build.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Project Builder Tests
Bundle-SymbolicName: de.dlr.sc.virsat.build.test
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Fragment-Host: de.dlr.sc.virsat.build
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: DLR (German Aerospace Center)
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.build.test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
<parent>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<groupId>de.dlr.sc.virsat</groupId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
<relativePath>../maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.build.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Project Builder UI
Bundle-SymbolicName: de.dlr.sc.virsat.build.ui;singleton:=true
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Bundle-Activator: de.dlr.sc.virsat.build.ui.Activator
Bundle-Vendor: DLR (German Aerospace Center)
Require-Bundle: de.dlr.sc.virsat.build;visibility:=reexport,
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.build.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
<parent>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<groupId>de.dlr.sc.virsat</groupId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
<relativePath>../maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.build/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Project Builder
Bundle-SymbolicName: de.dlr.sc.virsat.build;singleton:=true
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Bundle-Activator: de.dlr.sc.virsat.build.Activator
Bundle-Vendor: DLR (German Aerospace Center)
Require-Bundle: de.dlr.sc.virsat.model,
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
<parent>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<groupId>de.dlr.sc.virsat</groupId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
<relativePath>../maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.commons.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<feature id="de.dlr.sc.virsat.commons.feature" label="VirSat Core Commons Feature" version="4.17.0.qualifier" provider-name="DLR (German Aerospace Center)" plugin="de.dlr.sc.virsat.branding.ui" license-feature="de.dlr.sc.virsat.license.feature">
<feature id="de.dlr.sc.virsat.commons.feature" label="VirSat Core Commons Feature" version="4.18.0.qualifier" provider-name="DLR (German Aerospace Center)" plugin="de.dlr.sc.virsat.branding.ui" license-feature="de.dlr.sc.virsat.license.feature">

<description>
This feature contains common functionality which is not highly
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.commons.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat</groupId>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.commons.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.commons.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Commons Tests
Bundle-SymbolicName: de.dlr.sc.virsat.commons.test
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Fragment-Host: de.dlr.sc.virsat.commons
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: DLR (German Aerospace Center)
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.commons.test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
<parent>
<artifactId>de.dlr.sc.virsat.parent</artifactId>
<groupId>de.dlr.sc.virsat</groupId>
<version>4.17.0-SNAPSHOT</version>
<version>4.18.0-SNAPSHOT</version>
<relativePath>../maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.commons.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: VirSat Core Commons UI
Bundle-SymbolicName: de.dlr.sc.virsat.commons.ui;singleton:=true
Bundle-Version: 4.17.0.qualifier
Bundle-Version: 4.18.0.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.expressions,
Expand Down
Loading

0 comments on commit 565adc5

Please sign in to comment.