diff --git a/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch b/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch
index 8098d11..a8a028f 100644
--- a/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch
+++ b/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch
@@ -1,4 +1,4 @@
-From a09c1b1a9068d53d83b84948fb1a5b1379b01bcc Mon Sep 17 00:00:00 2001
+From fbe4e597af880a1f175c51edc3607c95a5008a69 Mon Sep 17 00:00:00 2001
 From: Roland Grunberg <rgrunber@redhat.com>
 Date: Tue, 12 Jun 2012 09:56:38 -0400
 Subject: [PATCH 1/8] Fix the Tycho build to work on Fedora.
@@ -49,5 +49,5 @@ index 9d7bcb7..5b97868 100644
  
          return verifier;
 -- 
-2.21.1
+2.28.0
 
diff --git a/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch b/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
index 80492d4..56b0531 100644
--- a/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
+++ b/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
@@ -1,4 +1,4 @@
-From 35decf21d5582e6009f88dcbbcd81b1ab8709d04 Mon Sep 17 00:00:00 2001
+From 4adb496677296e9a8e33f0358ec5551ff35c86e8 Mon Sep 17 00:00:00 2001
 From: Roland Grunberg <rgrunber@redhat.com>
 Date: Tue, 12 Jun 2012 10:38:51 -0400
 Subject: [PATCH 2/8] Implement a custom resolver for Tycho in local mode.
@@ -347,7 +347,7 @@ index 19d12c6..abe89e8 100644
  
      // convenience method for tests
 diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-index 8af9d88..b0ef41f 100644
+index 184d709..f30449c 100644
 --- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
 +++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
 @@ -77,6 +77,7 @@
@@ -601,7 +601,7 @@ index 35f1b6b..b64653e 100644
              description.addBundle(artifact.getFile());
          }
 diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml
-index f1a3b34..3f2c3d2 100644
+index 3d750ba..7bc1725 100644
 --- a/tycho-p2/tycho-p2-facade/pom.xml
 +++ b/tycho-p2/tycho-p2-facade/pom.xml
 @@ -57,6 +57,11 @@
@@ -643,5 +643,5 @@ index 47bf362..bc4a7bb 100644
              addEntireP2RepositoryToTargetPlatform(repository, tpConfiguration);
          }
 -- 
-2.21.1
+2.28.0
 
diff --git a/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch b/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
index a0482ad..a6c6c2a 100644
--- a/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
+++ b/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
@@ -1,4 +1,4 @@
-From a212725a6c4cad9d29db41b37ed6d101c2c7cb72 Mon Sep 17 00:00:00 2001
+From f0d32a7d59cab701811abcb9060ae4696e48e58e Mon Sep 17 00:00:00 2001
 From: Roland Grunberg <rgrunber@redhat.com>
 Date: Wed, 18 Jun 2014 13:01:31 -0400
 Subject: [PATCH 3/8] Tycho should always delegate artifact resolution to
@@ -116,7 +116,7 @@ index 0000000..965e5cd
 +
 +}
 diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryP2APITest.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryP2APITest.java
-index 6a03012..f898058 100644
+index 70c3809..2d55ef0 100644
 --- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryP2APITest.java
 +++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryP2APITest.java
 @@ -53,6 +53,7 @@ import org.eclipse.tycho.repository.p2base.artifact.repository.ArtifactRepositor
@@ -127,7 +127,7 @@ index 6a03012..f898058 100644
  import org.junit.After;
  import org.junit.Before;
  import org.junit.Rule;
-@@ -114,7 +115,8 @@ public class LocalArtifactRepositoryP2APITest {
+@@ -113,7 +114,8 @@ public class LocalArtifactRepositoryP2APITest {
      @Before
      public void initSubject() throws Exception {
          temporaryLocalMavenRepo.initContentFromResourceFolder(ResourceUtil.resourceFile("repositories/local"));
@@ -249,7 +249,7 @@ index ccc9f64..7f06ecd 100644
 +
  }
 diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
-index 432ec09..4e5566a 100644
+index b1b37a6..96bf7b2 100644
 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
 +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
 @@ -29,6 +29,7 @@ import org.eclipse.tycho.p2.impl.test.ResourceUtil;
@@ -270,7 +270,7 @@ index 432ec09..4e5566a 100644
          mavenRepositorySettings = new MavenRepositorySettingsStub();
          subject = new RemoteAgent(mavenContext, mavenRepositorySettings, OFFLINE);
 diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
-index ae31862..14b8f85 100644
+index 05747e6..54fd239 100644
 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
 +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
 @@ -26,6 +26,7 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
@@ -284,20 +284,20 @@ index ae31862..14b8f85 100644
 @@ -126,12 +127,12 @@ public class RemoteAgentMetadataRepositoryCacheTest {
  
      private RemoteAgent newOnlineAgent() throws Exception {
-         return new RemoteAgent(new MavenContextImpl(localMavenRepository, false, logVerifier.getLogger(),
--                new Properties()));
-+                new Properties(), new MavenRepositorySystemStub(localMavenRepository)));
+         return new RemoteAgent(
+-                new MavenContextImpl(localMavenRepository, false, logVerifier.getLogger(), new Properties()));
++                new MavenContextImpl(localMavenRepository, false, logVerifier.getLogger(), new Properties(), new MavenRepositorySystemStub(localMavenRepository)));
      }
  
      private RemoteAgent newOfflineAgent() throws Exception {
-         return new RemoteAgent(new MavenContextImpl(localMavenRepository, true, logVerifier.getLogger(),
--                new Properties()));
-+                new Properties(), new MavenRepositorySystemStub(localMavenRepository)));
+         return new RemoteAgent(
+-                new MavenContextImpl(localMavenRepository, true, logVerifier.getLogger(), new Properties()));
++                new MavenContextImpl(localMavenRepository, true, logVerifier.getLogger(), new Properties(), new MavenRepositorySystemStub(localMavenRepository)));
      }
  
      private IMetadataRepository loadHttpRepository(RemoteAgent agent) throws ProvisionException {
 diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisherTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisherTest.java
-index f4a356f..e332785 100644
+index 6283607..db90e2b 100644
 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisherTest.java
 +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisherTest.java
 @@ -32,6 +32,7 @@ import org.eclipse.tycho.p2.repository.RepositoryLayoutHelper;
@@ -674,5 +674,5 @@ index e5837e2..137dcb1 100644
      }
  
 -- 
