From c490926a32d2f36e12aa2cc689c2de642180b8a0 Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Thu, 13 Feb 2020 17:43:01 +0100
Subject: [PATCH] CI: Cleanup pom files & platform update

Signed-off-by: Alexander Diewald <diewald@fortiss.org>
---
 products/pom.xml                             |  4 ++--
 releng/org.fortiss.af3.configuration/pom.xml | 22 +++++++++++++++-----
 releng/org.fortiss.af3.target                |  2 +-
 tests/pom.xml                                | 17 ---------------
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/products/pom.xml b/products/pom.xml
index ca7ea89..0979727 100644
--- a/products/pom.xml
+++ b/products/pom.xml
@@ -18,9 +18,9 @@
   <!-- For fetching platform-specific artifacts -->
   <repositories>
     <repository>
-      <id>2018-12</id>
+      <id>2019-12</id>
       <layout>p2</layout>
-      <url>https://download.eclipse.org/releases/2018-12</url>
+      <url>https://download.eclipse.org/releases/2019-12</url>
     </repository>
   </repositories>
 
diff --git a/releng/org.fortiss.af3.configuration/pom.xml b/releng/org.fortiss.af3.configuration/pom.xml
index 22b46e9..7de71e4 100644
--- a/releng/org.fortiss.af3.configuration/pom.xml
+++ b/releng/org.fortiss.af3.configuration/pom.xml
@@ -80,6 +80,23 @@
         </repository>
       </repositories>
     </profile>
+    <profile>
+      <id>af3-p2-local</id>
+      <activation>
+        <property>
+          <name>!build.af3</name>
+        </property>
+      </activation>
+      <repositories>
+        <repository>
+          <!-- Place more centrally and combine with af3 profile -->
+          <id>af3-p2</id>
+          <layout>p2</layout>
+          <!-- In jenkins, the tooling update site must be copied to this location. -->
+          <url>file:${user.dir}/releng/org.fortiss.af3.update/target/repository/</url>
+        </repository>
+      </repositories>
+    </profile>
   </profiles>
 
   <build>
@@ -117,11 +134,6 @@
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.8</version>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>target-platform-configuration</artifactId>
diff --git a/releng/org.fortiss.af3.target b/releng/org.fortiss.af3.target
index 762038d..c711086 160000
--- a/releng/org.fortiss.af3.target
+++ b/releng/org.fortiss.af3.target
@@ -1 +1 @@
-Subproject commit 762038dede0e62664960c007e00c750569449e97
+Subproject commit c7110861a8e2aafc51da0583a2126af56a01ea98
diff --git a/tests/pom.xml b/tests/pom.xml
index ab6e963..39c467c 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -27,23 +27,6 @@
         <module>af3</module>
       </modules>
     </profile>
-    <profile>
-      <id>af3-p2-local</id>
-      <activation>
-        <property>
-          <name>!build.af3</name>
-        </property>
-      </activation>
-      <repositories>
-        <repository>
-          <!-- Place more centrally and combine with af3 profile -->
-          <id>af3-p2</id>
-          <layout>p2</layout>
-          <!-- In jenkins, the tooling update site must be copied to this location. -->
-          <url>file:${user.dir}/releng/org.fortiss.af3.update/target/repository/</url>
-        </repository>
-      </repositories>
-    </profile>
     <!-- For local debugging, the profiles "af3" and "tooling" can be used such that source code
          changes are immediately picked up. In the default case, the product produced by
          "mvn verify -Paf3,tooling,emf-generation" is used (esp. in Jenkins).
-- 
GitLab