Merged update from upstream sources

This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/tycho.git#15edd47bbba0d2b7739884e73cfbdc5636e177f9
2021-01-08 14:40:12 +01:00 · 2021-01-08 14:40:12 +01:00 · bbd0e0c568
parent b15cc78371
commit bbd0e0c568
15 changed files with 3305 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,17 @@
+/maven-repo.tar.bz2
+/org.eclipse.tycho-*
+/tycho-*.xz
+/tycho-*.bz2
+/tycho-*.gz
+/tycho-*/
+maven-repo.tar.xz
+*.src.rpm
+/noarch
+/.project
+/fedoraproject-p2-*.tar.xz
+/fedoraproject-p2-*.tar.gz
+/eclipse-bootstrap-neon.tar.xz
+/eclipse-bootstrap-oxygen.tar.xz
+/eclipse-bootstrap-photon.tar.xz
+/eclipse-bootstrap-2019-12.tar.xz
+/eclipse-bootstrap-2020-09.tar.xz
--- a/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch
+++ b/0001-Fix-the-Tycho-build-to-work-on-Fedora.patch
@ -0,0 +1,53 @@
+From 7c8407e05ff8426af7a2b67d4101c9872b429d6f 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/7] Fix the Tycho build to work on Fedora.
+
+Minor fixes of limited scope needed to have Tycho building on Fedora.
+
+Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
+---
+ .../core/maven/TychoMavenLifecycleParticipant.java    |  4 +++-
+ .../tycho/test/AbstractTychoIntegrationTest.java      | 11 +++++------
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+index 3cba4662..f7337742 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+@@ -102,7 +102,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+     }
+ 
+     private void validate(List<MavenProject> projects) throws MavenExecutionException {
+-        validateConsistentTychoVersion(projects);
+        if (System.getProperty("tycho.enableVersionCheck") != null) {
+            validateConsistentTychoVersion(projects);
+        }
+         validateUniqueBaseDirs(projects);
+     }
+ 
+diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
+index 5b8a92d5..200030e8 100644
+--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
+@@ -113,12 +113,11 @@ public abstract class AbstractTychoIntegrationTest {
+             verifier.getCliOptions().add(customOptions);
+         }
+ 
+-        if (System.getProperty(SYSPROP_STATELOCATION) != null) {
+-            verifier.setForkJvm(false);
+-            String m2eresolver = System.getProperty("tychodev-maven.ext.class.path"); // XXX
+-            if (m2eresolver != null) {
+-                verifier.addCliOption("-Dmaven.ext.class.path=" + m2eresolver);
+-            }
+        String m2eState = System.getProperty("m2eclipse.workspace.state");
+        String m2eResolver = System.getProperty("m2eclipse.workspace.resolver");
+
+        if (m2eState != null && m2eResolver != null) {
+            verifier.getVerifierProperties().put("m2eclipse.workspace.state", m2eState);
+         }
+ 
+         return verifier;
+-- 
+2.28.0
+
--- a/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
+++ b/0002-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
@ -0,0 +1,704 @@
+From a179fbb73edb21d245fb183ce2cfb9e938699125 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/7] Implement a custom resolver for Tycho in local mode.
+
+When running in local mode, dependencies should be resolved by looking
+on the local system. Remote repositories should be ignored unless
+offline mode is disabled.
+
+Use fedoraproject-p2 to resolve bundles from their system location.
+
+Relax constraints for bundles used in Tycho's Equinox runtime.
+
+Since Fedora 17, we need an Execution Environment of at least JavaSE-1.6
+for Eclipse bundles. Eclipse Juno platform bundles depend on
+javax.annotation. In Fedora this is provided by geronimo-annotation, but
+has a dependency on javax.lang.model (since 1.6).
+
+Use the defined target environments in local mode when the property
+tycho.local.keepTarget is set.
+
+In situations where Tycho must resolve maven artifacts, upstream's
+implementation only looks in the reactor cache. In Fedora, maven
+artifacts may be located on the system using repository layouts
+understood by XMvn. Therefore, when an artifact is not found in the
+reactor cache, resolution should be attempted using the XMvn Resolver.
+
+Upstream/Fedora Tycho differ in the kind of OSGi Runtime used
+(org.eclipse.tycho:tycho-bundles-external:zip) so use separate location
+for our runtime (fedora-eclipse) to avoid collisions.
+
+Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
+---
+ .../internal/DefaultEquinoxEmbedder.java      | 13 ++++--
+ .../remote/RemoteRepositoryCacheManager.java  | 11 +++++
+ .../p2/target/TargetDefinitionResolver.java   | 11 ++++-
+ .../target/TargetPlatformBundlePublisher.java | 20 +++------
+ .../p2/target/TargetPlatformFactoryImpl.java  | 45 +++++++++++++++++--
+ .../p2/repository/LocalRepositoryReader.java  | 41 ++++++++++++++++-
+ .../TargetPlatformConfigurationStub.java      |  6 ++-
+ .../tycho-bundles-external.product            |  1 +
+ .../tycho/core/locking/FileLockerImpl.java    | 26 ++++++++---
+ .../maven/TychoMavenLifecycleParticipant.java | 21 +++++++--
+ .../core/osgitools/AbstractTychoProject.java  | 37 +++++++++++++++
+ .../core/osgitools/OsgiBundleProject.java     |  9 +++-
+ ...aultTargetPlatformConfigurationReader.java |  6 ++-
+ .../osgi/runtime/TychoOsgiRuntimeLocator.java | 33 +++++++++-----
+ tycho-p2/tycho-p2-facade/pom.xml              |  5 +++
+ .../p2/resolver/P2DependencyResolver.java     |  9 ++++
+ 16 files changed, 246 insertions(+), 48 deletions(-)
+
+diff --git a/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java b/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
+index f3d38198..f51d258b 100644
+--- a/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
+++ b/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
+@@ -202,7 +202,7 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled
+     private void activateBundlesInWorkingOrder() {
+         // activate bundles which need to do work in their respective activator; stick to a working order (cf. bug 359787)
+         // TODO this order should come from the EquinoxRuntimeLocator
+-    	tryActivateBundle("org.apache.felix.scr");
+        tryActivateBundle("org.apache.felix.scr");
+         tryActivateBundle("org.eclipse.equinox.ds");
+         tryActivateBundle("org.eclipse.equinox.registry");
+         tryActivateBundle("org.eclipse.core.net");
+@@ -239,7 +239,14 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled
+                     if (verIdx > 0) {
+                         bundles.append(name.substring(0, verIdx));
+                     } else {
+-                        throw new EquinoxEmbedderException("File name doesn't match expected pattern: " + file);
+                        // In Fedora, NAME_VERSION.QUALIFIER.jar is too fragile.
+                        // Let's also accept NAME.jar
+                        verIdx = name.lastIndexOf(".jar");
+                        if (verIdx > 0) {
+                            bundles.append(name.substring(0, verIdx));
+                        } else {
+                            throw new EquinoxEmbedderException("File name doesn't match expected pattern: " + file);
+                        }
+                     }
+                 }
+             }
+@@ -247,7 +254,7 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled
+     }
+ 
+     protected boolean isFrameworkBundle(File file) {
+-        return file.getName().startsWith("org.eclipse.osgi_");
+        return file.getName().startsWith("org.eclipse.osgi_") || file.getName().equals("org.eclipse.osgi.jar");
+     }
+ 
+     String getReferenceUrl(File file) {
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
+index 1f233e11..744e7dd4 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
+@@ -12,14 +12,18 @@ package org.eclipse.tycho.p2.remote;
+ 
+ import java.io.File;
+ import java.io.IOException;
+import java.net.MalformedURLException;
+ import java.net.URI;
+import java.net.URL;
+ 
+ import org.eclipse.core.runtime.IProgressMonitor;
+ import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.core.runtime.Status;
+ import org.eclipse.equinox.internal.p2.repository.CacheManager;
+import org.eclipse.equinox.internal.p2.repository.Messages;
+ import org.eclipse.equinox.internal.p2.repository.Transport;
+ import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.osgi.util.NLS;
+ import org.eclipse.tycho.core.shared.MavenContext;
+ import org.eclipse.tycho.core.shared.MavenLogger;
+ import org.eclipse.tycho.p2.impl.Activator;
+@@ -51,6 +55,13 @@ class RemoteRepositoryCacheManager extends CacheManager {
+     @Override
+     public File createCache(URI repositoryLocation, String prefix, IProgressMonitor monitor)
+             throws IOException, ProvisionException {
+        try {
+            new URL(repositoryLocation.toASCIIString());
+        } catch (MalformedURLException e) {
+            throw new ProvisionException(new Status(IStatus.ERROR,
+                    org.eclipse.equinox.internal.p2.repository.Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND,
+                    NLS.bind(Messages.CacheManager_CannotLoadNonUrlLocation, repositoryLocation), null));
+        }
+         File cacheFile = getCache(repositoryLocation, prefix);
+         if (offline) {
+             if (cacheFile != null) {
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
+index 23b9e640..9d164661 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
+@@ -24,6 +24,7 @@ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+ 
+ import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.URIUtil;
+ import org.eclipse.equinox.p2.core.IProvisioningAgent;
+ import org.eclipse.equinox.p2.metadata.IArtifactKey;
+ import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+@@ -136,8 +137,14 @@ public final class TargetDefinitionResolver {
+                     } else {
+                         key = location.normalize().toASCIIString();
+                     }
+-                    locations.add(uriRepositories.computeIfAbsent(key,
+-                            s -> new URITargetDefinitionContent(provisioningAgent, location, id)));
+                    // We cannot resolve a non-file URI in local mode
+                    if ((System.getProperty("TYCHO_MVN_LOCAL") == null
+                            && System.getProperty("TYCHO_MVN_RPMBUILD") == null)
+                            || URIUtil.isFileURI(repository.getLocation())
+                            || "fedora".equals(repository.getLocation().getScheme())) {
+                        locations.add(uriRepositories.computeIfAbsent(key,
+                                s -> new URITargetDefinitionContent(provisioningAgent, location, id)));
+                    }
+                 }
+                 IQueryable<IInstallableUnit> locationUnits = QueryUtil.compoundQueryable(locations);
+                 installableUnitResolver.addLocation((InstallableUnitLocation) locationDefinition, locationUnits);
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
+index 2c2f29a4..63794cad 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
+@@ -38,6 +38,7 @@ import org.eclipse.tycho.core.shared.MavenLogger;
+ import org.eclipse.tycho.p2.impl.publisher.MavenPropertiesAdvice;
+ import org.eclipse.tycho.p2.impl.publisher.repo.TransientArtifactRepository;
+ import org.eclipse.tycho.p2.metadata.IArtifactFacade;
+import org.eclipse.tycho.p2.repository.LocalRepositoryReader;
+ import org.eclipse.tycho.p2.repository.MavenRepositoryCoordinates;
+ import org.eclipse.tycho.repository.local.GAVArtifactDescriptor;
+ import org.eclipse.tycho.repository.p2base.artifact.provider.IRawArtifactFileProvider;
+@@ -385,22 +386,9 @@ public class TargetPlatformBundlePublisher {
+             GAVArtifactDescriptor descriptorForRepository = new GAVArtifactDescriptor(baseDescriptor,
+                     repositoryCoordinates);
+ 
+-            File requiredArtifactLocation = new File(getBaseDir(),
+-                    descriptorForRepository.getMavenCoordinates().getLocalRepositoryPath());
+-            File actualArtifactLocation = mavenArtifact.getLocation();
+-            if (!equivalentPaths(requiredArtifactLocation, actualArtifactLocation)) {
+-                throw new AssertionFailedException(
+-                        "The Maven artifact to be added to the target platform is not stored at the required location on disk: required \""
+-                                + requiredArtifactLocation + "\" but was \"" + actualArtifactLocation + "\"");
+-            }
+-
+             internalAddInternalDescriptor(descriptorForRepository);
+         }
+ 
+-        private boolean equivalentPaths(File path, File otherPath) {
+-            return path.equals(otherPath);
+-        }
+-
+         @Override
+         protected GAVArtifactDescriptor getInternalDescriptorForAdding(IArtifactDescriptor descriptor) {
+             // artifacts are only added via the dedicated method
+@@ -426,8 +414,10 @@ public class TargetPlatformBundlePublisher {
+ 
+         @Override
+         protected File internalGetArtifactStorageLocation(IArtifactDescriptor descriptor) {
+-            String relativePath = toInternalDescriptor(descriptor).getMavenCoordinates().getLocalRepositoryPath();
+-            return new File(getBaseDir(), relativePath);
+            MavenRepositoryCoordinates coord = toInternalDescriptor(descriptor).getMavenCoordinates();
+            LocalRepositoryReader reader = new LocalRepositoryReader(getBaseDir());
+            return reader.getLocalArtifactLocation(coord.getGav(), coord.getClassifier(),
+                    coord.getExtensionOrDefault());
+         }
+ 
+         private File getBaseDir() {
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
+index a909caf7..fed19448 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
+@@ -35,6 +35,9 @@ import org.eclipse.core.runtime.URIUtil;
+ import org.eclipse.equinox.p2.core.IProvisioningAgent;
+ import org.eclipse.equinox.p2.core.ProvisionException;
+ import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.expression.ExpressionUtil;
+import org.eclipse.equinox.p2.metadata.expression.IExpression;
+import org.eclipse.equinox.p2.query.IQuery;
+ import org.eclipse.equinox.p2.query.IQueryResult;
+ import org.eclipse.equinox.p2.query.QueryUtil;
+ import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
+@@ -277,9 +280,43 @@ public class TargetPlatformFactoryImpl implements TargetPlatformFactory {
+             metadataRepositories.add(localMetadataRepository);
+         }
+ 
+-        for (IMetadataRepository repository : metadataRepositories) {
+-            IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, monitor);
+-            result.addAll(matches.toUnmodifiableSet());
+        if (System.getProperty("TYCHO_MVN_LOCAL") != null) {
+            final IExpression notmatchIU_ID = ExpressionUtil.parse("id != $0");
+            Set<IMetadataRepository> fedoraRepos = new HashSet<IMetadataRepository>();
+
+            // Sanity check even though the repo we want should be at index 1
+            for (IMetadataRepository repository : metadataRepositories) {
+                if ("fedora".equals(repository.getLocation().getScheme())) {
+                    fedoraRepos.add(repository);
+                }
+            }
+
+            IQuery<IInstallableUnit> noLocalIUs = QueryUtil.createIUAnyQuery();
+
+            // Create a conjunction query that negates all IUs on the local system
+            for (IMetadataRepository repo : fedoraRepos) {
+                for (IInstallableUnit unit : repo.query(QueryUtil.ALL_UNITS, null).toUnmodifiableSet()) {
+                    noLocalIUs = QueryUtil.createCompoundQuery(noLocalIUs,
+                            QueryUtil.createMatchQuery(notmatchIU_ID, unit.getId()), true);
+                }
+            }
+
+            for (IMetadataRepository repository : metadataRepositories) {
+                IQueryResult<IInstallableUnit> matches;
+                if ("fedora".equals(repository.getLocation().getScheme())) {
+                    matches = repository.query(QueryUtil.ALL_UNITS, monitor);
+                } else {
+                    // Don't collect any remote IUs that can be found on the system
+                    // This will favour IUs in the system local p2 repository
+                    matches = repository.query(noLocalIUs, monitor);
+                }
+                result.addAll(matches.toUnmodifiableSet());
+            }
+        } else {
+            for (IMetadataRepository repository : metadataRepositories) {
+                IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, monitor);
+                result.addAll(matches.toUnmodifiableSet());
+            }
+         }
+ 
+         result.addAll(pomDependenciesContent.gatherMavenInstallableUnits());
+@@ -333,7 +370,7 @@ public class TargetPlatformFactoryImpl implements TargetPlatformFactory {
+         List<IArtifactRepository> artifactRepositories = new ArrayList<>();
+ 
+         for (MavenRepositoryLocation location : mavenRepositories) {
+-            if (!offline || URIUtil.isFileURI(location.getURL())) {
+            if (!offline || URIUtil.isFileURI(location.getURL()) || "fedora".equals(location.getURL().getScheme())) {
+                 artifactRepositories.add(new LazyArtifactRepository(remoteAgent, location.getURL(),
+                         RepositoryArtifactProvider::loadRepository));
+             }
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+index e05f8715..03900e27 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+@@ -11,6 +11,8 @@
+ package org.eclipse.tycho.p2.repository;
+ 
+ import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+ 
+ public class LocalRepositoryReader implements RepositoryReader {
+ 
+@@ -22,7 +24,44 @@ public class LocalRepositoryReader implements RepositoryReader {
+ 
+     @Override
+     public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
+-        return new File(localMavenRepositoryRoot, RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
+        File file = new File(localMavenRepositoryRoot,
+                RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
+        // In Fedora the artifact may be in an XMvn-defined repository location (not in reactor cache)
+        if (!file.exists()) {
+            try {
+                // Create Plexus config
+                Class<?> pcclazz = Class.forName("org.codehaus.plexus.ContainerConfiguration");
+                Object conf = Class.forName("org.codehaus.plexus.DefaultContainerConfiguration").newInstance();
+                pcclazz.getMethod("setAutoWiring", boolean.class).invoke(conf, true);
+                pcclazz.getMethod("setClassPathScanning", String.class).invoke(conf, "index");
+
+                // Use plexus container to lookup the reader
+                Class<?> pclazz = Class.forName("org.codehaus.plexus.DefaultPlexusContainer");
+                Object plexus = pclazz.getConstructor(pcclazz).newInstance(conf);
+
+                // Retrieve the workspace reader from the plexus container
+                Method mLookup = pclazz.getMethod("lookup", String.class, String.class);
+                Object reader = mLookup.invoke(plexus, "org.eclipse.aether.repository.WorkspaceReader", "ide");
+
+                // Create an Aether Artifact based on GAV, classifier, and extension
+                Class<?> iartclazz = Class.forName("org.eclipse.aether.artifact.Artifact");
+                Class<?> artclazz = Class.forName("org.eclipse.aether.artifact.DefaultArtifact");
+                Constructor<?> cNew = artclazz.getConstructor(String.class, String.class, String.class, String.class,
+                        String.class);
+                Object artifact = cNew.newInstance(gav.getGroupId(), gav.getArtifactId(), classifier, extension,
+                        gav.getVersion());
+
+                // Invoke "findArtifact" method of the workspace reader on the artifact
+                Method mfindArtifact = reader.getClass().getMethod("findArtifact", iartclazz);
+                File newFile = (File) mfindArtifact.invoke(reader, artifact);
+                if (newFile != null) {
+                    file = newFile;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return file;
+     }
+ 
+ }
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
+index 272db570..70897e4a 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
+@@ -59,7 +59,11 @@ public class TargetPlatformConfigurationStub {
+     }
+ 
+     public void addP2Repository(MavenRepositoryLocation location) {
+-        this.repositories.add(location);
+        // We cannot resolve a non-file URI in local mode while offline
+        if (System.getProperty("TYCHO_MVN_RPMBUILD") == null || "file".equalsIgnoreCase(location.getURL().getScheme())
+                || "fedora".equalsIgnoreCase(location.getURL().getScheme())) {
+            this.repositories.add(location);
+        }
+     }
+ 
+     // 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 7e3d5fbe..b146c08f 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 @@
+       <plugin id="org.sat4j.pb"/>
+       <plugin id="org.slf4j.api"/>
+       <plugin id="org.tukaani.xz"/>
+      <plugin id="org.fedoraproject.p2"/>
+    </plugins>
+ 
+    <configurations>
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
+index 99405613..9a98a400 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
+@@ -27,20 +27,34 @@ public class FileLockerImpl implements FileLocker {
+     final File lockMarkerFile;
+ 
+     public FileLockerImpl(File file, Location anyLocation) {
+        File lockFileCandidate = null;
+         try {
+             if (file.isDirectory()) {
+-                this.lockMarkerFile = new File(file, LOCKFILE_SUFFIX).getCanonicalFile();
+                lockFileCandidate = new File(file, LOCKFILE_SUFFIX).getCanonicalFile();
+             } else {
+-                this.lockMarkerFile = new File(file.getParentFile(), file.getName() + LOCKFILE_SUFFIX)
+-                        .getCanonicalFile();
+                lockFileCandidate = new File(file.getParentFile(), file.getName() + LOCKFILE_SUFFIX).getCanonicalFile();
+             }
+-            if (lockMarkerFile.isDirectory()) {
+-                throw new RuntimeException("Lock marker file " + lockMarkerFile + " already exists and is a directory");
+            if (lockFileCandidate.isDirectory()) {
+                throw new RuntimeException(
+                        "Lock marker file " + lockFileCandidate + " already exists and is a directory");
+             }
+-            File parentDir = lockMarkerFile.getParentFile();
+            File parentDir = lockFileCandidate.getParentFile();
+             if (!parentDir.isDirectory() && !parentDir.mkdirs()) {
+                 throw new RuntimeException("Could not create parent directory " + parentDir + " of lock marker file");
+             }
+
+            String baseDir = System.getProperty("user.dir");
+            String reactorCache = baseDir + "/.m2/";
+            // In Fedora we can only assume reactor cache is safe for read/write.
+            if (!lockFileCandidate.getAbsolutePath().startsWith(reactorCache)) {
+                String lockFileDir = reactorCache + LOCKFILE_SUFFIX;
+                // If the file is located within baseDir, no need to repeat
+                String lockFileName = file.getAbsolutePath().replace(baseDir, "").replace("/", "-").replaceFirst("-",
+                        "/") + LOCKFILE_SUFFIX;
+                lockFileCandidate = new File(lockFileDir, lockFileName);
+            }
+
+            this.lockMarkerFile = lockFileCandidate;
+             this.lockFileLocation = anyLocation.createLocation(null, null, false);
+             this.lockFileLocation.set(lockMarkerFile.toURL(), false, lockMarkerFile.getAbsolutePath());
+         } catch (MalformedURLException e) {
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+index f7337742..8ca51b1e 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+@@ -30,6 +30,7 @@ import org.apache.maven.project.MavenProject;
+ import org.codehaus.plexus.PlexusContainer;
+ import org.codehaus.plexus.component.annotations.Component;
+ import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+ import org.codehaus.plexus.logging.Logger;
+ import org.eclipse.tycho.ReactorProject;
+ import org.eclipse.tycho.core.osgitools.BundleReader;
+@@ -86,6 +87,18 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+ 
+             configureComponents(session);
+ 
+            try {
+                if (plexus.lookup("org.fedoraproject.xmvn.resolver.Resolver") != null) {
+                    if (session.isOffline()) {
+                        System.setProperty("TYCHO_MVN_RPMBUILD", "");
+                    } else {
+                        System.setProperty("TYCHO_MVN_LOCAL", "");
+                    }
+                }
+            } catch (ComponentLookupException e) {
+                // No XMvn (Upstream Maven in use)
+            }
+
+             for (MavenProject project : projects) {
+                 resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
+             }
+@@ -118,8 +131,8 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+                     if (version == null) {
+                         continue;
+                     }
+-                    log.debug(TYCHO_GROUPID + ":" + plugin.getArtifactId() + ":" + version + " configured in "
+-                            + project);
+                    log.debug(
+                            TYCHO_GROUPID + ":" + plugin.getArtifactId() + ":" + version + " configured in " + project);
+                     Set<MavenProject> projectSet = versionToProjectsMap.get(version);
+                     if (projectSet == null) {
+                         projectSet = new LinkedHashSet<>();
+@@ -152,8 +165,8 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+         for (MavenProject project : projects) {
+             File basedir = project.getBasedir();
+             if (baseDirs.contains(basedir)) {
+-                throw new MavenExecutionException("Multiple modules within the same basedir are not supported: "
+-                        + basedir, project.getFile());
+                throw new MavenExecutionException(
+                        "Multiple modules within the same basedir are not supported: " + basedir, project.getFile());
+             } else {
+                 baseDirs.add(basedir);
+             }
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
+index b53a889a..7ea21770 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
+@@ -15,12 +15,18 @@ import java.util.Objects;
+ 
+ import org.apache.maven.execution.MavenSession;
+ import org.apache.maven.project.MavenProject;
+import org.apache.maven.toolchain.ToolchainManager;
+import org.codehaus.plexus.component.annotations.Requirement;
+ import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.logging.Logger;
+ import org.eclipse.tycho.artifacts.DependencyArtifacts;
+ import org.eclipse.tycho.core.TargetPlatformConfiguration;
+ import org.eclipse.tycho.core.TychoConstants;
+ import org.eclipse.tycho.core.TychoProject;
+import org.eclipse.tycho.core.ee.ExecutionEnvironmentUtils;
+ import org.eclipse.tycho.core.ee.TargetDefinitionFile;
+import org.eclipse.tycho.core.ee.UnknownEnvironmentException;
+import org.eclipse.tycho.core.ee.shared.ExecutionEnvironment;
+ import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
+ import org.eclipse.tycho.core.osgitools.targetplatform.LocalDependencyResolver;
+ import org.eclipse.tycho.core.osgitools.targetplatform.MultiEnvironmentDependencyArtifacts;
+@@ -30,6 +36,12 @@ import org.eclipse.tycho.p2.target.facade.TargetDefinition;
+ 
+ public abstract class AbstractTychoProject extends AbstractLogEnabled implements TychoProject {
+ 
+    @Requirement
+    private Logger logger;
+
+    @Requirement
+    private ToolchainManager toolchainManager;
+
+     @Override
+     public DependencyArtifacts getDependencyArtifacts(MavenProject project) {
+         return TychoProjectUtils.getDependencyArtifacts(project);
+@@ -98,6 +110,8 @@ public abstract class AbstractTychoProject extends AbstractLogEnabled implements
+ 
+         String configuredForcedProfile = tpConfiguration.getExecutionEnvironment();
+         if (configuredForcedProfile != null) {
+            configuredForcedProfile = overrideToAtLeastJavaSE16(configuredForcedProfile, toolchainManager, mavenSession,
+                    logger);
+             sink.overrideProfileConfiguration(configuredForcedProfile,
+                     "target-platform-configuration <executionEnvironment>");
+         } else {
+@@ -112,9 +126,32 @@ public abstract class AbstractTychoProject extends AbstractLogEnabled implements
+ 
+         String configuredDefaultProfile = tpConfiguration.getExecutionEnvironmentDefault();
+         if (configuredDefaultProfile != null) {
+            configuredDefaultProfile = overrideToAtLeastJavaSE16(configuredDefaultProfile, toolchainManager,
+                    mavenSession, logger);
+             sink.setProfileConfiguration(configuredDefaultProfile,
+                     "target-platform-configuration <executionEnvironmentDefault>");
+         }
+     }
+ 
+    public String overrideToAtLeastJavaSE16(String profile, ToolchainManager toolchainManager, MavenSession session,
+            Logger logger) {
+        try {
+            ExecutionEnvironment ee = ExecutionEnvironmentUtils.getExecutionEnvironment(profile, toolchainManager,
+                    session, logger);
+
+            if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
+                // EE must be at least JavaSE-1.6
+                final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6",
+                        toolchainManager, session, logger);
+                if (!ee.isCompatibleCompilerTargetLevel(javaSE16.getCompilerTargetLevelDefault())) {
+                    ee = javaSE16;
+                }
+            }
+
+            return ee.getProfileName();
+        } catch (UnknownEnvironmentException e) {
+            // can't happen, ee is validated during configuration parsing
+            return null;
+        }
+    }
+ }
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
+index 4ec4166d..d57245de 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
+@@ -516,6 +516,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
+         String pdeProfileName = getEclipsePluginProject(DefaultReactorProject.adapt(project)).getBuildProperties()
+                 .getJreCompilationProfile();
+         if (pdeProfileName != null) {
+            pdeProfileName = overrideToAtLeastJavaSE16(pdeProfileName, toolchainManager, mavenSession, logger);
+             sink.setProfileConfiguration(pdeProfileName.trim(), "build.properties");
+         } else {
+             // ... derived from BREE in bundle manifest
+@@ -548,16 +549,22 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
+         StandardExecutionEnvironment configuredProfile = ExecutionEnvironmentUtils
+                 .getExecutionEnvironment(configuredProfileName, toolchainManager, mavenSession, logger);
+         if (configuredProfile != null) {
+            configuredProfileName = overrideToAtLeastJavaSE16(configuredProfileName, toolchainManager, mavenSession,
+                    logger);
+             // non standard profile, stick to it
+             sink.setProfileConfiguration(configuredProfileName, reason);
+         }
+         StandardExecutionEnvironment currentProfile = ExecutionEnvironmentUtils.getExecutionEnvironment(
+                 "JavaSE-" + Runtime.version().feature(), toolchainManager, mavenSession, logger);
+         if (currentProfile.compareTo(configuredProfile) > 0) {
+-            sink.setProfileConfiguration(currentProfile.getProfileName(),
+            String configuredProfile1 = overrideToAtLeastJavaSE16(currentProfile.getProfileName(), toolchainManager,
+                    mavenSession, logger);
+            sink.setProfileConfiguration(configuredProfile1,
+                     "Currently running profile, newer than configured profile (" + configuredProfileName + ") from ["
+                             + reason + "]");
+         } else {
+            configuredProfileName = overrideToAtLeastJavaSE16(configuredProfileName, toolchainManager, mavenSession,
+                    logger);
+             sink.setProfileConfiguration(configuredProfileName, reason);
+         }
+     }
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
+index 87042d2b..85d52aa0 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
+@@ -87,7 +87,11 @@ public class DefaultTargetPlatformConfigurationReader {
+                             + configuration.toString());
+                 }
+ 
+-                addTargetEnvironments(result, project, configuration);
+                // Use the defined environments only in local mode with tycho.local.keepTarget
+                if ((System.getProperty("TYCHO_MVN_LOCAL") == null && System.getProperty("TYCHO_MVN_RPMBUILD") == null)
+                        || System.getProperty("tycho.local.keepTarget") != null) {
+                    addTargetEnvironments(result, project, configuration);
+                }
+ 
+                 setTargetPlatformResolver(result, configuration);
+ 
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
+index ea817a92..c71fc930 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
+@@ -160,40 +160,53 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator {
+         Artifact artifact = resolveDependency(session, dependency);
+ 
+         if ("zip".equals(dependency.getType())) {
+-            File artifactFile = new File(session.getLocalRepository().getBasedir(), session.getLocalRepository()
+-                    .pathOf(artifact));
+            File artifactFile = new File(session.getLocalRepository().getBasedir(),
+                    session.getLocalRepository().pathOf(artifact));
+             File eclipseDir = new File(artifactFile.getParentFile(), "eclipse");
+            File eclipseSaveDir = new File(artifactFile.getParentFile(), "eclipse-save");
+            File fedoraDir = new File(artifactFile.getParentFile(), "fedora-eclipse");
+ 
+             FileLocker locker = fileLockService.getFileLocker(artifactFile);
+             locker.lock();
+             try {
+-                if (!eclipseDir.exists() || artifact.isSnapshot()) {
+                if (!fedoraDir.exists() || artifact.isSnapshot()) {
+                     logger.debug("Extracting Tycho's OSGi runtime");
+ 
+-                    if (artifact.getFile().lastModified() > eclipseDir.lastModified()) {
+                    if (artifact.getFile().lastModified() > fedoraDir.lastModified()) {
+                         logger.debug("Unpacking Tycho's OSGi runtime to " + eclipseDir);
+                         try {
+-                            FileUtils.deleteDirectory(eclipseDir);
+                            FileUtils.deleteDirectory(fedoraDir);
+                            if (eclipseDir.exists()) {
+                                FileUtils.rename(eclipseDir, eclipseSaveDir);
+                            }
+                         } catch (IOException e) {
+-                            logger.warn("Failed to delete Tycho's OSGi runtime " + eclipseDir + ": " + e.getMessage());
+                            logger.warn("Failed to delete Tycho's OSGi runtime " + fedoraDir + ": " + e.getMessage());
+                         }
+                         eclipseDir.mkdirs();
+                         unArchiver.setSourceFile(artifact.getFile());
+                         unArchiver.setDestDirectory(eclipseDir);
+                         try {
+                             unArchiver.extract();
+                            logger.debug("Moving Tycho's OSGi runtime to " + fedoraDir);
+                            FileUtils.rename(eclipseDir, fedoraDir);
+                            if (eclipseSaveDir.exists()) {
+                                FileUtils.rename(eclipseSaveDir, eclipseDir);
+                            }
+                         } catch (ArchiverException e) {
+-                            throw new MavenExecutionException("Failed to unpack Tycho's OSGi runtime: "
+-                                    + e.getMessage(), e);
+                            throw new MavenExecutionException(
+                                    "Failed to unpack Tycho's OSGi runtime: " + e.getMessage(), e);
+                        } catch (IOException e) {
+                            throw new MavenExecutionException("Failed to move Tycho's OSGi runtime: " + e.getMessage(),
+                                    e);
+                         }
+ 
+-                        eclipseDir.setLastModified(artifact.getFile().lastModified());
+                        fedoraDir.setLastModified(artifact.getFile().lastModified());
+                     }
+                 }
+             } finally {
+                 locker.release();
+             }
+-            description.addInstallation(eclipseDir);
+            description.addInstallation(fedoraDir);
+         } else {
+             description.addBundle(artifact.getFile());
+         }
+diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml
+index a5cbdb6d..c6099934 100644
+--- a/tycho-p2/tycho-p2-facade/pom.xml
+++ b/tycho-p2/tycho-p2-facade/pom.xml
+@@ -57,6 +57,11 @@
+ 			<artifactId>junit-jupiter-api</artifactId>
+ 			<scope>test</scope>
+ 		</dependency>
+		<dependency>
+			<groupId>org.fedoraproject.p2</groupId>
+			<artifactId>org.fedoraproject.p2</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+ 	</dependencies>
+ 
+ 	<build>
+diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
+index c911d45a..26df4a67 100644
+--- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
+++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
+@@ -92,6 +92,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
+ import org.eclipse.tycho.p2.target.facade.PomDependencyCollector;
+ import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub;
+ import org.eclipse.tycho.repository.registry.facade.ReactorRepositoryManagerFacade;
+import org.fedoraproject.p2.EclipseSystemLayout;
+ 
+ @Component(role = DependencyResolver.class, hint = P2DependencyResolver.ROLE_HINT, instantiationStrategy = "per-lookup")
+ public class P2DependencyResolver extends AbstractLogEnabled implements DependencyResolver, Initializable {
+@@ -200,6 +201,14 @@ public class P2DependencyResolver extends AbstractLogEnabled implements Dependen
+ 
+         PomDependencyCollector pomDependencies = collectPomDependencies(project, reactorProjects, session,
+                 configuration.getPomDependencies());
+
+        // 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 (ArtifactRepository repository : project.getRemoteArtifactRepositories()) {
+             addEntireP2RepositoryToTargetPlatform(repository, tpConfiguration);
+         }
+-- 
+2.28.0
+
--- a/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
+++ b/0003-Tycho-should-always-delegate-artifact-resolution-to-.patch
@ -0,0 +1,700 @@
+From a09b3d4a8b0005d50a311d2210e360e6d845531d 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/7] Tycho should always delegate artifact resolution to
+ Maven.
+
+Maven resolves dependencies from the following locations in the
+following order:
+    * reactor,
+    * workspace (eg. XMvn),
+    * local repository,
+    * remote repositories.
+
+Tycho assumes that all resolved artifacts are present within the reactor
+cache but this is not true for artifacts resolved from workspace
+locations.
+
+Change-Id: Ia44969ed1064965a82c3507a63e54caeebb75b18
+---
+ .../tycho/core/shared/MavenContext.java       |  1 +
+ .../tycho/core/shared/MavenContextImpl.java   |  9 +++-
+ .../core/shared/MavenRepositorySystem.java    | 19 +++++++
+ .../LocalArtifactRepositoryP2APITest.java     |  4 +-
+ .../local/LocalMetadataRepositoryTest.java    |  3 +-
+ .../local/LocalArtifactRepository.java        | 18 +++----
+ .../local/LocalArtifactRepositoryFactory.java |  3 +-
+ .../index/LocalRepositoryP2IndicesImpl.java   |  6 +++
+ .../remote/RemoteAgentMavenMirrorsTest.java   |  3 +-
+ ...emoteAgentMetadataRepositoryCacheTest.java |  9 ++--
+ .../TargetPlatformBundlePublisherTest.java    |  4 +-
+ .../tycho/p2/target/TestResolverFactory.java  |  7 ++-
+ .../p2/resolver/P2ResolverFactoryImpl.java    |  8 +--
+ .../p2/target/PomDependencyCollectorImpl.java |  2 +-
+ .../target/TargetPlatformBundlePublisher.java | 13 +++--
+ .../repository/LocalRepositoryP2Indices.java  |  3 ++
+ .../p2/repository/LocalRepositoryReader.java  | 50 +++++--------------
+ .../TemporaryLocalMavenRepository.java        |  4 +-
+ .../test/util/MavenRepositorySystemStub.java  | 30 +++++++++++
+ .../MavenRepositorySystemAdapter.java         | 37 ++++++++++++++
+ .../MavenContextConfigurator.java             |  7 ++-
+ 21 files changed, 170 insertions(+), 70 deletions(-)
+ create mode 100644 tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
+ create mode 100644 tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
+ create mode 100644 tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
+
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
+index 00ee911d..d2efe795 100644
+--- a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
+@@ -48,4 +48,5 @@ public interface MavenContext {
+      */
+     public Collection<ReactorProject> getProjects();
+ 
+    public MavenRepositorySystem getRepositorySystem();
+ }
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
+index dba2b323..585f2d42 100644
+--- a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
+@@ -27,18 +27,20 @@ public class MavenContextImpl implements MavenContext {
+     private boolean offline;
+     private Properties mergedProperties;
+     private List<ReactorProject> projects = new ArrayList<>();
+    private MavenRepositorySystem repositorySystem;
+ 
+     public MavenContextImpl(File localRepositoryRoot, boolean offline, MavenLogger mavenLogger,
+-            Properties mergedProperties) {
+            Properties mergedProperties, MavenRepositorySystem repositorySystem) {
+         this.localRepositoryRoot = localRepositoryRoot;
+         this.offline = offline;
+         this.mavenLogger = mavenLogger;
+         this.mergedProperties = mergedProperties;
+        this.repositorySystem = repositorySystem;
+     }
+ 
+     // constructor for tests
+     public MavenContextImpl(File localRepositoryRoot, MavenLogger mavenLogger) {
+-        this(localRepositoryRoot, false, mavenLogger, new Properties());
+        this(localRepositoryRoot, false, mavenLogger, new Properties(), null);
+     }
+ 
+     @Override
+@@ -70,4 +72,7 @@ public class MavenContextImpl implements MavenContext {
+         projects.add(reactorProject);
+     }
+ 
+    public MavenRepositorySystem getRepositorySystem() {
+        return repositorySystem;
+    }
+ }
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
+new file mode 100644
+index 00000000..965e5cd9
+--- /dev/null
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
+@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Red Hat Inc.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tycho.core.shared;
+
+import java.io.File;
+
+public interface MavenRepositorySystem {
+
+    public File resolve(String gid, String aid, String version, String type, String classifier);
+
+}
+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 43ca3cbc..7958be3c 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
+ import org.eclipse.tycho.repository.streaming.testutil.ProbeArtifactSink;
+ import org.eclipse.tycho.repository.streaming.testutil.ProbeOutputStream;
+ import org.eclipse.tycho.repository.streaming.testutil.ProbeRawArtifactSink;
+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
+ import org.junit.After;
+ import org.junit.Assume;
+ import org.junit.Before;
+@@ -114,7 +115,8 @@ public class LocalArtifactRepositoryP2APITest {
+     @Before
+     public void initSubject() throws Exception {
+         temporaryLocalMavenRepo.initContentFromResourceFolder(ResourceUtil.resourceFile("repositories/local"));
+-        subject = new LocalArtifactRepository(null, temporaryLocalMavenRepo.getLocalRepositoryIndex());
+        subject = new LocalArtifactRepository(null, temporaryLocalMavenRepo.getLocalRepositoryIndex(),
+                new MavenRepositorySystemStub(temporaryLocalMavenRepo.getLocalRepositoryRoot()));
+ 
+         testOutputStream = new ProbeOutputStream();
+     }
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalMetadataRepositoryTest.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalMetadataRepositoryTest.java
+index 4bcd11ce..86bc7eda 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalMetadataRepositoryTest.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/LocalMetadataRepositoryTest.java
+@@ -33,6 +33,7 @@ import org.eclipse.tycho.p2.repository.LocalRepositoryReader;
+ import org.eclipse.tycho.p2.repository.RepositoryLayoutHelper;
+ import org.eclipse.tycho.p2.repository.TychoRepositoryIndex;
+ import org.eclipse.tycho.repository.local.index.FileBasedTychoRepositoryIndex;
+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
+ import org.eclipse.tycho.test.util.NoopFileLockService;
+ import org.junit.Assert;
+ import org.junit.Test;
+@@ -51,7 +52,7 @@ public class LocalMetadataRepositoryTest {
+ 
+     protected IMetadataRepository loadRepository(File location) throws ProvisionException {
+         return new LocalMetadataRepository(location.toURI(), createMetadataIndex(location),
+-                new LocalRepositoryReader(location));
+                new LocalRepositoryReader(location, new MavenRepositorySystemStub(location)));
+     }
+ 
+     private TychoRepositoryIndex createMetadataIndex(File location) {
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
+index 1dc91006..bf26e3dd 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
+@@ -23,6 +23,7 @@ import java.util.Set;
+ import org.eclipse.equinox.p2.core.IProvisioningAgent;
+ import org.eclipse.equinox.p2.metadata.IArtifactKey;
+ import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+ import org.eclipse.tycho.p2.maven.repository.Activator;
+ import org.eclipse.tycho.p2.maven.repository.xmlio.ArtifactsIO;
+ import org.eclipse.tycho.p2.repository.GAV;
+@@ -42,15 +43,16 @@ public class LocalArtifactRepository extends ArtifactRepositoryBaseImpl<GAVArtif
+ 
+     // TODO what is the agent needed for? does using the default agent harm?
+     public LocalArtifactRepository(LocalRepositoryP2Indices localRepoIndices) {
+-        this(Activator.getProvisioningAgent(), localRepoIndices);
+        this(Activator.getProvisioningAgent(), localRepoIndices, (MavenRepositorySystem) null);
+     }
+ 
+     public LocalArtifactRepository(LocalRepositoryP2Indices localRepoIndices, RepositoryReader contentLocator) {
+         this(Activator.getProvisioningAgent(), localRepoIndices, contentLocator);
+     }
+ 
+-    public LocalArtifactRepository(IProvisioningAgent agent, LocalRepositoryP2Indices localRepoIndices) {
+-        this(agent, localRepoIndices, new LocalRepositoryReader(localRepoIndices.getBasedir()));
+    public LocalArtifactRepository(IProvisioningAgent agent, LocalRepositoryP2Indices localRepoIndices,
+            MavenRepositorySystem repositorySystem) {
+        this(agent, localRepoIndices, new LocalRepositoryReader(localRepoIndices.getBasedir(), repositorySystem));
+     }
+ 
+     public LocalArtifactRepository(IProvisioningAgent agent, LocalRepositoryP2Indices localRepoIndices,
+@@ -73,9 +75,9 @@ public class LocalArtifactRepository extends ArtifactRepositoryBaseImpl<GAVArtif
+                     // if files have been manually removed from the repository, simply remove them from the index (bug 351080)
+                     index.removeGav(gav);
+                 } else {
+-                    try (InputStream is = new FileInputStream(contentLocator.getLocalArtifactLocation(gav,
+-                            RepositoryLayoutHelper.CLASSIFIER_P2_ARTIFACTS,
+-                            RepositoryLayoutHelper.EXTENSION_P2_ARTIFACTS))) {
+                    try (InputStream is = new FileInputStream(
+                            contentLocator.getLocalArtifactLocation(gav, RepositoryLayoutHelper.CLASSIFIER_P2_ARTIFACTS,
+                                    RepositoryLayoutHelper.EXTENSION_P2_ARTIFACTS))) {
+                         final Set<IArtifactDescriptor> gavDescriptors = io.readXML(is);
+                         for (IArtifactDescriptor descriptor : gavDescriptors) {
+                             internalAddDescriptor(descriptor);
+@@ -119,11 +121,9 @@ public class LocalArtifactRepository extends ArtifactRepositoryBaseImpl<GAVArtif
+                 File file = new File(location, relpath);
+                 file.getParentFile().mkdirs();
+ 
+-
+                 try (OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) {
+                     io.writeXML(keyDescriptors, os);
+-                }
+-                catch (IOException e) {
+                } catch (IOException e) {
+                     throw new RuntimeException(e);
+                 }
+             }
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
+index 8356f468..cb6c7757 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
+@@ -41,7 +41,8 @@ public class LocalArtifactRepositoryFactory extends ArtifactRepositoryFactory {
+             if (localRepositoryDirectory.isDirectory()
+                     && new File(localRepositoryDirectory, ".meta/p2-artifacts.properties").exists()) {
+                 // see FileBasedTychoRepositoryIndex#ARTIFACTS_INDEX_RELPATH
+-                return new LocalArtifactRepository(getAgent(), lookupLocalRepoIndices());
+                return new LocalArtifactRepository(getAgent(), lookupLocalRepoIndices(),
+                        lookupLocalRepoIndices().getRepositorySystem());
+             }
+         }
+         return null;
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
+index ccc9f640..867616a6 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
+@@ -15,6 +15,7 @@ import java.io.File;
+ 
+ import org.eclipse.tycho.core.shared.MavenContext;
+ import org.eclipse.tycho.core.shared.MavenLogger;
+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+ import org.eclipse.tycho.locking.facade.FileLockService;
+ import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
+ import org.eclipse.tycho.p2.repository.TychoRepositoryIndex;
+@@ -25,6 +26,7 @@ public class LocalRepositoryP2IndicesImpl implements LocalRepositoryP2Indices {
+     private FileLockService fileLockService;
+     private File localRepositoryRoot;
+     private MavenLogger logger;
+    private MavenRepositorySystem repoSystem;
+ 
+     // derived members
+     private boolean initialized = false;
+@@ -39,6 +41,7 @@ public class LocalRepositoryP2IndicesImpl implements LocalRepositoryP2Indices {
+     public void setMavenContext(MavenContext mavenContext) {
+         this.localRepositoryRoot = mavenContext.getLocalRepositoryRoot();
+         this.logger = mavenContext.getLogger();
+        this.repoSystem = mavenContext.getRepositorySystem();
+     }
+ 
+     // injected by DS runtime
+@@ -80,4 +83,7 @@ public class LocalRepositoryP2IndicesImpl implements LocalRepositoryP2Indices {
+         return localRepositoryRoot;
+     }
+ 
+    public MavenRepositorySystem getRepositorySystem() {
+        return repoSystem;
+    }
+ }
+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 b1b37a6e..96bf7b2d 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;
+ import org.eclipse.tycho.p2.remote.testutil.MavenRepositorySettingsStub;
+ import org.eclipse.tycho.test.util.HttpServer;
+ import org.eclipse.tycho.test.util.LogVerifier;
+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
+@@ -52,7 +53,7 @@ public class RemoteAgentMavenMirrorsTest {
+     public void initSubject() throws Exception {
+         File localRepository = tempManager.newFolder("localRepo");
+         MavenContext mavenContext = new MavenContextImpl(localRepository, OFFLINE, logVerifier.getLogger(),
+-                new Properties());
+                new Properties(), new MavenRepositorySystemStub(localRepository));
+ 
+         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 05747e60..08ec40b3 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;
+ import org.eclipse.tycho.core.shared.MavenContextImpl;
+ import org.eclipse.tycho.test.util.HttpServer;
+ import org.eclipse.tycho.test.util.LogVerifier;
+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
+@@ -125,13 +126,13 @@ public class RemoteAgentMetadataRepositoryCacheTest {
+     }
+ 
+     private RemoteAgent newOnlineAgent() throws Exception {
+-        return new RemoteAgent(
+-                new MavenContextImpl(localMavenRepository, false, logVerifier.getLogger(), new Properties()));
+        return new RemoteAgent(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()));
+        return new RemoteAgent(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 4339a5b6..6c9ef486 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
+@@ -39,6 +39,7 @@ import org.eclipse.tycho.p2.repository.RepositoryLayoutHelper;
+ import org.eclipse.tycho.repository.p2base.artifact.provider.IRawArtifactProvider;
+ import org.eclipse.tycho.repository.streaming.testutil.ProbeRawArtifactSink;
+ import org.eclipse.tycho.test.util.LogVerifier;
+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
+@@ -66,7 +67,8 @@ public class TargetPlatformBundlePublisherTest {
+ 
+         localRepositoryRoot = tempFolder.getRoot();
+         subject = new TargetPlatformBundlePublisher(localRepositoryRoot,
+-                new ReactorProjectStub(tempFolder.newFolder(), "test"), logVerifier.getLogger());
+                new ReactorProjectStub(tempFolder.newFolder(), "test"), logVerifier.getLogger(),
+                new MavenRepositorySystemStub(localRepositoryRoot));
+     }
+ 
+     @Test
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
+index efbbe8cc..eda3545a 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
+@@ -30,6 +30,7 @@ import org.eclipse.tycho.p2.target.facade.TargetPlatformFactory;
+ import org.eclipse.tycho.repository.local.LocalArtifactRepository;
+ import org.eclipse.tycho.repository.local.LocalMetadataRepository;
+ import org.eclipse.tycho.repository.local.index.LocalRepositoryP2IndicesImpl;
+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
+ import org.eclipse.tycho.test.util.NoopFileLockService;
+ 
+ public class TestResolverFactory implements P2ResolverFactory {
+@@ -48,7 +49,8 @@ public class TestResolverFactory implements P2ResolverFactory {
+ 
+         File localMavenRepoRoot = mavenContext.getLocalRepositoryRoot();
+         LocalRepositoryP2Indices localRepoIndices = createLocalRepoIndices(mavenContext);
+-        LocalRepositoryReader localRepositoryReader = new LocalRepositoryReader(localMavenRepoRoot);
+        LocalRepositoryReader localRepositoryReader = new LocalRepositoryReader(localMavenRepoRoot,
+                mavenContext.getRepositorySystem());
+         localMetadataRepo = new LocalMetadataRepository(localMavenRepoRoot.toURI(), localRepoIndices.getMetadataIndex(),
+                 localRepositoryReader);
+         localArtifactRepo = new LocalArtifactRepository(localRepoIndices, localRepositoryReader);
+@@ -59,7 +61,8 @@ public class TestResolverFactory implements P2ResolverFactory {
+     }
+ 
+     private MavenContext createMavenContext(boolean offline, MavenLogger logger) {
+-        return new MavenContextImpl(getLocalRepositoryLocation(), offline, logger, new Properties());
+        return new MavenContextImpl(getLocalRepositoryLocation(), offline, logger, new Properties(),
+                new MavenRepositorySystemStub(getLocalRepositoryLocation()));
+     }
+ 
+     // TODO use TemporaryLocalMavenRepository
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
+index 05f9173f..70c5915c 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
+@@ -35,7 +35,7 @@ public class P2ResolverFactoryImpl implements P2ResolverFactory {
+     private static LocalMetadataRepository localMetadataRepository;
+     private static LocalArtifactRepository localArtifactRepository;
+ 
+-    private MavenContext mavenContext;
+    private static MavenContext mavenContext;
+     private LocalRepositoryP2Indices localRepoIndices;
+     private RemoteAgentManager remoteAgentManager;
+     private TargetDefinitionResolverService targetDefinitionResolverService;
+@@ -44,7 +44,8 @@ public class P2ResolverFactoryImpl implements P2ResolverFactory {
+             LocalRepositoryP2Indices localRepoIndices) {
+         if (localMetadataRepository == null) {
+             File localMavenRepoRoot = context.getLocalRepositoryRoot();
+-            RepositoryReader contentLocator = new LocalRepositoryReader(localMavenRepoRoot);
+            RepositoryReader contentLocator = new LocalRepositoryReader(localMavenRepoRoot,
+                    mavenContext.getRepositorySystem());
+             localMetadataRepository = new LocalMetadataRepository(localMavenRepoRoot.toURI(),
+                     localRepoIndices.getMetadataIndex(), contentLocator);
+ 
+@@ -55,7 +56,8 @@ public class P2ResolverFactoryImpl implements P2ResolverFactory {
+     private static synchronized LocalArtifactRepository getLocalArtifactRepository(MavenContext mavenContext,
+             LocalRepositoryP2Indices localRepoIndices) {
+         if (localArtifactRepository == null) {
+-            RepositoryReader contentLocator = new LocalRepositoryReader(mavenContext.getLocalRepositoryRoot());
+            RepositoryReader contentLocator = new LocalRepositoryReader(mavenContext.getLocalRepositoryRoot(),
+                    mavenContext.getRepositorySystem());
+             localArtifactRepository = new LocalArtifactRepository(localRepoIndices, contentLocator);
+         }
+         return localArtifactRepository;
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
+index 67a25154..74b8fcff 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
+@@ -47,7 +47,7 @@ public class PomDependencyCollectorImpl implements PomDependencyCollector {
+ 
+         File localRepositoryRoot = mavenContext.getLocalRepositoryRoot();
+         this.bundlesPublisher = new TargetPlatformBundlePublisher(localRepositoryRoot, project,
+-                mavenContext.getLogger());
+                mavenContext.getLogger(), mavenContext.getRepositorySystem());
+     }
+ 
+     public File getProjectLocation() {
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
+index 63794cad..ea359a2f 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
+@@ -35,6 +35,7 @@ import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
+ import org.eclipse.osgi.service.resolver.BundleDescription;
+ import org.eclipse.tycho.ReactorProject;
+ import org.eclipse.tycho.core.shared.MavenLogger;
+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+ import org.eclipse.tycho.p2.impl.publisher.MavenPropertiesAdvice;
+ import org.eclipse.tycho.p2.impl.publisher.repo.TransientArtifactRepository;
+ import org.eclipse.tycho.p2.metadata.IArtifactFacade;
+@@ -60,9 +61,10 @@ public class TargetPlatformBundlePublisher {
+     private final PublishedBundlesArtifactRepository publishedArtifacts;
+     private ReactorProject project;
+ 
+-    public TargetPlatformBundlePublisher(File localMavenRepositoryRoot, ReactorProject project, MavenLogger logger) {
+    public TargetPlatformBundlePublisher(File localMavenRepositoryRoot, ReactorProject project, MavenLogger logger,
+            MavenRepositorySystem repositorySystem) {
+         this.project = project;
+-        this.publishedArtifacts = new PublishedBundlesArtifactRepository(localMavenRepositoryRoot);
+        this.publishedArtifacts = new PublishedBundlesArtifactRepository(localMavenRepositoryRoot, repositorySystem);
+         this.logger = logger;
+     }
+ 
+@@ -373,8 +375,11 @@ public class TargetPlatformBundlePublisher {
+      */
+     private static class PublishedBundlesArtifactRepository extends ArtifactRepositoryBaseImpl<GAVArtifactDescriptor> {
+ 
+-        PublishedBundlesArtifactRepository(File localMavenRepositoryRoot) {
+        private MavenRepositorySystem repositorySystem;
+
+        PublishedBundlesArtifactRepository(File localMavenRepositoryRoot, MavenRepositorySystem repositorySystem) {
+             super(null, localMavenRepositoryRoot.toURI(), ArtifactTransferPolicies.forLocalArtifacts());
+            this.repositorySystem = repositorySystem;
+         }
+ 
+         void addPublishedArtifact(IArtifactDescriptor baseDescriptor, IArtifactFacade mavenArtifact) {
+@@ -415,7 +420,7 @@ public class TargetPlatformBundlePublisher {
+         @Override
+         protected File internalGetArtifactStorageLocation(IArtifactDescriptor descriptor) {
+             MavenRepositoryCoordinates coord = toInternalDescriptor(descriptor).getMavenCoordinates();
+-            LocalRepositoryReader reader = new LocalRepositoryReader(getBaseDir());
+            LocalRepositoryReader reader = new LocalRepositoryReader(getBaseDir(), repositorySystem);
+             return reader.getLocalArtifactLocation(coord.getGav(), coord.getClassifier(),
+                     coord.getExtensionOrDefault());
+         }
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
+index 2122578c..164d106f 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
+@@ -13,6 +13,8 @@ package org.eclipse.tycho.p2.repository;
+ 
+ import java.io.File;
+ 
+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+
+ /**
+  * This service provides access to the tycho p2 index files of the local maven repository.
+  */
+@@ -24,4 +26,5 @@ public interface LocalRepositoryP2Indices {
+ 
+     public File getBasedir();
+ 
+    public MavenRepositorySystem getRepositorySystem();
+ }
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+index 03900e27..f957c017 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+@@ -11,57 +11,31 @@
+ package org.eclipse.tycho.p2.repository;
+ 
+ import java.io.File;
+-import java.lang.reflect.Constructor;
+-import java.lang.reflect.Method;
+
+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+ 
+ public class LocalRepositoryReader implements RepositoryReader {
+ 
+     private final File localMavenRepositoryRoot;
+    private final MavenRepositorySystem repositorySystem;
+ 
+-    public LocalRepositoryReader(File localMavenRepositoryRoot) {
+    public LocalRepositoryReader(File localMavenRepositoryRoot, MavenRepositorySystem repositorySystem) {
+         this.localMavenRepositoryRoot = localMavenRepositoryRoot;
+        this.repositorySystem = repositorySystem;
+     }
+ 
+     @Override
+     public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
+-        File file = new File(localMavenRepositoryRoot,
+        File ret = new File(localMavenRepositoryRoot,
+                 RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
+-        // In Fedora the artifact may be in an XMvn-defined repository location (not in reactor cache)
+-        if (!file.exists()) {
+-            try {
+-                // Create Plexus config
+-                Class<?> pcclazz = Class.forName("org.codehaus.plexus.ContainerConfiguration");
+-                Object conf = Class.forName("org.codehaus.plexus.DefaultContainerConfiguration").newInstance();
+-                pcclazz.getMethod("setAutoWiring", boolean.class).invoke(conf, true);
+-                pcclazz.getMethod("setClassPathScanning", String.class).invoke(conf, "index");
+-
+-                // Use plexus container to lookup the reader
+-                Class<?> pclazz = Class.forName("org.codehaus.plexus.DefaultPlexusContainer");
+-                Object plexus = pclazz.getConstructor(pcclazz).newInstance(conf);
+-
+-                // Retrieve the workspace reader from the plexus container
+-                Method mLookup = pclazz.getMethod("lookup", String.class, String.class);
+-                Object reader = mLookup.invoke(plexus, "org.eclipse.aether.repository.WorkspaceReader", "ide");
+-
+-                // Create an Aether Artifact based on GAV, classifier, and extension
+-                Class<?> iartclazz = Class.forName("org.eclipse.aether.artifact.Artifact");
+-                Class<?> artclazz = Class.forName("org.eclipse.aether.artifact.DefaultArtifact");
+-                Constructor<?> cNew = artclazz.getConstructor(String.class, String.class, String.class, String.class,
+-                        String.class);
+-                Object artifact = cNew.newInstance(gav.getGroupId(), gav.getArtifactId(), classifier, extension,
+-                        gav.getVersion());
+-
+-                // Invoke "findArtifact" method of the workspace reader on the artifact
+-                Method mfindArtifact = reader.getClass().getMethod("findArtifact", iartclazz);
+-                File newFile = (File) mfindArtifact.invoke(reader, artifact);
+-                if (newFile != null) {
+-                    file = newFile;
+-                }
+-            } catch (Exception e) {
+-                e.printStackTrace();
+        if (repositorySystem != null) {
+            File tmp = repositorySystem.resolve(gav.getGroupId(), gav.getArtifactId(), gav.getVersion(), extension,
+                    classifier);
+            if (tmp != null) {
+                ret = tmp;
+             }
+         }
+-        return file;
+        return ret;
+     }
+ 
+ }
+diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
+index 5c0bcb86..a0f9fd0e 100644
+--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
+@@ -17,6 +17,7 @@ import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
+ import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
+ import org.eclipse.tycho.repository.local.LocalArtifactRepository;
+ import org.eclipse.tycho.repository.local.index.LocalRepositoryP2IndicesImpl;
+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
+ import org.eclipse.tycho.test.util.NoopFileLockService;
+ import org.junit.Rule;
+ import org.junit.rules.ExternalResource;
+@@ -72,7 +73,8 @@ public class TemporaryLocalMavenRepository extends ExternalResource {
+ 
+     public LocalArtifactRepository getLocalArtifactRepository() {
+         if (repo == null) {
+-            repo = new LocalArtifactRepository(null, getLocalRepositoryIndex());
+            repo = new LocalArtifactRepository(null, getLocalRepositoryIndex(),
+                    new MavenRepositorySystemStub(getLocalRepositoryRoot()));
+         }
+         return repo;
+     }
+diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
+new file mode 100644
+index 00000000..be02d644
+--- /dev/null
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
+@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Red Hat Inc.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tycho.test.util;
+
+import java.io.File;
+
+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+import org.eclipse.tycho.p2.repository.RepositoryLayoutHelper;
+
+public class MavenRepositorySystemStub implements MavenRepositorySystem {
+
+    private File localMavenRepositoryRoot;
+
+    public MavenRepositorySystemStub(File localMavenRepositoryRoot) {
+        this.localMavenRepositoryRoot = localMavenRepositoryRoot;
+    }
+
+    public File resolve(String gid, String aid, String version, String type, String classifier) {
+        return new File(localMavenRepositoryRoot,
+                RepositoryLayoutHelper.getRelativePath(gid, aid, version, classifier, type));
+    }
+}
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
+new file mode 100644
+index 00000000..e1d46faa
+--- /dev/null
+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
+@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Red Hat Inc.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tycho.osgi.adapters;
+
+import java.io.File;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.repository.RepositorySystem;
+import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+
+public class MavenRepositorySystemAdapter implements MavenRepositorySystem {
+
+    private RepositorySystem repoSystem;
+
+    public MavenRepositorySystemAdapter(RepositorySystem repoSystem) {
+        this.repoSystem = repoSystem;
+    }
+
+    public File resolve(String gid, String aid, String version, String type, String classifier) {
+        ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+        Artifact art = repoSystem.createArtifactWithClassifier(gid, aid, version, type, classifier);
+        req.setArtifact(art);
+        ArtifactResolutionResult res = repoSystem.resolve(req);
+        return res.getArtifacts().size() > 0 ? res.getArtifacts().toArray(new Artifact[0])[0].getFile() : null;
+    }
+
+}
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
+index 4a213418..e16c7e04 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
+@@ -18,6 +18,7 @@ import java.util.Properties;
+ import org.apache.maven.execution.MavenSession;
+ import org.apache.maven.plugin.LegacySupport;
+ import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.RepositorySystem;
+ import org.apache.maven.settings.Profile;
+ import org.apache.maven.settings.Settings;
+ import org.codehaus.plexus.component.annotations.Component;
+@@ -29,6 +30,7 @@ import org.eclipse.tycho.core.osgitools.DefaultReactorProject;
+ import org.eclipse.tycho.core.shared.MavenContext;
+ import org.eclipse.tycho.core.shared.MavenContextImpl;
+ import org.eclipse.tycho.osgi.adapters.MavenLoggerAdapter;
+import org.eclipse.tycho.osgi.adapters.MavenRepositorySystemAdapter;
+ 
+ @Component(role = EquinoxLifecycleListener.class, hint = "MavenContextConfigurator")
+ public class MavenContextConfigurator extends EquinoxLifecycleListener {
+@@ -39,6 +41,9 @@ public class MavenContextConfigurator extends EquinoxLifecycleListener {
+     @Requirement
+     private LegacySupport context;
+ 
+    @Requirement
+    private RepositorySystem repositorySystem;
+
+     @Override
+     public void afterFrameworkStarted(EmbeddedEquinox framework) {
+         MavenSession session = context.getSession();
+@@ -46,7 +51,7 @@ public class MavenContextConfigurator extends EquinoxLifecycleListener {
+         MavenLoggerAdapter mavenLogger = new MavenLoggerAdapter(logger, false);
+         Properties globalProps = getGlobalProperties(session);
+         MavenContextImpl mavenContext = new MavenContextImpl(localRepoRoot, session.isOffline(), mavenLogger,
+-                globalProps);
+                globalProps, new MavenRepositorySystemAdapter(repositorySystem));
+         for (MavenProject project : session.getProjects()) {
+             mavenContext.addProject(DefaultReactorProject.adapt(project));
+         }
+-- 
+2.28.0
+
--- a/0004-Fix-uncaught-exception.patch
+++ b/0004-Fix-uncaught-exception.patch
@ -0,0 +1,31 @@
+From 8c8bea67c3bc50acef79b2ccf2c0439c8bae5192 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 4/7] Fix uncaught exception
+
+"unreported exception org.codehaus.plexus.configuration.PlexusConfigurationException; must be caught or declared to be thrown"
+---
+ .../tycho/extras/sourcefeature/SourceFeatureMojo.java      | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tycho-extras/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java b/tycho-extras/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java
+index 0433b397..9a8e99f3 100644
+--- a/tycho-extras/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java
+++ b/tycho-extras/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java
+@@ -567,7 +567,12 @@ public class SourceFeatureMojo extends AbstractMojo {
+     }
+ 
+     private String getAttribute(PlexusConfiguration dom, String attrName) {
+-        String attr = dom.getAttribute(attrName);
+        String attr = null;
+        try {
+            attr = dom.getAttribute(attrName);
+        } catch (Exception ex) {
+            attr = null;
+        }
+         if (attr == null) {
+             return null;
+         }
+-- 
+2.28.0
+
--- a/0005-Fix-dependency-problems-when-bootstrapping-with-extr.patch
+++ b/0005-Fix-dependency-problems-when-bootstrapping-with-extr.patch
@ -0,0 +1,80 @@
+From 15b0c018b6167fb1b358383fc36d6f53260a2d7e 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 5/7] 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 8f86f86a..861652ed 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 335abfee..f44a6f2b 100644
+--- a/tycho-extras/pom.xml
+++ b/tycho-extras/pom.xml
+@@ -72,28 +72,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 8e0a4082..a032f350 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
+
--- a/0006-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
+++ b/0006-Use-custom-resolver-for-tycho-eclipserun-plugin.patch
@ -0,0 +1,51 @@
+From 8b062ae9182fbf3a50edf7c4a0c98965032efb23 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Mon, 6 May 2013 14:20:58 -0400
+Subject: [PATCH 6/7] 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 8f4cc249..28137edb 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;
+@@ -54,6 +55,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
+@@ -237,6 +239,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
+
--- a/0007-Revert-change-for-surefire-update-that-is-not-in-Fed.patch
+++ b/0007-Revert-change-for-surefire-update-that-is-not-in-Fed.patch
@ -0,0 +1,69 @@
+From d90cb4ea647623da0daab058010c454d8dc832ed Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Wed, 25 Nov 2020 10:35:26 +0000
+Subject: [PATCH 7/7] Revert change for surefire update that is not in Fedora
+
+---
+ pom.xml                                                   | 2 +-
+ .../META-INF/MANIFEST.MF                                  | 8 ++++----
+ .../tycho/surefire/osgibooter/OsgiSurefireBooter.java     | 5 ++---
+ 3 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 89500fd2..05a0fd88 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -85,7 +85,7 @@
+ 		<pluginToolsVersion>3.6.0</pluginToolsVersion>
+ 		<maven-version>3.6.3</maven-version>
+ 		<!-- NOTE: when updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
+-		<surefire-version>2.22.2</surefire-version>
+		<surefire-version>2.22.0</surefire-version>
+ 
+ 		<equinoxVersion>3.16.0</equinoxVersion>
+ 		<equinoxCompatVersion>1.2.100</equinoxCompatVersion>
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+index 3888be52..d9ae3dce 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+@@ -5,10 +5,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
+ Bundle-ActivationPolicy: lazy
+ Bundle-Version: 2.1.0
+ Bundle-ClassPath: .,
+- jars/surefire-booter-2.22.2.jar,
+- jars/surefire-api-2.22.2.jar,
+- jars/surefire-logger-api-2.22.2.jar,
+- jars/maven-surefire-common-2.22.2.jar
+ jars/surefire-booter-2.22.0.jar,
+ jars/surefire-api-2.22.0.jar,
+ jars/surefire-logger-api-2.22.0.jar,
+ jars/maven-surefire-common-2.22.0.jar
+ Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
+index 70be36f1..5734a440 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
+@@ -27,7 +27,6 @@ import java.util.Set;
+ 
+ import org.apache.maven.plugin.surefire.StartupReportConfiguration;
+ import org.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
+-import org.apache.maven.plugin.surefire.report.ConsoleReporter;
+ import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
+ import org.apache.maven.surefire.booter.BooterConstants;
+ import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
+@@ -105,8 +104,8 @@ public class OsgiSurefireBooter {
+                 extractProviderProperties(testProps), null, false, Collections.<CommandLineOption> emptyList(),
+                 skipAfterFailureCount, Shutdown.DEFAULT, 30);
+         StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
+-                ConsoleReporter.PLAIN, redirectTestOutputToFile, disableXmlReport, reportsDir, trimStackTrace, null,
+-                new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, XSD, null, false);
+                StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
+                trimStackTrace, null, new File(reportsDir, "TESTHASH"), false, rerunFailingTestsCount, XSD, null);
+         ReporterFactory reporterFactory = new DefaultReporterFactory(startupReportConfig,
+                 new PrintStreamLogger(startupReportConfig.getOriginalSystemOut()));
+         // API indicates we should use testClassLoader below but surefire also tries 
+-- 
+2.28.0
+
--- a/EmptyMojo.java
+++ b/EmptyMojo.java
@ -0,0 +1,19 @@
+package org.fedoraproject;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.AbstractMojo;
+
+/**
+ * Empty goal to fix
+ * @goal empty
+ * @phase clean
+ */
+public class EmptyMojo
+    extends AbstractMojo
+{
+    public void execute()
+        throws MojoExecutionException, MojoFailureException
+    {
+    }
+}
--- a/p2-install.sh
+++ b/p2-install.sh
@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+_prefer_jre="true"
+. /usr/share/java-utils/java-functions
+
+set_jvm
+
+set_classpath \
+    beust-jcommander \
+    eclipse/osgi \
+    slf4j/api \
+    slf4j/simple \
+    tycho/org.fedoraproject.p2 \
+    tycho/xmvn-p2-installer-plugin \
+    xmvn/xmvn-api \
+    xmvn/xmvn-core \
+
+MAIN_CLASS=org.fedoraproject.p2.app.P2InstallerApp
+run "$@"
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+SHA512 (fedoraproject-p2-290f67a4c717599b2f5166ea89aa5365571314b1.tar.gz) = 5ddfa3e7c1dc3d64335d836d74d7325904f294e0ab1782de41a8815b09ddf42f0c47a263c3a6217626aaf293a17788d01174c327e17b192a0f451d07d5655c49
+SHA512 (eclipse-bootstrap-2020-09.tar.xz) = a534271fb86e23e0a11b3c3e943b5f981fcbd16e8a0c6b826752ed82e4fd1594af8318c1483798174b0aa2871d5744b3eb404235d89bbf7ace58b5d5fb156c1a
+SHA512 (org.eclipse.tycho-tycho-2.1.0.tar.xz) = b87c99ebe76e7ab5a13e40f26d875e23c79e11ccd29329f87c641e6dff13bdf73698551a03c5347ba629a4ace260debfd5e8347b39355321328fb25aef981a6b
--- a/tycho-bootstrap.sh
+++ b/tycho-bootstrap.sh
@ -0,0 +1,115 @@
+#! /bin/bash -e
+
+. $(pwd)/tycho-scripts.sh
+
+preV=$1
+v="$preV-SNAPSHOT"
+osgiV='3.16.0.v20200914-0420'
+osgiCompatV='1.2.100.v20200914-0420'
+fp2V='0.0.1-SNAPSHOT'
+bundles=()
+bundles[0]='tycho-bundles/org.eclipse.tycho.embedder.shared'
+bundles[1]='tycho-bundles/org.eclipse.tycho.core.shared'
+bundles[2]='tycho-bundles/org.eclipse.tycho.p2.resolver.shared'
+bundles[3]='tycho-bundles/org.eclipse.tycho.p2.tools.shared'
+bundles[4]='tycho-bundles/org.eclipse.tycho.p2.maven.repository'
+bundles[5]='tycho-bundles/org.eclipse.tycho.p2.resolver.impl'
+bundles[6]='tycho-bundles/org.eclipse.tycho.p2.tools.impl'
+
+xtraBundles[0]='fedoraproject-p2/org.fedoraproject.p2'
+
+deps[0]=""
+deps[1]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar"
+deps[2]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar"
+deps[3]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.shared/target/org.eclipse.tycho.p2.resolver.shared-${v}.jar"
+deps[4]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.shared/target/org.eclipse.tycho.p2.resolver.shared-${v}.jar"
+deps[5]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.shared/target/org.eclipse.tycho.p2.resolver.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.maven.repository/target/org.eclipse.tycho.p2.maven.repository-${v}.jar:fedoraproject-p2/org.fedoraproject.p2/target/org.fedoraproject.p2-${fp2V}.jar"
+deps[6]="tycho-bundles/org.eclipse.tycho.embedder.shared/target/org.eclipse.tycho.embedder.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.core.shared/target/org.eclipse.tycho.core.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.shared/target/org.eclipse.tycho.p2.resolver.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.tools.shared/target/org.eclipse.tycho.p2.tools.shared-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.maven.repository/target/org.eclipse.tycho.p2.maven.repository-${v}.jar:tycho-bundles/org.eclipse.tycho.p2.resolver.impl/target/org.eclipse.tycho.p2.resolver.impl-${v}.jar"
+
+xtraDeps[0]=""
+
+externalDeps[4]="org.eclipse.equinox.common,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.artifact.repository,org.eclipse.osgi"
+externalDeps[5]="org.eclipse.core.runtime,org.eclipse.equinox.security,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.updatesite,org.eclipse.core.net,org.eclipse.equinox.common,org.eclipse.osgi,org.eclipse.equinox.preferences"
+externalDeps[6]="org.eclipse.equinox.p2.director.app,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.updatesite,org.eclipse.core.runtime,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.director,org.eclipse.osgi,org.eclipse.equinox.common,org.eclipse.equinox.app,org.eclipse.equinox.registry"
+
+xtraExternalDeps[0]="org.eclipse.osgi,org.eclipse.core.runtime,org.eclipse.equinox.common,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.updatesite,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.app,slf4j.api"
+
+reactorprojs=( 'tycho-embedder-api' 'tycho-metadata-model' 'sisu-equinox/sisu-equinox-api' 'sisu-equinox/sisu-equinox-embedder' 'tycho-core' 'tycho-packaging-plugin' 'tycho-p2/tycho-p2-facade' 'tycho-maven-plugin' 'tycho-p2/tycho-p2-repository-plugin' 'tycho-p2/tycho-p2-publisher-plugin' 'target-platform-configuration' 'tycho-artifactcomparator' 'sisu-equinox/sisu-equinox-launching' 'tycho-p2/tycho-p2-plugin' 'tycho-lib-detector' 'tycho-compiler-jdt' 'tycho-compiler-plugin' )
+
+for ((i=0; i < ${#xtraBundles[@]}; i++)) ;do
+  echo ''
+  echo 'Building ' ${xtraBundles[${i}]} '...'
+  echo ''
+  isolateProject ${xtraBundles[${i}]} ${fp2V}
+  minibuild ${xtraBundles[${i}]} "${xtraDeps[${i}]}" ${xtraExternalDeps[${i}]}
+  unifyProject ${xtraBundles[${i}]}
+done
+
+# TODO: stop minibuild function from hard-coding org/eclipse/tycho GID path
+dir=$(pwd)/.m2/org/fedoraproject/p2/org.fedoraproject.p2/
+mkdir -p ${dir}
+ln -s $(pwd)/.m2/org/eclipse/tycho/org.fedoraproject.p2/${fp2V} ${dir}
+
+for ((i=0; i < ${#bundles[@]}; i++)) ;do
+  echo ''
+  echo 'Building ' ${bundles[${i}]} '...'
+  echo ''
+  isolateProject ${bundles[${i}]}
+  minibuild ${bundles[${i}]} "${deps[${i}]}" ${externalDeps[${i}]}
+  unifyProject ${bundles[${i}]}
+done
+
+# Run the build on this maven reactor project
+for proj in ${reactorprojs[@]} ; do
+  isolateProject ${proj}
+  xmvn -B -o -e -f "${proj}/pom.xml" -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.test.skip=true \
+    -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dmaven.compiler.release=8 -Dproject.build.sourceEncoding=UTF-8 \
+    clean install
+  unifyProject ${proj}
+done
+
+# Add org.fedoraproject.p2 to target platform for tycho-bundles-external
+extras='bootstrap/extras'
+mkdir -p ${extras}
+fp2Loc=`find .m2 -name "org.fedoraproject.p2-*.jar"`
+cp ${fp2Loc} ${extras}
+
+# Tycho Bundles External (needed for Tycho's OSGi Runtime)
+tbeDir='tycho-bundles/tycho-bundles-external'
+tbeTargetDir="${tbeDir}/target"
+wantedBundles=`sed 's/ fragment=\"true\"//' "${tbeDir}/tycho-bundles-external.product" | sed -n 's/.*<plugin id=\"\(.*\)\"\/>.*/\1/ p'`
+
+mkdir -p ${tbeTargetDir}'/eclipse/plugins'
+copyBundles "${wantedBundles}" "${tbeTargetDir}/eclipse/plugins"
+
+pushd ${tbeTargetDir}
+
+echo "#Eclipse Product File
+#Thu Dec 19 21:40:37 EST 2013
+version=${v}
+name=org.eclipse.tycho.p2
+id=tycho-bundles-external" > 'eclipse/.eclipseproduct'
+
+mkdir -p 'eclipse/configuration'
+
+echo '#Product Runtime Configuration File
+#Thu Dec 19 21:40:37 EST 2013
+osgi.bundles=org.apache.commons.codec,org.apache.commons.logging,org.apache.httpcomponents.httpclient,org.apache.httpcomponents.httpcore,org.eclipse.core.contenttype,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.runtime@4\:start,org.eclipse.core.runtime.compatibility.registry,org.eclipse.ecf,org.eclipse.ecf.filetransfer,org.eclipse.ecf.identity,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.httpclient4,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.ssl,org.eclipse.equinox.app,org.eclipse.equinox.common@2\:start,org.eclipse.equinox.concurrent,org.eclipse.equinox.ds@2\:start,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.launcher,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.publisher.eclipse,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.transport.ecf,org.eclipse.equinox.p2.updatesite,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.equinox.security,org.eclipse.equinox.simpleconfigurator,org.eclipse.equinox.simpleconfigurator.manipulator,org.eclipse.equinox.util,org.eclipse.osgi.services,org.eclipse.osgi.compatibility.state,org.eclipse.tycho.noopsecurity,org.sat4j.core,org.sat4j.pb,org.eclipse.osgi.util,org.apache.felix.scr,org.kxml2,org.xmlpull,org.fedoraproject.p2
+osgi.bundles.defaultStartLevel=4
+eclipse.product=org.eclipse.equinox.p2.director.app.product
+osgi.splashPath=platform\:/base/plugins/org' > 'eclipse/configuration/config.ini'
+
+zip -r "tycho-bundles-external-${v}.zip" 'eclipse'
+
+popd
+
+loc=".m2/org/eclipse/tycho/tycho-bundles-external/${v}"
+
+mkdir -p ${loc}
+cp "${tbeTargetDir}/tycho-bundles-external-${v}.zip" ${loc}
+cp 'tycho-bundles/tycho-bundles-external/pom.xml' "${loc}/tycho-bundles-external-${v}.pom"
+
+sed -i "s/<equinoxVersion>.*<\/equinoxVersion>/<equinoxVersion>${osgiV}<\/equinoxVersion>/" pom.xml
+sed -i "s/<equinoxCompatVersion>.*<\/equinoxCompatVersion>/<equinoxCompatVersion>${osgiCompatV}<\/equinoxCompatVersion>/" pom.xml
+# xmvn-p2-installer-plugin needs to find the org.eclipse.osgi bundle
+sed -i "s/>\${equinox-version}</>${osgiV}</" fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml
--- a/tycho-debundle.sh
+++ b/tycho-debundle.sh
@ -0,0 +1,25 @@
+#! /bin/bash
+
+. $(pwd)/tycho-scripts.sh
+
+projLoc=$1
+zipLoc=$projLoc/target/*.zip
+mfLoc=$2
+
+zipDir=`dirname ${zipLoc}`
+zipFile=`basename ${zipLoc}`
+tmpDir=${zipDir}/tmp
+[ -z "$mfLoc" ] && mfLoc=/dev/null
+
+mkdir -p ${tmpDir}
+unzip -d ${tmpDir} ${zipLoc}
+wantedBundles=`sed 's/ fragment=\"true\"//' ${projLoc}/*.product | sed -n 's/.*<plugin id=\"\(.*\)\"\/>.*/\1/ p'`
+pushd ${tmpDir}
+pluginsDir=`find . -type d -name plugins`
+pushd ${pluginsDir} && rm -rf *
+symlinkBundles "${wantedBundles}"
+for b in *; do readlink $b; done >$mfLoc
+popd
+zip -ry ${zipFile} *
+popd
+mv ${tmpDir}/${zipFile} ${zipLoc}
--- a/tycho-scripts.sh
+++ b/tycho-scripts.sh
@ -0,0 +1,181 @@
+#! /bin/bash
+
+function minibuild () {
+
+basedir=$1
+
+src=$(cat "${basedir}/build.properties" | grep 'source..' | cut -d'=' -f2 | sed -e 's/ //g')
+output=$(cat "${basedir}/build.properties" | grep 'output..' | cut -d'=' -f2 | sed -e 's/ //g')
+bName=$(cat "${basedir}/META-INF/MANIFEST.MF" | grep 'Bundle-SymbolicName:' | sed 's/Bundle-SymbolicName: \([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/')
+artifactId=$(cat "${basedir}/pom.xml" | sed '/<parent>/,/<\/parent>/ d' | grep "<artifactId>" | sed 's/.*<artifactId>\(.*\)<\/artifactId>.*/\1/')
+version=$(cat "${basedir}/pom.xml" | grep "<version>" | sed 's/.*<version>\(.*\)<\/version>.*/\1/')
+
+# External (System) dependencies
+if [ $# -eq 3 ]; then
+  mkdir -p "${basedir}/target/externalDeps"
+  copyBundles $3 "${basedir}/target/externalDeps"
+else
+  mkdir -p "${basedir}/target"
+fi
+
+mkdir -p "${basedir}/${output}"
+
+# Compile
+cp=
+if [ $# -gt 1 ]; then
+  cp='-classpath '$2':'"${basedir}"'/target/externalDeps/*'
+fi
+
+javac -d "${basedir}/${output}" -encoding utf8 --release 8 \
+  $(for file in `find "${basedir}/${src}" -name "*.java"`; \
+    do echo -n "${file} "; \
+  done;) \
+  ${cp}
+
+# Package
+pushd ${basedir}
+pushd ${output}
+classfiles=`for file in $(find . -name "*.class"); do echo -n ' -C '${output} ${file} ; done;`
+popd
+packagefiles="${classfiles}"
+[ -e about.html ] && packagefiles="about.html $packagefiles"
+[ -e plugin.properties ] && packagefiles="plugin.properties $packagefiles"
+[ -e plugin.xml ] && packagefiles="plugin.xml $packagefiles"
+[ -e OSGI-INF ] && packagefiles="OSGI-INF $packagefiles"
+jar -cfmv "target/${bName}-${version}.jar" 'META-INF/MANIFEST.MF' ${packagefiles}
+popd
+
+# Install
+loc=".m2/org/eclipse/tycho/${artifactId}/${version}"
+mkdir -p ${loc}
+cp "${basedir}/target/${bName}-${version}.jar" ${loc}
+cp "${basedir}/pom.xml" "${loc}/${bName}-${version}.pom"
+
+}
+
+
+function copyBundles () {
+
+# X_SCLS expands to list of currently enabled SCLs, in the order they were enabled, if any
+scls="$X_SCLS"
+baseLocations=( '/usr/share/java' '/usr/lib/java' '/usr/lib/eclipse' )
+osgiLocations=(${baseLocations[@]} ${osgiLocations[@]} )
+for scl in ${scls} ; do
+  osgiLocations=( ${baseLocations[@]/#//opt/rh/${scl}/root} ${osgiLocations[@]} )
+done
+
+prefix="$(pwd)/bootstrap"
+osgiLocations=( ${osgiLocations[@]/#/${prefix}} )
+osgiLocations+=( ${osgiLocations[@]/${prefix}/} )
+osgiLocations=( ${prefix}/extras ${osgiLocations[@]} )
+
+wantedBundles=`echo $1 | tr ',' ' '`
+destDir=$2
+
+for loc in ${osgiLocations[@]} ; do
+  for jar in `find ${loc} -name "*.jar" 2>/dev/null`; do
+    bsn=`readBSN ${jar}`
+    if [ -n "${bsn}" ]; then
+      versionline=`unzip -p ${jar} 'META-INF/MANIFEST.MF' | grep 'Bundle-Version:'`
+      vers=`echo "${versionline}" | sed 's/Bundle-Version: \([a-zA-Z0-9_.-]*\).*/\1/'`
+      if echo ${wantedBundles} | grep "${bsn}" ; then
+        cp ${jar} "${destDir}/${bsn}_${vers}.jar"
+        wantedBundles=`removeFromList "${wantedBundles}" "${bsn}"`
+      fi
+    fi
+  done
+done
+
+}
+
+function symlinkBundles () {
+
+# Bootstrap Built Tycho provides some Eclipse bundles
+# Prevent non-bootstrap build's de-bundling from symlinking to them
+# SCL priority is from right to left.
+# X_SCLS expands to list of currently enabled SCLs, in the order they were enabled, if any
+scls="$X_SCLS"
+baseLocations=( '/usr/share/java/eclipse' '/usr/share/java' '/usr/lib/java' )
+osgiLocations=(${baseLocations[@]} ${osgiLocations[@]} )
+for scl in ${scls} ; do
+  osgiLocations=( ${baseLocations[@]/#//opt/rh/${scl}/root} ${osgiLocations[@]} )
+done
+
+
+wantedBundles=`echo $1 | tr ',' ' '`
+
+for loc in ${osgiLocations[@]} ; do
+  for jar in `find ${loc} -name "*.jar" 2>/dev/null`; do
+    bsn=`readBSN ${jar}`
+    if [ -n "${bsn}" ]; then
+      echo ${wantedBundles} | grep -q "${bsn}"
+      if [ $? -eq 0 ]; then
+        ln -s ${jar} "${bsn}.jar"
+        wantedBundles=`removeFromList "${wantedBundles}" "${bsn}"`
+      fi
+    fi
+  done
+done
+}
+
+function removeFromList () {
+arr=( ${1} )
+for (( i=0; i < ${#arr[@]}; i++ )); do
+  if [ "${arr[${i}]}" = "$2" ]; then
+    arr[${i}]=
+  fi
+done
+echo ${arr[@]}
+}
+
+function isolateProject () {
+  cp $1/pom.xml $1/pom.xml.boot
+
+  sed -i -e "/<artifactId>org.eclipse.osgi</ a <version>${osgiV}</version>" \
+         -e "/<artifactId>org.eclipse.osgi.compatibility.state</ a <version>${osgiCompatV}</version>" \
+         -e '/<parent>/,/<\/parent>/ d' "$1/pom.xml"
+  if ! grep -q generate-metadata "$1/pom.xml" ; then
+    sed -i -e "/<artifactId>plexus-component-metadata</ a <version>1.5.5</version><executions><execution><goals><goal>generate-metadata</goal></goals></execution></executions>" "$1/pom.xml"
+  fi
+
+  if [ $# -eq 2 ]; then
+    sed -i "/<modelVersion>/ a <groupId>org.eclipse.tycho<\/groupId><version>$2<\/version>" "$1/pom.xml"
+  else
+    sed -i "/<modelVersion>/ a <groupId>org.eclipse.tycho<\/groupId><version>${v}<\/version>" "$1/pom.xml"
+  fi
+}
+
+function unifyProject () {
+  cp $1/pom.xml.boot $1/pom.xml
+}
+
+function readBSN () {
+
+bsn=
+manEntryPat="^[a-zA-Z-]*:"
+foundBSNLine=0
+
+while read line; do
+if [ ${foundBSNLine} -eq 1 ]; then
+  echo ${line} | grep -qE ${manEntryPat}
+  if [ $? -eq 0 ]; then
+    break
+  else
+    bsn=${bsn}"`echo ${line} | sed 's/\([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`"
+  fi
+fi
+
+echo ${line} | grep -q "Bundle-SymbolicName:"
+if [ $? -eq 0 ]; then
+  bsn=`echo ${line} | grep 'Bundle-SymbolicName:' | sed 's/Bundle-SymbolicName: \([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`
+  echo ${line} | grep "Bundle-SymbolicName:" | grep -q ";"
+  if [ $? -eq 0 ]; then
+    break
+  fi
+  foundBSNLine=1
+fi
+done < <(unzip -p $1 'META-INF/MANIFEST.MF')
+
+echo ${bsn}
+
+}
--- a/tycho.spec
+++ b/tycho.spec