41
41
import org .apache .maven .model .Dependency ;
42
42
import org .apache .maven .model .Model ;
43
43
import org .apache .maven .project .MavenProject ;
44
- import org .apache .maven .repository .RepositorySystem ;
45
44
import org .apache .maven .settings .Settings ;
46
45
import org .codehaus .plexus .logging .Logger ;
46
+ import org .eclipse .aether .RepositorySystem ;
47
47
import org .eclipse .equinox .p2 .metadata .IInstallableUnit ;
48
48
import org .eclipse .tycho .ArtifactDescriptor ;
49
49
import org .eclipse .tycho .ArtifactKey ;
@@ -155,6 +155,7 @@ public static void injectMavenDependencies(MavenProject project, DependencyArtif
155
155
.flatMap (definition -> definition .getLocations ().stream ()).filter (MavenGAVLocation .class ::isInstance )
156
156
.map (MavenGAVLocation .class ::cast ).flatMap (location -> location .getRepositoryReferences ().stream ())
157
157
.toList ();
158
+ //FIXME this should be injected in the model building phase so maven can figure it out directly!
158
159
if (repositoryReferences != null && !repositoryReferences .isEmpty ()) {
159
160
Map <String , ArtifactRepository > repositoryMap = project .getRemoteArtifactRepositories ().stream ()
160
161
.collect (Collectors .toMap (MavenDependencyInjector ::getId , Function .identity (), (a , b ) -> a ,
@@ -163,19 +164,19 @@ public static void injectMavenDependencies(MavenProject project, DependencyArtif
163
164
String id = getId (reference );
164
165
ArtifactRepository artifactRepository = repositoryMap .get (id );
165
166
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));
168
169
} else if (!artifactRepository .getUrl ().equals (reference .getUrl ())) {
169
170
logger .warn ("Target defines an artifact repository with the ID " + id
170
171
+ " but there is already a repository for that ID mapped to a different URL! (target URL = "
171
172
+ reference .getUrl () + ", existing URL = " + artifactRepository .getUrl ());
172
173
}
173
174
}
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);
179
180
}
180
181
}
181
182
0 commit comments