-2.21.1
+2.28.0
 
diff --git a/0004-Bug-537963-Make-the-default-EE-Java-1.8.patch b/0004-Bug-537963-Make-the-default-EE-Java-1.8.patch
index d5faa61..f68ece8 100644
--- a/0004-Bug-537963-Make-the-default-EE-Java-1.8.patch
+++ b/0004-Bug-537963-Make-the-default-EE-Java-1.8.patch
@@ -1,4 +1,4 @@
-From 2bafd02390adb77ef65c2d706b364cf42eb598cb Mon Sep 17 00:00:00 2001
+From 2e6d9f73db9a3d8f4b4c70afb06a86cf636e3687 Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Wed, 15 Aug 2018 15:58:10 +0100
 Subject: [PATCH 4/8] Bug 537963 - Make the default EE Java 1.8
@@ -27,7 +27,7 @@ Signed-off-by: Mat Booth <mat.booth@redhat.com>
  create mode 100644 tycho-core/src/test/resources/projects/bree/tycho-default/pom.xml
 
 diff --git a/tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java b/tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java
-index a88cf1e..fb00f81 100644
+index 44654a3..1aa13a2 100644
 --- a/tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java
 +++ b/tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java
 @@ -37,7 +37,7 @@ import copied.org.apache.maven.plugin.CompilationFailureException;
@@ -179,5 +179,5 @@ index 0000000..f538f5e
 +
 +</project>
 -- 
-2.21.1
+2.28.0
 
diff --git a/0005-Fix-uncaught-exception.patch b/0005-Fix-uncaught-exception.patch
index df834ac..fc21540 100644
--- a/0005-Fix-uncaught-exception.patch
+++ b/0005-Fix-uncaught-exception.patch
@@ -1,4 +1,4 @@
-From 18bf98457aa55468fc9800eab5b4f78f95f546c9 Mon Sep 17 00:00:00 2001
+From b68bfab4c4219d28f23d5b5fc1c102efb24374e9 Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Thu, 20 Feb 2020 16:08:00 +0000
 Subject: [PATCH 5/8] Fix uncaught exception
@@ -27,5 +27,5 @@ index 9c95f2d..1f34a82 100644
              return null;
          }
 -- 
-2.21.1
+2.28.0
 
