From ea2005dbdcbcc5c3196a813ab6fce6eedbaf9a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <christoph@laeubi-soft.de>
Date: Sat, 5 Mar 2022 06:40:54 +0100
Subject: [PATCH] Issue #12 enable a matrix job builds Issue #9 use a common
 base target for thirdparty

---
 .github/workflows/maven.yml                   |   7 +-
 .mvn/extensions.xml                           |   2 +-
 .../targets/2019-03/eclipse-2019-03.target    | 268 +----------------
 .../targets/2019-06/eclipse-2019-06.target    |   5 +-
 .../targets/2019-09/eclipse-2019-09.target    |   5 +-
 .../targets/2019-12/eclipse-2019-12.target    |   5 +-
 .../targets/2020-03/eclipse-2020-03.target    |   5 +-
 .../targets/2020-06/eclipse-2020-06.target    |   5 +-
 .../targets/2020-09/eclipse-2020-09.target    |   5 +-
 .../targets/2020-12/eclipse-2020-12.target    |   5 +-
 .../targets/2021-03/eclipse-2021-03.target    |   5 +-
 .../targets/2021-06/eclipse-2021-06.target    |   5 +-
 .../targets/2021-09/eclipse-2021-09.target    |   5 +-
 .../targets/2021-12/eclipse-2021-12.target    |   5 +-
 .../targets/thirdparty.target                 | 273 ++++++++++++++++++
 settings.xml                                  | 158 +++++++++-
 16 files changed, 447 insertions(+), 316 deletions(-)
 create mode 100644 org.faktorips.aggregator/targets/thirdparty.target

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 43f6392e9a..80fc1df3fa 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -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
@@ -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 }}
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 28ff4add4c..cc44e4e1fe 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -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>
diff --git a/org.faktorips.aggregator/targets/2019-03/eclipse-2019-03.target b/org.faktorips.aggregator/targets/2019-03/eclipse-2019-03.target
index 9f6e9e898e..82d3fea36a 100644
--- a/org.faktorips.aggregator/targets/2019-03/eclipse-2019-03.target
+++ b/org.faktorips.aggregator/targets/2019-03/eclipse-2019-03.target
@@ -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>
diff --git a/org.faktorips.aggregator/targets/2019-06/eclipse-2019-06.target b/org.faktorips.aggregator/targets/2019-06/eclipse-2019-06.target
index 1b9a771714..29f8b79a56 100644
--- a/org.faktorips.aggregator/targets/2019-06/eclipse-2019-06.target
+++ b/org.faktorips.aggregator/targets/2019-06/eclipse-2019-06.target
@@ -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"/>
diff --git a/org.faktorips.aggregator/targets/2019-09/eclipse-2019-09.target b/org.faktorips.aggregator/targets/2019-09/eclipse-2019-09.target
index 701a7e2ecf..c5e00f89e6 100644
--- a/org.faktorips.aggregator/targets/2019-09/eclipse-2019-09.target
+++ b/org.faktorips.aggregator/targets/2019-09/eclipse-2019-09.target
@@ -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"/>
diff --git a/org.faktorips.aggregator/targets/2019-12/eclipse-2019-12.target b/org.faktorips.aggregator/targets/2019-12/eclipse-2019-12.target
index 7ecde1bc83..61d3cb0792 100644
--- a/org.faktorips.aggregator/targets/2019-12/eclipse-2019-12.target
+++ b/org.faktorips.aggregator/targets/2019-12/eclipse-2019-12.target
@@ -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"/>
diff --git a/org.faktorips.aggregator/targets/2020-03/eclipse-2020-03.target b/org.faktorips.aggregator/targets/2020-03/eclipse-2020-03.target
index 760c908208..3f85f8d612 100644
--- a/org.faktorips.aggregator/targets/2020-03/eclipse-2020-03.target
+++ b/org.faktorips.aggregator/targets/2020-03/eclipse-2020-03.target
@@ -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"/>
diff --git a/org.faktorips.aggregator/targets/2020-06/eclipse-2020-06.target b/org.faktorips.aggregator/targets/2020-06/eclipse-2020-06.target
index f056882169..3e3303e7aa 100644
--- a/org.faktorips.aggregator/targets/2020-06/eclipse-2020-06.target
+++ b/org.faktorips.aggregator/targets/2020-06/eclipse-2020-06.target
@@ -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"/>
diff --git a/org.faktorips.aggregator/targets/2020-09/eclipse-2020-09.target b/org.faktorips.aggregator/targets/2020-09/eclipse-2020-09.target
index 3249b14df4..708a4a2f63 100644
--- a/org.faktorips.aggregator/targets/2020-09/eclipse-2020-09.target
+++ b/org.faktorips.aggregator/targets/2020-09/eclipse-2020-09.target
@@ -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"/>
diff --git a/org.faktorips.aggregator/targets/2020-12/eclipse-2020-12.target b/org.faktorips.aggregator/targets/2020-12/eclipse-2020-12.target
index 4e4cc06312..1639889d67 100644
--- a/org.faktorips.aggregator/targets/2020-12/eclipse-2020-12.target
+++ b/org.faktorips.aggregator/targets/2020-12/eclipse-2020-12.target
@@ -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"/>
diff --git a/org.faktorips.aggregator/targets/2021-03/eclipse-2021-03.target b/org.faktorips.aggregator/targets/2021-03/eclipse-2021-03.target
index 0b9da9708c..7153aebc9a 100644
--- a/org.faktorips.aggregator/targets/2021-03/eclipse-2021-03.target
+++ b/org.faktorips.aggregator/targets/2021-03/eclipse-2021-03.target
@@ -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"/>
diff --git a/org.faktorips.aggregator/targets/2021-06/eclipse-2021-06.target b/org.faktorips.aggregator/targets/2021-06/eclipse-2021-06.target
index a707e5c2e2..e043fe3775 100644
--- a/org.faktorips.aggregator/targets/2021-06/eclipse-2021-06.target
+++ b/org.faktorips.aggregator/targets/2021-06/eclipse-2021-06.target
@@ -60,10 +60,7 @@
       <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
       <repository location="https://update.faktorzehn.org/p2repositories/2021-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_technology.egit_de.feature.group" version="0.0.0"/>
