Skip to content

Commit

Permalink
Merge pull request #67 from virtualsatellite/integration
Browse files Browse the repository at this point in the history
Release 4.14.0
  • Loading branch information
SaMuellerDLR authored Feb 18, 2022
2 parents d84d2b2 + c1db4d2 commit a87f4e7
Show file tree
Hide file tree
Showing 22 changed files with 180 additions and 141 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
# handed in by known users
#---------------------------------------------
- name: Verify - Authors Sanity Check
uses: virtualsatellite/ci-actions/ci-verify-authors-action@v2
uses: virtualsatellite/ci-actions/ci-verify-authors-action@v4

# -----------------------------------------------------
# Build, Assemble and Deploy Job
Expand Down Expand Up @@ -99,14 +99,14 @@ jobs:
# Perform various setup operations
# --------------------------------------------
- name: Setup - Prepare OS
uses: virtualsatellite/ci-actions/ci-setup-action@v2
uses: virtualsatellite/ci-actions/ci-setup-action@v4

# --------------------------------------------
# Development and Feature branches
# --------------------------------------------
- name: Build - Build and Deploy Decision
id: build_decision
uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
uses: virtualsatellite/ci-actions/ci-build-decision-action@v4

# --------------------------------------------
# Prepare p2 Repos
Expand All @@ -118,7 +118,7 @@ jobs:
# Development and Feature branches
# --------------------------------------------
- name: Build - Assemble
uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v2
uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v4
with:
build_job: assemble
build_profile: ${{ steps.build_decision.outputs.build_type }}
Expand All @@ -127,7 +127,7 @@ jobs:
# Deploying to github releases
# --------------------------------------------
- name: Build - Deploy GH
uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v2
uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v4
with:
build_profile: ${{ steps.build_decision.outputs.build_type }}
gh_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SaMuellerDLR <sa.mueller@dlr.de> Sascha Müller <sa.mueller@dlr.de>

PhilMFischer <philipp.fischer@dlr.de> Philipp M. Fischer <35496033+PhilMFischer@users.noreply.github.com>
PhilMFischer <philipp.fischer@dlr.de> Philipp M. Fischer <philipp.fischer@dlr.de>
PhilMFischer <philipp.fischer@dlr.de> fisc_ph <fisc_ph@SC-010165.intra.dlr.de>

TjorveKujathDLR <tjorve.kujath@dlr.de> Tjorve Kujath <tjorve.kujath@dlr.de>

Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ Virtual Satellite is based on Java / Eclipse and provides an installable feature
3. Import all projects and working-sets via the ProjectSet file in _de.dlr.sc.virsat.ide/projectSet_
6. Execute the Virtual Satellite DEV IDE build from _de.dlr.sc.virsat.ide/launchers_

## Travis CI and Releases
## Github Actions and Releases
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.

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.

Starting a Travis CI job on development or integration deploys all relevant artifacts.
Starting a Github Actions job on development or integration deploys all relevant artifacts.

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

Expand Down
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.13.0</property>
<property name="version">4.14.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
6 changes: 3 additions & 3 deletions de.dlr.sc.virsat.ide.branding.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="de.dlr.sc.virsat.ide.branding.feature"
label="VirSat Development IDE Branding and Package Feature"
version="4.13.0.qualifier"
version="4.14.0.qualifier"
provider-name="DLR (German Aerospace Center)"
plugin="de.dlr.sc.virsat.ide.branding.ui"
license-feature="de.dlr.sc.virsat.ide.license.feature">
Expand All @@ -29,8 +29,8 @@ by German Aerospace Center (DLR e.V.)
<import feature="org.eclipse.epp.mpc"/>
<import feature="org.eclipse.epp.logging.aeri.feature"/>
<import feature="org.eclipse.oomph.setup"/>
<import feature="de.dlr.sc.virsat.ide.license.feature" version="4.13.0.qualifier"/>
<import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.13.0.qualifier"/>
<import feature="de.dlr.sc.virsat.ide.license.feature" version="4.14.0.qualifier"/>
<import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.14.0.qualifier"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.ide.branding.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat.ide</groupId>
<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
<version>4.13.0-SNAPSHOT</version>
<version>4.14.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.ide.branding.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.ide.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 Development IDE based on EPP RCP/RAP Bundle
Bundle-SymbolicName: de.dlr.sc.virsat.ide.branding.ui;singleton:=true
Bundle-Version: 4.13.0.qualifier
Bundle-Version: 4.14.0.qualifier
Bundle-Vendor: DLR (German Aerospace Center)
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.platform,
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.ide.branding.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat.ide</groupId>
<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
<version>4.13.0-SNAPSHOT</version>
<version>4.14.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.ide.branding.ui</artifactId>
Expand Down
28 changes: 28 additions & 0 deletions de.dlr.sc.virsat.ide.docs.feature/docs/VirSat_IDE_ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,34 @@
VirSat IDE Release Notes
-------------------------

Release 4.14.0 (18th February 2022)
------------------------------------

New Features:
Added Concept language and generators of Virtual Satellite Core 4.14.0

