From 27e6a2bebeb057c48a7dd2d7e30719bc5a00fe7f Mon Sep 17 00:00:00 2001
From: Daniel Schwering <daniel.schwering@faktorzehn.de>
Date: Mon, 5 Sep 2022 13:29:24 +0200
Subject: [PATCH 1/3] Fix GitHub actions

Change-Id: I21f7caf43774fb529847b410b860a5413675fb01
---
 .github/workflows/maven.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a5d747e231..14a6b786c8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -6,11 +6,7 @@ concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}
     cancel-in-progress: true
 
-on:
-  push:
-    branches: [ FIPS-8557 ]
-  pull_request:
-    branches: [ FIPS-8557 ]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -20,10 +16,10 @@ jobs:
     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', '2022-03']
+       eclipse-release: ['2020-03', '2020-06', '2020-09', '2020-12', '2021-03', '2021-06', '2021-09', '2021-12', '2022-03', '2022-06']
 
     env:
-       integration-test-release: '2019-03'
+       integration-test-release: '2020-03'
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 8

From 2b190784199ab20233f1a2ab952137f97d4a3b60 Mon Sep 17 00:00:00 2001
From: Daniel Schwering <daniel.schwering@faktorzehn.de>
Date: Mon, 5 Sep 2022 13:39:31 +0200
Subject: [PATCH 2/3] Add 2022-06 mirror

Change-Id: Ie5e4db32892731c8205aba789fa8a34b197adef0
---
 .mvn/extensions.xml | 2 +-
 settings.xml        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index cc44e4e1fe..abe0257e01 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</version>
+        <version>3.0.0-SNAPSHOT</version>
     </extension>
 </extensions>
diff --git a/settings.xml b/settings.xml
index 2269fd7caf..2217449849 100644
--- a/settings.xml
+++ b/settings.xml
@@ -109,6 +109,13 @@
             <layout>p2</layout>
             <mirrorOfLayouts>p2</mirrorOfLayouts>
         </mirror>
+        <mirror>
+            <id>faktorzehn-2022-06</id>
+            <mirrorOf>https://update.faktorzehn.org/p2repositories/2022-06</mirrorOf>
+            <url>http://download.eclipse.org/releases/2022-06</url>
+            <layout>p2</layout>
+            <mirrorOfLayouts>p2</mirrorOfLayouts>
+        </mirror>
         
         <!-- Babel -->
         <mirror>

From a3319264dbf306c21490fb9f1eef58730d4f9234 Mon Sep 17 00:00:00 2001
From: Daniel Schwering <daniel.schwering@faktorzehn.de>
Date: Mon, 5 Sep 2022 13:58:31 +0200
Subject: [PATCH 3/3] Use 8 instead of 1.8 for java version

Change-Id: Ic84c966b5ea4702529ce031f86e9e824970bba3a
---
 runtime/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 0a29ffa3fb..a1b7c6693e 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -19,7 +19,7 @@
         <maven-bundle-plugin.version>5.1.6</maven-bundle-plugin.version>
         <flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
         <!-- java and compiler options -->
-        <java.version>1.8</java.version>
+        <java.version>8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
     </properties>