Skip to content

Commit 7e7357d

Browse files
committed
Disable injection of target extra repositories
1 parent 8794b56 commit 7e7357d

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

tycho-core/src/main/java/org/eclipse/tycho/core/maven/MavenDependencyInjector.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
import org.apache.maven.model.Dependency;
4242
import org.apache.maven.model.Model;
4343
import org.apache.maven.project.MavenProject;
44-
import org.apache.maven.repository.RepositorySystem;
4544
import org.apache.maven.settings.Settings;
4645
import org.codehaus.plexus.logging.Logger;
46+
import org.eclipse.aether.RepositorySystem;
4747
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
4848
import org.eclipse.tycho.ArtifactDescriptor;
4949
import org.eclipse.tycho.ArtifactKey;
@@ -155,6 +155,7 @@ public static void injectMavenDependencies(MavenProject project, DependencyArtif
155155
.flatMap(definition -> definition.getLocations().stream()).filter(MavenGAVLocation.class::isInstance)
156156
.map(MavenGAVLocation.class::cast).flatMap(location -> location.getRepositoryReferences().stream())
157157
.toList();
158+
//FIXME this should be injected in the model building phase so maven can figure it out directly!
158159
if (repositoryReferences != null && !repositoryReferences.isEmpty()) {
159160
Map<String, ArtifactRepository> repositoryMap = project.getRemoteArtifactRepositories().stream()
160161
.collect(Collectors.toMap(MavenDependencyInjector::getId, Function.identity(), (a, b) -> a,
@@ -163,19 +164,19 @@ public static void injectMavenDependencies(MavenProject project, DependencyArtif
163164
String id = getId(reference);
164165
ArtifactRepository artifactRepository = repositoryMap.get(id);
165166
if (artifactRepository == null) {
166-
repositoryMap.put(id,
167-
repositorySystem.createArtifactRepository(id, reference.getUrl(), null, null, null));
167+
// repositoryMap.put(id,
168+
// repositorySystem.createArtifactRepository(id, reference.getUrl(), null, null, null));
168169
} else if (!artifactRepository.getUrl().equals(reference.getUrl())) {
169170
logger.warn("Target defines an artifact repository with the ID " + id
170171
+ " but there is already a repository for that ID mapped to a different URL! (target URL = "
171172
+ reference.getUrl() + ", existing URL = " + artifactRepository.getUrl());
172173
}
173174
}
174-
List<ArtifactRepository> artifactRepositories = new ArrayList<>(repositoryMap.values());
175-
repositorySystem.injectMirror(artifactRepositories, settings.getMirrors());
176-
repositorySystem.injectProxy(artifactRepositories, settings.getProxies());
177-
repositorySystem.injectAuthentication(artifactRepositories, settings.getServers());
178-
project.setRemoteArtifactRepositories(artifactRepositories);
175+
// List<ArtifactRepository> artifactRepositories = new ArrayList<>(repositoryMap.values());
176+
// repositorySystem.injectMirror(artifactRepositories, settings.getMirrors());
177+
// repositorySystem.injectProxy(artifactRepositories, settings.getProxies());
178+
// repositorySystem.injectAuthentication(artifactRepositories, settings.getServers());
179+
// project.setRemoteArtifactRepositories(artifactRepositories);
179180
}
180181
}
181182

0 commit comments

Comments
 (0)