--- tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java.orig	2018-04-30 14:30:10.281927855 +0100
+++ tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java	2018-04-30 14:30:58.973755768 +0100
@@ -29,7 +29,7 @@
     private Location anyLocation;
 
     public FileLockServiceImpl() {
-        anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>()),
+        anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>(), new HashMap<Throwable, Integer>()),
                 new EquinoxContainer(null), new AtomicBoolean(false));
     }
 
--- tycho-core/pom.xml.orig	2018-04-30 14:24:51.873051601 +0100
+++ tycho-core/pom.xml	2018-04-30 14:25:46.426859073 +0100
@@ -123,7 +123,7 @@
 			<artifactId>plexus-archiver</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.platform</groupId>
+			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
 		</dependency>
 		<dependency>
--- sisu-equinox/sisu-equinox-embedder/pom.xml.orig	2018-04-30 14:25:12.892977419 +0100
+++ sisu-equinox/sisu-equinox-embedder/pom.xml	2018-04-30 14:25:46.427859069 +0100
@@ -30,7 +30,7 @@
 			<artifactId>plexus-component-annotations</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.platform</groupId>
+			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
 		<dependency>
--- tycho-compiler-jdt/pom.xml.orig	2018-04-30 14:57:02.459229391 +0100
+++ tycho-compiler-jdt/pom.xml	2018-04-30 14:56:08.265420993 +0100
@@ -29,7 +29,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
+			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 		<dependency>
@@ -47,7 +47,7 @@
 			<artifactId>maven-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
+			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
 		</dependency>
 		<dependency>
--- pom.xml.orig	2018-04-30 14:24:58.019029911 +0100
+++ pom.xml	2018-04-30 14:56:08.264420997 +0100
@@ -217,22 +217,22 @@
 				<version>3.1</version>
 			</dependency>
 			<dependency>
-				<groupId>org.eclipse.platform</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>org.eclipse.osgi</artifactId>
 				<version>${equinoxVersionMaven}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.eclipse.platform</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
 				<version>${equinoxCompatVersionMaven}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.eclipse.jdt</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>org.eclipse.jdt.core</artifactId>
 				<version>${jdtVersionMaven}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.eclipse.jdt</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
 				<version>${jdtAptVersionMaven}</version>
 			</dependency>