diff --git a/org.faktorips.aggregator/targets/2021-09/eclipse-2021-09.target b/org.faktorips.aggregator/targets/2021-09/eclipse-2021-09.target
index a08559400a..53d372b9bf 100644
--- a/org.faktorips.aggregator/targets/2021-09/eclipse-2021-09.target
+++ b/org.faktorips.aggregator/targets/2021-09/eclipse-2021-09.target
@@ -60,10 +60,7 @@
       <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
       <repository location="https://update.faktorzehn.org/p2repositories/2021-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"/>
diff --git a/org.faktorips.aggregator/targets/2021-12/eclipse-2021-12.target b/org.faktorips.aggregator/targets/2021-12/eclipse-2021-12.target
index 0e8718d860..21344055b3 100644
--- a/org.faktorips.aggregator/targets/2021-12/eclipse-2021-12.target
+++ b/org.faktorips.aggregator/targets/2021-12/eclipse-2021-12.target
@@ -60,10 +60,7 @@
       <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
       <repository location="https://update.faktorzehn.org/p2repositories/2021-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"/>
diff --git a/org.faktorips.aggregator/targets/thirdparty.target b/org.faktorips.aggregator/targets/thirdparty.target
new file mode 100644
index 0000000000..129ca428c3
--- /dev/null
+++ b/org.faktorips.aggregator/targets/thirdparty.target
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="thirdparty">
+	<locations>
+		<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>
+	</locations>
+</target>
\ No newline at end of file
diff --git a/settings.xml b/settings.xml
index a6cd04a56c..cded343dd7 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,5 +1,23 @@
 <settings>
     <mirrors>
+    
+        <!-- Egit -->
+        <mirror>
+            <id>faktorzehn-egit-5.3</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/egit/updates-5.3</mirrorOf>
+            <url>https://archive.eclipse.org/egit/updates-5.3</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-egit-5.4</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/egit/updates-5.4</mirrorOf>
+            <url>https://archive.eclipse.org/egit/updates-5.4</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        
+        <!-- SDK -->
         <mirror>
             <id>faktorzehn-2019-03</id>
             <mirrorOf>https://update.faktorzehn.org/p2repositories/2019-03</mirrorOf>
@@ -8,13 +26,84 @@
             <mirrorOfLayouts>p2</mirrorOfLayouts>
         </mirror>
         <mirror>
-            <id>faktorzehn-egit-5.3</id>
-            <mirrorOf>https://update.faktorzehn.org/p2repositories/egit/updates-5.3</mirrorOf>
-            <url>https://archive.eclipse.org/egit/updates-5.3</url>
+            <id>faktorzehn-2019-06</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2019-06</mirrorOf>
+            <url>http://download.eclipse.org/releases/2019-06</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2019-09</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2019-09</mirrorOf>
+            <url>http://download.eclipse.org/releases/2019-09</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2019-12</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2019-12</mirrorOf>
+            <url>http://download.eclipse.org/releases/2019-09</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2020-03</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2020-03</mirrorOf>
+            <url>http://download.eclipse.org/releases/2020-03</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2020-06</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2020-06</mirrorOf>
+            <url>http://download.eclipse.org/releases/2020-06</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2020-09</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2020-09</mirrorOf>
+            <url>http://download.eclipse.org/releases/2020-09</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2020-12</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2020-12</mirrorOf>
+            <url>http://download.eclipse.org/releases/2020-12</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2021-03</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2021-03</mirrorOf>
+            <url>http://download.eclipse.org/releases/2021-03</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2021-06</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2021-06</mirrorOf>
+            <url>http://download.eclipse.org/releases/2021-06</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2021-09</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2021-09</mirrorOf>
+            <url>http://download.eclipse.org/releases/2021-09</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-2021-12</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2021-12</mirrorOf>
+            <url>http://download.eclipse.org/releases/2021-12</url>
             <layout>p2</layout>
             <mirrorOfLayouts>p2</mirrorOfLayouts>
         </mirror>
         
+        <!-- Babel -->
         <mirror>
             <id>faktorzehn-babel-2018-12</id>
             <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2018-12</mirrorOf>
@@ -22,6 +111,69 @@
             <layout>p2</layout>
             <mirrorOfLayouts>p2</mirrorOfLayouts>
         </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2019-06</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2019-06</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.17.0/2019-06/</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2019-12</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2019-12</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.17.1/2019-12</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2020-06</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2020-06</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.18.0/2020-06</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2020-09</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2020-09</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.18.1/2020-09</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2020-12</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2020-12</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.18.2/2020-12</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2021-03</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2021-03</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.18.3/2021-03</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2021-06</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2021-06</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.19.0/2021-06</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2021-09</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2021-09</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.19.1/2021-09</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
+        <mirror>
+            <id>faktorzehn-babel-2021-12</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/babel/2021-12</mirrorOf>
+            <url>https://archive.eclipse.org/technology/babel/update-site/R0.19.2/2021-12/</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
     </mirrors>
 
     <profiles>