Usability Updates:
Reactivated Checkstyle Feature with new repository dependency
Reactivated Yaml Editor Feature with new repository dependency
Reactivated AsciiDoc Editor Feature with new repository dependency

Fixed Bugs:


Release 4.13.0 (5th May 2021)
----------------------------------

New Features:
Added Concept language and generators of Virtual Satellite Core 4.13.0

Usability Updates:
Deactivated Checkstyle Feature since repo got shutdown on bintray
Deactivated Yaml Editor Feature since repo got shutdown on bintray
Deactivated AsciiDoc Editor Feature since repo got shutdown on bintray

Fixed Bugs:


Release 4.12.0 (31st July 2020)
----------------------------------

Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.ide.docs.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="de.dlr.sc.virsat.ide.docs.feature"
label="VirSat IDE Documents and Release Notes Feature"
version="4.13.0.qualifier"
version="4.14.0.qualifier"
provider-name="DLR (German Aerospace Center)"
plugin="de.dlr.sc.virsat.ide.branding.ui"
license-feature="de.dlr.sc.virsat.ide.license.feature">
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.ide.docs.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat.ide</groupId>
<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
<version>4.13.0-SNAPSHOT</version>
<version>4.14.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.ide.docs.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.ide.license.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="de.dlr.sc.virsat.ide.license.feature"
label="VirSat Development IDE License Feature"
version="4.13.0.qualifier"
version="4.14.0.qualifier"
provider-name="DLR (German Aerospace Center)">

<description>
Expand Down
2 changes: 1 addition & 1 deletion de.dlr.sc.virsat.ide.license.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat.ide</groupId>
<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
<version>4.13.0-SNAPSHOT</version>
<version>4.14.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.ide.license.feature</artifactId>
Expand Down
159 changes: 81 additions & 78 deletions de.dlr.sc.virsat.ide.product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<relativePath>../maven/pom.xml</relativePath>
<groupId>de.dlr.sc.virsat.ide</groupId>
<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
<version>4.13.0-SNAPSHOT</version>
<version>4.14.0-SNAPSHOT</version>
</parent>

<artifactId>de.dlr.sc.virsat.ide.product</artifactId>
Expand All @@ -30,81 +30,84 @@
<build.folder.application.p2>VirSat4_IDE</build.folder.application.p2>
<build.folder.fullpath.p2>${build.folder.target.p2}/${build.folder.application.p2}/${build.folder.type}</build.folder.fullpath.p2>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>p2</id>
<phase>install</phase>
<configuration>
<target>
<fail
message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath} !!!">
<condition>
<and>
<equals arg1="${build.deploy.release}" arg2="true" />
<available file="${build.folder.fullpath.p2}"
type="dir" />
</and>
</condition>
</fail>
<delete dir="${build.folder.fullpath.p2}" />
<copy todir="${build.folder.fullpath.p2}">
<fileset dir="./target/repository">
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>bin</id>
<phase>install</phase>
<configuration>
<target>
<fail
message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath} !!!">
<condition>
<and>
<equals arg1="${build.deploy.release}" arg2="true" />
<available file="${build.folder.fullpath}"
type="dir" />
</and>
</condition>
</fail>

<!-- ANT Script Start -->
<mkdir dir="${build.folder.fullpath}" />

<delete file="${build.file.win32.fullpath}" />
<delete file="${build.file.linux.fullpath}" />

<zip destfile="${build.file.win32.fullpath}"
basedir="./target/products/de.dlr.sc.virsat.ide.product/win32/win32/x86_64" />
<tar destfile="${build.file.linux.fullpath}"
basedir="./target/products/de.dlr.sc.virsat.ide.product/linux/gtk/x86_64"
compression="gzip"
longfile="gnu" />
<!-- ANT Script Stop -->
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>deploy</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>p2</id>
<phase>install</phase>
<configuration>
<target>
<fail
message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath} !!!">
<condition>
<and>
<equals arg1="${build.deploy.release}" arg2="true" />
<available file="${build.folder.fullpath.p2}"
type="dir" />
</and>
</condition>
</fail>
<delete dir="${build.folder.fullpath.p2}" />
<copy todir="${build.folder.fullpath.p2}">
<fileset dir="./target/repository">
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>bin</id>
<phase>install</phase>
<configuration>
<target>
<fail
message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath} !!!">
<condition>
<and>
<equals arg1="${build.deploy.release}" arg2="true" />
<available file="${build.folder.fullpath}"
type="dir" />
</and>
</condition>
</fail>

<!-- ANT Script Start -->
<mkdir dir="${build.folder.fullpath}" />

<delete file="${build.file.win32.fullpath}" />
<delete file="${build.file.linux.fullpath}" />

<zip destfile="${build.file.win32.fullpath}"
basedir="./target/products/de.dlr.sc.virsat.ide.product/win32/win32/x86_64" />
<tar destfile="${build.file.linux.fullpath}"
basedir="./target/products/de.dlr.sc.virsat.ide.product/linux/gtk/x86_64"
compression="gzip"
longfile="gnu" />
<!-- ANT Script Stop -->
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Loading

0 comments on commit a87f4e7

Please sign in to comment.