diff --git a/0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch b/0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch
new file mode 100644
index 0000000..9dc856c
--- /dev/null
+++ b/0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch
@@ -0,0 +1,80 @@
+From 5bd7c39c64bb1ab7f2d46c03071547b2828acad7 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Fri, 20 Mar 2020 02:35:02 +0000
+Subject: [PATCH 6/8] Fix dependency problems when bootstrapping with extras
+
+---
+ tycho-extras/pack200/tycho-pack200b-plugin/pom.xml |  4 ++--
+ tycho-extras/pom.xml                               | 10 +++++-----
+ tycho-extras/tycho-source-feature-plugin/pom.xml   |  2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
+index 550f3cf..1614723 100644
+--- a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
++++ b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
+@@ -36,7 +36,7 @@
+     <dependency>
+       <groupId>org.eclipse.tycho</groupId>
+       <artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
+-      <version>${tycho-version}</version>
++      <version>${project.version}</version>
+     </dependency>
+   </dependencies>
+-</project>
+\ No newline at end of file
++</project>
+diff --git a/tycho-extras/pom.xml b/tycho-extras/pom.xml
+index 0537e36..a00d8da 100644
+--- a/tycho-extras/pom.xml
++++ b/tycho-extras/pom.xml
+@@ -73,28 +73,28 @@
+ 			<dependency>
+ 				<groupId>org.eclipse.tycho</groupId>
+ 				<artifactId>tycho-core</artifactId>
+-				<version>${tycho-version}</version>
++				<version>${project.version}</version>
+ 			</dependency>
+ 			<dependency>
+ 				<groupId>org.eclipse.tycho</groupId>
+ 				<artifactId>tycho-p2-facade</artifactId>
+-				<version>${tycho-version}</version>
++				<version>${project.version}</version>
+ 			</dependency>
+ 			<dependency>
+ 				<groupId>org.eclipse.tycho</groupId>
+ 				<artifactId>org.eclipse.tycho.core.shared</artifactId>
+-				<version>${tycho-version}</version>
++				<version>${project.version}</version>
+ 			</dependency>
+ 			<dependency>
+ 				<groupId>org.eclipse.tycho</groupId>
+ 				<artifactId>tycho-testing-harness</artifactId>
+-				<version>${tycho-version}</version>
++				<version>${project.version}</version>
+ 				<scope>test</scope>
+ 			</dependency>
+ 			<dependency>
+ 				<groupId>org.eclipse.tycho</groupId>
+ 				<artifactId>sisu-equinox-launching</artifactId>
+-				<version>${tycho-version}</version>
++				<version>${project.version}</version>
+ 			</dependency>
+ 			<dependency>
+ 				<groupId>org.eclipse.tycho</groupId>
+diff --git a/tycho-extras/tycho-source-feature-plugin/pom.xml b/tycho-extras/tycho-source-feature-plugin/pom.xml
+index bf47a21..07672e0 100644
+--- a/tycho-extras/tycho-source-feature-plugin/pom.xml
++++ b/tycho-extras/tycho-source-feature-plugin/pom.xml
+@@ -42,7 +42,7 @@
+ 		<dependency>
+ 			<groupId>org.eclipse.tycho</groupId>
+ 			<artifactId>tycho-packaging-plugin</artifactId>
+-			<version>${tycho-version}</version>
++			<version>${project.version}</version>
+ 			<type>maven-plugin</type>
+ 		</dependency>
+ 
+-- 
+2.28.0
+
diff --git a/0006-Mockito-does-not-have-test-scope.patch b/0006-Mockito-does-not-have-test-scope.patch
deleted file mode 100644
index 6b2b955..0000000
--- a/0006-Mockito-does-not-have-test-scope.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From eed86a7fefb12f21a9076293dccb1a3c84e051fd Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Fri, 21 Feb 2020 10:08:13 +0000
-Subject: [PATCH 6/8] Mockito does not have test scope
-
-Change-Id: Ia0554670d27f1f05dc0d5c72f9afbbbc32e7fdbb
-Signed-off-by: Mat Booth <mat.booth@redhat.com>
----
- tycho-artifactcomparator/pom.xml             | 5 +++--
- tycho-core/pom.xml                           | 3 ++-
- tycho-extras/tycho-eclipserun-plugin/pom.xml | 5 ++++-
- tycho-extras/tycho-pomless/pom.xml           | 5 +++--
- tycho-surefire/tycho-surefire-plugin/pom.xml | 4 +++-
- 5 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
-index 9039f06..b2ee58a 100644
---- a/tycho-artifactcomparator/pom.xml
-+++ b/tycho-artifactcomparator/pom.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!--
-- - Copyright (c) 2012 Sonatype Inc. and others.
-+ - Copyright (c) 2012, 2020 Sonatype Inc. and others.
-  - All rights reserved. This program and the accompanying materials
-  - are made available under the terms of the Eclipse Public License v1.0
-  - which accompanies this distribution, and is available at
-@@ -49,6 +49,7 @@
-     <dependency>
-       <artifactId>junit</artifactId>
-       <groupId>junit</groupId>
-+      <scope>test</scope>
-     </dependency>
- 	<dependency>
- 		<groupId>org.eclipse.sisu</groupId>
-@@ -68,4 +69,4 @@
-       </plugin>
-     </plugins>
-   </build>
--</project>
-\ No newline at end of file
-+</project>
-diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
-index 9f2bf3b..bdd5a16 100644
---- a/tycho-core/pom.xml
-+++ b/tycho-core/pom.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!--
-- - Copyright (c) 2008, 2011 Sonatype Inc. and others.
-+ - Copyright (c) 2008, 2020 Sonatype Inc. and others.
-  - All rights reserved. This program and the accompanying materials
-  - are made available under the terms of the Eclipse Public License v1.0
-  - which accompanies this distribution, and is available at
-@@ -168,6 +168,7 @@
- 		<dependency>
- 			<groupId>org.mockito</groupId>
- 			<artifactId>mockito-core</artifactId>
-+			<scope>test</scope>
- 		</dependency>
- 	</dependencies>
- 
-diff --git a/tycho-extras/tycho-eclipserun-plugin/pom.xml b/tycho-extras/tycho-eclipserun-plugin/pom.xml
-index ffb886b..beedebc 100644
---- a/tycho-extras/tycho-eclipserun-plugin/pom.xml
-+++ b/tycho-extras/tycho-eclipserun-plugin/pom.xml
-@@ -1,5 +1,5 @@
- <!--
--- Copyright (c) 2011 Marc-Andre Laperle and others.
-+- Copyright (c) 2011, 2020 Marc-Andre Laperle and others.
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
-@@ -42,14 +42,17 @@
- 		<dependency>
- 			<groupId>junit</groupId>
- 			<artifactId>junit</artifactId>
-+			<scope>test</scope>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.eclipse.tycho</groupId>
- 			<artifactId>tycho-testing-harness</artifactId>
-+			<scope>test</scope>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.mockito</groupId>
- 			<artifactId>mockito-core</artifactId>
-+			<scope>test</scope>
- 		</dependency>
- 	</dependencies>
- 	<profiles>
-diff --git a/tycho-extras/tycho-pomless/pom.xml b/tycho-extras/tycho-pomless/pom.xml
-index 2584910..f2d7ffa 100644
---- a/tycho-extras/tycho-pomless/pom.xml
-+++ b/tycho-extras/tycho-pomless/pom.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!--
-- - Copyright (c) 2015 SAP SE and others.
-+ - Copyright (c) 2015, 2020 SAP SE and others.
-  - All rights reserved. This program and the accompanying materials
-  - are made available under the terms of the Eclipse Public License v1.0
-  - which accompanies this distribution, and is available at
-@@ -67,7 +67,8 @@
-     <dependency>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
-+      <scope>test</scope>
-     </dependency>
-   </dependencies>
- 
--</project>
-\ No newline at end of file
-+</project>
-diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
-index d03525a..5b2ac63 100644
---- a/tycho-surefire/tycho-surefire-plugin/pom.xml
-+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!--
-- - Copyright (c) 2008, 2011 Sonatype Inc. and others.
-+ - Copyright (c) 2008, 2020 Sonatype Inc. and others.
-  - All rights reserved. This program and the accompanying materials
-  - are made available under the terms of the Eclipse Public License v1.0
-  - which accompanies this distribution, and is available at
-@@ -162,10 +162,12 @@
- 		<dependency>
- 			<groupId>org.mockito</groupId>
- 			<artifactId>mockito-core</artifactId>
-+			<scope>test</scope>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.eclipse.tycho</groupId>
- 			<artifactId>tycho-testing-harness</artifactId>
-+			<scope>test</scope>
- 		</dependency>
- 	</dependencies>
- </project>
--- 
-2.21.1
-
diff --git a/0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch b/0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch
deleted file mode 100644
index 16df9f4..0000000
--- a/0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From bf0f458e2cd41ad24ff212014a416c788477bfc4 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Fri, 20 Mar 2020 02:35:02 +0000
-Subject: [PATCH 7/8] Fix dependency problems when bootstrapping with extras
-
----
- tycho-extras/pack200/tycho-pack200b-plugin/pom.xml |  4 ++--
- tycho-extras/pom.xml                               | 10 +++++-----
- tycho-extras/tycho-source-feature-plugin/pom.xml   |  2 +-
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
-index f305eb3..4a3150b 100644
---- a/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
-+++ b/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml
-@@ -36,7 +36,7 @@
-     <dependency>
-       <groupId>org.eclipse.tycho</groupId>
-       <artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
--      <version>${tycho-version}</version>
-+      <version>${project.version}</version>
-     </dependency>
-   </dependencies>
--</project>
-\ No newline at end of file
-+</project>
-diff --git a/tycho-extras/pom.xml b/tycho-extras/pom.xml
-index 1769197..68c2bbe 100644
---- a/tycho-extras/pom.xml
-+++ b/tycho-extras/pom.xml
-@@ -88,28 +88,28 @@
- 			<dependency>
- 				<groupId>org.eclipse.tycho</groupId>
- 				<artifactId>tycho-core</artifactId>
--				<version>${tycho-version}</version>
-+				<version>${project.version}</version>
- 			</dependency>
- 			<dependency>
- 				<groupId>org.eclipse.tycho</groupId>
- 				<artifactId>tycho-p2-facade</artifactId>
--				<version>${tycho-version}</version>
-+				<version>${project.version}</version>
- 			</dependency>
- 			<dependency>
- 				<groupId>org.eclipse.tycho</groupId>
- 				<artifactId>org.eclipse.tycho.core.shared</artifactId>
--				<version>${tycho-version}</version>
-+				<version>${project.version}</version>
- 			</dependency>
- 			<dependency>
- 				<groupId>org.eclipse.tycho</groupId>
- 				<artifactId>tycho-testing-harness</artifactId>
--				<version>${tycho-version}</version>
-+				<version>${project.version}</version>
- 				<scope>test</scope>
- 			</dependency>
- 			<dependency>
- 				<groupId>org.eclipse.tycho</groupId>
- 				<artifactId>sisu-equinox-launching</artifactId>
--				<version>${tycho-version}</version>
-+				<version>${project.version}</version>
- 			</dependency>
- 			<dependency>
- 				<groupId>org.eclipse.tycho</groupId>
-diff --git a/tycho-extras/tycho-source-feature-plugin/pom.xml b/tycho-extras/tycho-source-feature-plugin/pom.xml
-index e305460..29fa308 100644
---- a/tycho-extras/tycho-source-feature-plugin/pom.xml
-+++ b/tycho-extras/tycho-source-feature-plugin/pom.xml
-@@ -42,7 +42,7 @@
- 		<dependency>
- 			<groupId>org.eclipse.tycho</groupId>
- 			<artifactId>tycho-packaging-plugin</artifactId>
--			<version>${tycho-version}</version>
-+			<version>${project.version}</version>
- 			<type>maven-plugin</type>
- 		</dependency>
- 
--- 
-2.21.1
-
diff --git a/0007-Use-custom-resolver-for-tycho-eclipserun-plugin.patch b/0007-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
new file mode 100644
index 0000000..35f0438
--- /dev/null
+++ b/0007-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
@@ -0,0 +1,51 @@
+From 117dfa03082432d2725e160d35936164004a63b8 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Mon, 6 May 2013 14:20:58 -0400
+Subject: [PATCH 7/8] Use custom resolver for tycho-eclipserun-plugin.
+
+Add various system local OSGi bundle locations to the target platform
+used by tycho-eclipserun-plugin.
+
+Change-Id: Ifd0aae3f32c8077cd0ae33e70f40698c1129788d
+---
+ .../tycho/extras/eclipserun/EclipseRunMojo.java        | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
+index b93e651..4032d10 100644
+--- a/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
++++ b/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
+@@ -13,6 +13,7 @@ package org.eclipse.tycho.extras.eclipserun;
+ 
+ import java.io.File;
+ import java.net.MalformedURLException;
++import java.net.URI;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Map;
+@@ -52,6 +53,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver;
+ import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
+ import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub;
+ import org.eclipse.tycho.plugins.p2.extras.Repository;
++import org.fedoraproject.p2.EclipseSystemLayout;
+ 
+ /**
+  * Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is
+@@ -225,6 +227,14 @@ public class EclipseRunMojo extends AbstractMojo {
+         TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub();
+         // we want to resolve from remote repos only
+         tpConfiguration.setForceIgnoreLocalArtifacts(true);
++
++        // Add Fedora Local P2 Repository when running in local mode
++        if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
++            for (URI uri : EclipseSystemLayout.getRepositories()) {
++                tpConfiguration.addP2Repository(new MavenRepositoryLocation(uri.getPath(), uri));
++            }
++        }
++
+         for (Repository repository : repositories) {
+             tpConfiguration.addP2Repository(new MavenRepositoryLocation(repository.getId(), repository.getLocation()));
+         }
+-- 
+2.28.0
+
diff --git a/0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch b/0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch
new file mode 100644
index 0000000..f07656a
--- /dev/null
+++ b/0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch
@@ -0,0 +1,303 @@
+From 85a2495116da48f4a4328a9066a7147c9e363b70 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Wed, 11 Nov 2020 10:04:50 +0000
+Subject: [PATCH 8/8] Bug 561832 - Upgrade to [takari/polyglot-maven] Release
+ 0.4.5
+
+---
+ tycho-extras/tycho-pomless/pom.xml            |  2 +-
+ .../tycho/pomless/AbstractTychoMapping.java   |  3 ++
+ .../pomless/AbstractXMLTychoMapping.java      |  5 +--
+ .../tycho/pomless/TychoAggregatorMapping.java |  6 +--
+ .../tycho/pomless/TychoBundleMapping.java     | 40 ++++++++-----------
+ .../tycho/pomless/TychoMappingTest.java       |  5 ++-
+ .../tycho/pomless/TychoModelReaderTest.java   | 27 +++++++------
+ 7 files changed, 39 insertions(+), 49 deletions(-)
+
+diff --git a/tycho-extras/tycho-pomless/pom.xml b/tycho-extras/tycho-pomless/pom.xml
+index b1979ff..2ab14a8 100644
+--- a/tycho-extras/tycho-pomless/pom.xml
++++ b/tycho-extras/tycho-pomless/pom.xml
+@@ -47,7 +47,7 @@
+     <dependency>
+       <groupId>io.takari.polyglot</groupId>
+       <artifactId>polyglot-common</artifactId>
+-      <version>0.4.4</version>
++      <version>0.4.5</version>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.sisu</groupId>
+diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java
+index d6a9977..b80c22b 100644
+--- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java
++++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java
+@@ -114,6 +114,9 @@ public abstract class AbstractTychoMapping implements Mapping, ModelReader {
+     public Model read(File input, Map<String, ?> options) throws IOException, ModelParseException {
+         File artifactFile = getRealArtifactFile(input);
+         if (artifactFile.exists()) {
++            if (artifactFile.isDirectory()) {
++                return read(new StringReader(""), input, options);
++            }
+             try (InputStreamReader stream = new InputStreamReader(new FileInputStream(artifactFile),
+                     getPrimaryArtifactCharset())) {
+                 return read(stream, input, options);
+diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractXMLTychoMapping.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractXMLTychoMapping.java
+index 955b78a..05505d1 100644
+--- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractXMLTychoMapping.java
++++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractXMLTychoMapping.java
+@@ -85,9 +85,6 @@ public abstract class AbstractXMLTychoMapping extends AbstractTychoMapping {
+ 
+     @Override
+     public float getPriority() {
+-        //FIXME due to 
+-        // https://github.com/takari/polyglot-maven/issues/209 
+-        // we must use inverse logic and return lower values for higher priorities 
+-        return -1;
++        return 1;
+     }
+ }
+diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java
+index 8043dfe..39183d7 100644
+--- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java
++++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java
+@@ -110,11 +110,7 @@ public class TychoAggregatorMapping extends AbstractTychoMapping {
+ 
+     @Override
+     public float getPriority() {
+-        //use a lower priority here so other modules are asked first
+-        //FIXME due to 
+-        // https://github.com/takari/polyglot-maven/issues/209 
+-        // we must use inverse logic and return lower values for higher priorities 
+-        return 10f;
++        return -10f;
+     }
+ 
+ }
+diff --git a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java
+index d450750..0d7baeb 100644
+--- a/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java
++++ b/tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2019 Lablicate GmbH and others.
++ * Copyright (c) 2019, 2020 Lablicate GmbH and others.
+  * 
+  * All rights reserved. This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License v1.0
+@@ -29,30 +29,30 @@ import org.sonatype.maven.polyglot.mapping.Mapping;
+ @Component(role = Mapping.class, hint = TychoBundleMapping.PACKAGING)
+ public class TychoBundleMapping extends AbstractTychoMapping {
+ 
+-    private static final String BUNDLE_SYMBOLIC_NAME = "Bundle-SymbolicName";
+-
++    public static final String META_INF_DIRECTORY = "META-INF";
++    public static final String MANIFEST_MF = "MANIFEST.MF";
+     public static final String PACKAGING = "eclipse-plugin";
++
++    private static final String BUNDLE_SYMBOLIC_NAME = "Bundle-SymbolicName";
+     private static final String PACKAGING_TEST = "eclipse-test-plugin";
+-    private static final String MANIFEST_MF = "META-INF/MANIFEST.MF";
+-    public static final String MANIFEST_MF_MARKER = ".META-INF_MANIFEST.MF";
+ 
+     @Override
+     protected boolean isValidLocation(String location) {
+-        return location.endsWith(MANIFEST_MF_MARKER);
++        File polyglotArtifactFile = new File(location);
++        if (polyglotArtifactFile.isDirectory() && polyglotArtifactFile.getName().equals(META_INF_DIRECTORY)) {
++            return new File(polyglotArtifactFile, MANIFEST_MF).exists();
++        }
++        return false;
+     }
+ 
+     @Override
+     protected File getPrimaryArtifact(File dir) {
+-        File manifestFile = new File(dir, MANIFEST_MF);
+-        if (manifestFile.isFile()) {
+-            File markerFile = new File(dir, MANIFEST_MF_MARKER);
+-            try {
+-                markerFile.createNewFile();
+-            } catch (IOException e) {
+-                throw new RuntimeException("can't create markerfile", e);
++        File metaInfDirectory = new File(dir, META_INF_DIRECTORY);
++        if (metaInfDirectory.isDirectory()) {
++            File manifestFile = new File(metaInfDirectory, MANIFEST_MF);
++            if (manifestFile.isFile()) {
++                return metaInfDirectory;
+             }
+-            markerFile.deleteOnExit();
+-            return markerFile;
+         }
+         return null;
+     }
+@@ -66,7 +66,7 @@ public class TychoBundleMapping extends AbstractTychoMapping {
+     protected void initModel(Model model, Reader artifactReader, File artifactFile)
+             throws ModelParseException, IOException {
+         File bundleRoot = artifactFile.getParentFile();
+-        File manifestFile = new File(bundleRoot, MANIFEST_MF);
++        File manifestFile = new File(artifactFile, MANIFEST_MF);
+         Attributes manifestHeaders = readManifestHeaders(manifestFile);
+         String bundleSymbolicName = getBundleSymbolicName(manifestHeaders, manifestFile);
+         // groupId is inherited from parent pom
+@@ -94,14 +94,6 @@ public class TychoBundleMapping extends AbstractTychoMapping {
+         }
+     }
+ 
+-    @Override
+-    protected File getRealArtifactFile(File polyglotArtifactFile) {
+-        if (polyglotArtifactFile.getName().equals(MANIFEST_MF_MARKER)) {
+-            return new File(polyglotArtifactFile.getParentFile(), MANIFEST_MF);
+-        }
+-        return super.getRealArtifactFile(polyglotArtifactFile);
+-    }
+-
+     private Attributes readManifestHeaders(File manifestFile) throws IOException {
+         Manifest manifest = new Manifest();
+         try (FileInputStream stream = new FileInputStream(manifestFile)) {
+diff --git a/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoMappingTest.java b/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoMappingTest.java
+index 910150c..641cec3 100644
+--- a/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoMappingTest.java
++++ b/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoMappingTest.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2015 SAP SE and others.
++ * Copyright (c) 2015, 2020 SAP SE and others.
+  * All rights reserved. This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License v1.0
+  * which accompanies this distribution, and is available at
+@@ -7,6 +7,7 @@
+  *
+  * Contributors:
+  *    SAP SE - initial API and implementation
++ *    Christoph Läubrich - adjust to changed API
+  *******************************************************************************/
+ package org.eclipse.tycho.pomless;
+ 
+@@ -27,7 +28,7 @@ public class TychoMappingTest extends PlexusTestCase {
+     public void testLocateBuildProperties() throws Exception {
+         File pom = polyglotModelManager.locatePom(new File(getMappingTestDir(), "simple"));
+         assertNotNull(pom);
+-        assertEquals(TychoBundleMapping.MANIFEST_MF_MARKER, pom.getName());
++        assertEquals(TychoBundleMapping.META_INF_DIRECTORY, pom.getName());
+     }
+ 
+     public void testPriority() throws Exception {
+diff --git a/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java b/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java
+index 134987f..67ba7c2 100644
+--- a/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java
++++ b/tycho-extras/tycho-pomless/src/test/java/org/eclipse/tycho/pomless/TychoModelReaderTest.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2015, 2019 SAP SE and others.
++ * Copyright (c) 2015, 2020 SAP SE and others.
+  * All rights reserved. This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License v1.0
+  * which accompanies this distribution, and is available at
+@@ -7,6 +7,7 @@
+  *
+  * Contributors:
+  *    SAP SE - initial API and implementation
++ *    Christoph Läubrich - adjust to API
+  *******************************************************************************/
+ package org.eclipse.tycho.pomless;
+ 
+@@ -36,7 +37,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
+ 
+     @Test
+     public void testReadBundle() throws Exception {
+-        File buildProperties = new File(getPolyglotTestDir(), "bundle1/" + TychoBundleMapping.MANIFEST_MF_MARKER);
++        File buildProperties = new File(getPolyglotTestDir(), "bundle1/" + TychoBundleMapping.META_INF_DIRECTORY);
+         Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
+                 createReaderOptions(buildProperties));
+         assertEquals("4.0.0", model.getModelVersion());
+@@ -45,12 +46,12 @@ public class TychoModelReaderTest extends PlexusTestCase {
+         assertEquals("0.1.0-SNAPSHOT", model.getVersion());
+         assertEquals("eclipse-plugin", model.getPackaging());
+         assertParent(model.getParent());
+-        assertLocation("bundle1/META-INF/MANIFEST.MF", model.getLocation(""));
++        assertLocation("bundle1/META-INF", model.getLocation(""));
+     }
+ 
+     @Test
+     public void testReadBundle2() throws Exception {
+-        File buildProperties = new File(getPolyglotTestDir(), "bundle2/" + TychoBundleMapping.MANIFEST_MF_MARKER);
++        File buildProperties = new File(getPolyglotTestDir(), "bundle2/" + TychoBundleMapping.META_INF_DIRECTORY);
+         Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
+                 createReaderOptions(buildProperties));
+         assertEquals("4.0.0", model.getModelVersion());
+@@ -59,12 +60,12 @@ public class TychoModelReaderTest extends PlexusTestCase {
+         assertEquals("0.1.0-SNAPSHOT", model.getVersion());
+         assertEquals("eclipse-plugin", model.getPackaging());
+         assertParent(model.getParent());
+-        assertLocation("bundle2/META-INF/MANIFEST.MF", model.getLocation(""));
++        assertLocation("bundle2/META-INF", model.getLocation(""));
+     }
+ 
+     @Test
+     public void testReadBundle3() throws Exception {
+-        File buildProperties = new File(getPolyglotTestDir(), "bundle3/" + TychoBundleMapping.MANIFEST_MF_MARKER);
++        File buildProperties = new File(getPolyglotTestDir(), "bundle3/" + TychoBundleMapping.META_INF_DIRECTORY);
+         Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
+                 createReaderOptions(buildProperties));
+         assertEquals("4.0.0", model.getModelVersion());
+@@ -73,19 +74,19 @@ public class TychoModelReaderTest extends PlexusTestCase {
+         assertEquals("0.1.0-SNAPSHOT", model.getVersion());
+         assertEquals("eclipse-plugin", model.getPackaging());
+         assertParent(model.getParent());
+-        assertLocation("bundle3/META-INF/MANIFEST.MF", model.getLocation(""));
++        assertLocation("bundle3/META-INF", model.getLocation(""));
+     }
+ 
+     @Test
+     public void testReadTestBundle() throws Exception {
+-        File buildProperties = new File(getPolyglotTestDir(), "bundle1.tests/" + TychoBundleMapping.MANIFEST_MF_MARKER);
++        File buildProperties = new File(getPolyglotTestDir(), "bundle1.tests/" + TychoBundleMapping.META_INF_DIRECTORY);
+         Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
+                 createReaderOptions(buildProperties));
+         assertEquals("pomless.bundle.tests", model.getArtifactId());
+         assertEquals("1.0.1", model.getVersion());
+         assertEquals("eclipse-test-plugin", model.getPackaging());
+         assertParent(model.getParent());
+-        assertLocation("bundle1.tests/META-INF/MANIFEST.MF", model.getLocation(""));
++        assertLocation("bundle1.tests/META-INF", model.getLocation(""));
+     }
+ 
+     @Test
+@@ -158,7 +159,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
+     @Test
+     public void testBundleWithoutSymbolicName() throws Exception {
+         File buildProperties = new File(getTestResourcesDir(),
+-                "modelreader/plugins/missingBsn/" + TychoBundleMapping.MANIFEST_MF_MARKER);
++                "modelreader/plugins/missingBsn/" + TychoBundleMapping.META_INF_DIRECTORY);
+         try {
+             getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
+                     createReaderOptions(buildProperties));
+@@ -171,7 +172,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
+     @Test
+     public void testBundleWithoutVersion() throws Exception {
+         File buildProperties = new File(getTestResourcesDir(),
+-                "modelreader/plugins/missingVersion/" + TychoBundleMapping.MANIFEST_MF_MARKER);
++                "modelreader/plugins/missingVersion/" + TychoBundleMapping.META_INF_DIRECTORY);
+         try {
+             getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
+                     createReaderOptions(buildProperties));
+@@ -184,7 +185,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
+     @Test
+     public void testNoParent() throws Exception {
+         File buildProperties = new File(getTestResourcesDir(),
+-                "modelreader/noParent/bundle/" + TychoBundleMapping.MANIFEST_MF_MARKER);
++                "modelreader/noParent/bundle/" + TychoBundleMapping.META_INF_DIRECTORY);
+         FileNotFoundException e = assertThrows(FileNotFoundException.class,
+                 () -> getTychoModelReader(TychoBundleMapping.PACKAGING).read(buildProperties,
+                         createReaderOptions(buildProperties)));
+@@ -194,7 +195,7 @@ public class TychoModelReaderTest extends PlexusTestCase {
+     @Test
+     public void testFindParent() throws Exception {
+         File location = new File(getTestResourcesDir(),
+-                "modelreader/grandparentInheritance/bundle/" + TychoBundleMapping.MANIFEST_MF_MARKER);
++                "modelreader/grandparentInheritance/bundle/" + TychoBundleMapping.META_INF_DIRECTORY);
+         Model model = getTychoModelReader(TychoBundleMapping.PACKAGING).read(location, createReaderOptions(location));
+         assertNotNull(model);
+         Parent parentReference = model.getParent();
+-- 
+2.28.0
+
diff --git a/0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch b/0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
deleted file mode 100644
index c58f9ce..0000000
--- a/0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a19db9367faa7e88cb243b78c3a4a17069c6ea52 Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber@redhat.com>
-Date: Mon, 6 May 2013 14:20:58 -0400
-Subject: [PATCH 8/8] Use custom resolver for tycho-eclipserun-plugin.
-
-Add various system local OSGi bundle locations to the target platform
-used by tycho-eclipserun-plugin.
-
-Change-Id: Ifd0aae3f32c8077cd0ae33e70f40698c1129788d
----
- .../tycho/extras/eclipserun/EclipseRunMojo.java        | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
-index b93e651..4032d10 100644
---- a/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
-+++ b/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
-@@ -13,6 +13,7 @@ package org.eclipse.tycho.extras.eclipserun;
- 
- import java.io.File;
- import java.net.MalformedURLException;
-+import java.net.URI;
- import java.util.ArrayList;
- import java.util.List;
- import java.util.Map;
-@@ -52,6 +53,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver;
- import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
- import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub;
- import org.eclipse.tycho.plugins.p2.extras.Repository;
-+import org.fedoraproject.p2.EclipseSystemLayout;
- 
- /**
-  * Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is
-@@ -225,6 +227,14 @@ public class EclipseRunMojo extends AbstractMojo {
-         TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub();
-         // we want to resolve from remote repos only
-         tpConfiguration.setForceIgnoreLocalArtifacts(true);
-+
-+        // Add Fedora Local P2 Repository when running in local mode
-+        if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
-+            for (URI uri : EclipseSystemLayout.getRepositories()) {
-+                tpConfiguration.addP2Repository(new MavenRepositoryLocation(uri.getPath(), uri));
-+            }
-+        }
-+
-         for (Repository repository : repositories) {
-             tpConfiguration.addP2Repository(new MavenRepositoryLocation(repository.getId(), repository.getLocation()));
-         }
--- 
-2.21.1
-
diff --git a/tycho.spec b/tycho.spec
index a65445c..182fa44 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -27,8 +27,8 @@
 %define __requires_exclude osgi*
 
 Name:           tycho
-Version:        1.6.0
-Release:        6%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 # license file is missing but all files having some licensing information are ASL 2.0
@@ -61,15 +61,15 @@ Source10:       eclipse-bootstrap-2019-12.tar.xz
 Patch0:         0001-Fix-the-Tycho-build-to-work-on-Fedora.patch
 Patch1:         0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
 Patch2:         0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
-Patch7:         0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
+Patch6:         0007-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
 # Submitted upstream: https://bugs.eclipse.org/bugs/show_bug.cgi?id=537963
 Patch3:         0004-Bug-537963-Make-the-default-EE-Java-1.8.patch
 # Fix compile error with uncaught exception
 Patch4:         0005-Fix-uncaught-exception.patch
-# Fix mis-scoped test deps, see: ebz#560394
-Patch5:         0006-Mockito-does-not-have-test-scope.patch
 # Fix incorrect generated requires
-Patch6:         0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch
+Patch5:         0006-Fix-dependency-problems-when-bootstrapping-with-extr.patch
+# Updated polyglot
+Patch7:         0008-Bug-561832-Upgrade-to-takari-polyglot-maven-Release-.patch
 
 # Upstream Eclipse no longer supports non-64bit arches
 ExcludeArch: s390 %{arm} %{ix86}
@@ -208,7 +208,13 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
 
 %if %{without junit5}
 %pom_disable_module org.eclipse.tycho.surefire.junit5 tycho-surefire
+%pom_disable_module org.eclipse.tycho.surefire.junit54 tycho-surefire
+%pom_disable_module org.eclipse.tycho.surefire.junit55 tycho-surefire
+%pom_disable_module org.eclipse.tycho.surefire.junit56 tycho-surefire
 %pom_remove_dep ":org.eclipse.tycho.surefire.junit5" tycho-surefire/tycho-surefire-plugin
+%pom_remove_dep ":org.eclipse.tycho.surefire.junit54" tycho-surefire/tycho-surefire-plugin
+%pom_remove_dep ":org.eclipse.tycho.surefire.junit55" tycho-surefire/tycho-surefire-plugin
+%pom_remove_dep ":org.eclipse.tycho.surefire.junit56" tycho-surefire/tycho-surefire-plugin
 %endif
 
 # Move from org.sonatype.aether to org.eclipse.aether
@@ -422,6 +428,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Nov 11 2020 Mat Booth <mat.booth@redhat.com> - 1.7.0-1
+- Interrim update to tycho version
+
 * Tue Aug 18 2020 Mat Booth <mat.booth@redhat.com> - 1.6.0-6
 - Fix bootstrap mode against Java 11