Skip to content

Commit

Permalink
Issue faktorips#12 enable a matrix job builds
Browse files Browse the repository at this point in the history 
Issue faktorips#9 use a common base target for thirdparty
  • Loading branch information
Christoph Läubrich committed Mar 5, 2022
1 parent bfe2331 commit ea2005d
Show file tree
Hide file tree
Showing 16 changed files with 447 additions and 316 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ jobs:

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
eclipse-release: ['2019-03', '2019-06', '2019-09', '2019-12', '2020-03', '2020-06', '2020-09', '2020-12', '2021-03', '2021-06', '2021-09', '2021-12']

steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
Expand All @@ -30,4 +35,4 @@ jobs:
- name: build config
run: mvn -B install --settings settings.xml --file org.faktorips.codequality.config/pom.xml
- name: Build with Maven
run: mvn -B package --settings settings.xml --file pom.xml -T1C
run: mvn -B package --settings settings.xml --file pom.xml -T1C -Dtarget-platform=eclipse-${{ matrix.eclipse-release }}
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.0</version>
</extension>
</extensions>
268 changes: 1 addition & 267 deletions org.faktorips.aggregator/targets/2019-03/eclipse-2019-03.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,273 +53,7 @@
<unit id="org.eclipse.babel.nls_technology.jgit_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_tools.gef_de.feature.group" version="0.0.0"/>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Maven Library Bundles" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.2.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>3.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
<version>1.2.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>3.0.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-tools</artifactId>
<version>3.0.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-jxc</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>1.2.15</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.4.0-b180830.0359</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
<version>1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
<version>1.7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<version>1.8</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>1.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>2.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.2</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Wrapped Mapen Dependecies" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>com.sun.xml.bind.external</groupId>
<artifactId>relaxng-datatype</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind.external</groupId>
<artifactId>rngom</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.dtd-parser</groupId>
<artifactId>dtd-parser</artifactId>
<version>1.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>codemodel</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>xsom</artifactId>
<version>2.4.0-b180830.0438</version>
<type>jar</type>
</dependency>
</dependencies>
<instructions><![CDATA[
Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: ${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
DynamicImport-Package: *
]]></instructions>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Fix Hamcrest" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<type>jar</type>
</dependency>
</dependencies>
<instructions><![CDATA[
Bundle-Name: hamcrest-core derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion} without split-packages
Bundle-SymbolicName: org.hamcrest.core
Export-Package: org.hamcrest;version="1.3.0",org.hamcrest.core;version="1.3.0",org.hamcrest.internal;version="1.3.0";x-internal:=true
Bundle-Version: 1.3.0.zz-NO-SPLIT_PCK-v201303031735
]]></instructions>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<launcherArgs>
Expand Down
5 changes: 1 addition & 4 deletions org.faktorips.aggregator/targets/2019-06/eclipse-2019-06.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2019-06/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://update.faktorzehn.org/p2repositories/babel/2019-06"/>
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
Expand Down
5 changes: 1 addition & 4 deletions org.faktorips.aggregator/targets/2019-09/eclipse-2019-09.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2019-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
Expand Down
5 changes: 1 addition & 4 deletions org.faktorips.aggregator/targets/2019-12/eclipse-2019-12.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2019-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
Expand Down
5 changes: 1 addition & 4 deletions org.faktorips.aggregator/targets/2020-03/eclipse-2020-03.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2020-03/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
Expand Down
5 changes: 1 addition & 4 deletions org.faktorips.aggregator/targets/2020-06/eclipse-2020-06.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2020-06/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
Expand Down
5 changes: 1 addition & 4 deletions org.faktorips.aggregator/targets/2020-09/eclipse-2020-09.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2020-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
Expand Down
5 changes: 1 addition & 4 deletions org.faktorips.aggregator/targets/2020-12/eclipse-2020-12.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2020-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
Expand Down
5 changes: 1 addition & 4 deletions org.faktorips.aggregator/targets/2021-03/eclipse-2021-03.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<repository location="https://update.faktorzehn.org/p2repositories/2021-03/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="de.faktorzehn.thirdparty.libs.feature.group" version="0.0.0"/>
<repository location="https://drone.faktorzehn.de/p2/thirdparty-1.7"/>
</location>
<location uri="file:${project_loc:targets}/thirdparty.target" type="Target"></location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_modeling.emf_de.feature.group" version="0.0.0"/>
Expand Down
Loading

0 comments on commit ea2005d

Please sign in to comment.