Fix #348 - Use repositories defined in project for artifact resolving (…

…#350)
mojohaus · Mar 27, 2023 · bd09417 · bd09417
1 parent 1be6c77
commit bd09417
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 2 deletions.
diff --git a/src/it/mrm/settings-no-mirror.xml b/src/it/mrm/settings-no-mirror.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+  <profiles>
+    <profile>
+      <id>it-repo</id>
+      <repositories>
+        <repository>
+          <id>snapshots</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>snapshots</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>it-repo</activeProfile>
+  </activeProfiles>
+</settings>
diff --git a/src/it/projects/issue-348-repository-from-project/invoker.properties b/src/it/projects/issue-348-repository-from-project/invoker.properties
@@ -0,0 +1 @@
+invoker.settingsFile = src/it/mrm/settings-no-mirror.xml
diff --git a/src/it/projects/issue-348-repository-from-project/pom.xml b/src/it/projects/issue-348-repository-from-project/pom.xml
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.github.zuisong</groupId>
+  <artifactId>flatten-maven-plugin-issue348</artifactId>
+  <version>0.0.1</version>
+
+  <description>Check if repository in project is considered</description>
+
+  <url>https://github.com/mojohaus/flatten-maven-plugin/issues/348</url>
+
+  <repositories>
+    <repository>
+      <id>repository.spring.milestone</id>
+      <name>Spring Milestone Repository</name>
+      <url>https://repo.spring.io/milestone</url>
+    </repository>
+  </repositories>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>3.0.0-M5</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/src/it/projects/issue-348-repository-from-project/verify.groovy b/src/it/projects/issue-348-repository-from-project/verify.groovy
@@ -0,0 +1,12 @@
+
+import groovy.xml.XmlSlurper
+
+File flattendPom = new File( basedir, '.flattened-pom.xml' )
+assert flattendPom.exists()
+
+def flattendProject = new XmlSlurper().parse( flattendPom )
+assert 1 ==  flattendProject.repositories.size()
+
+assert 1 ==  flattendProject.dependencies.size()
+assert 'spring-core' ==  flattendProject.dependencies.dependency.artifactId.text()
+assert '6.0.0-M6' ==  flattendProject.dependencies.dependency.version.text()
diff --git a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java
@@ -800,7 +800,7 @@ private ModelBuildingRequest createModelBuildingRequest(File pomFile) {
                 repositorySystem,
                 trace,
                 context,
-                RepositoryUtils.toRepos(session.getProjectBuildingRequest().getRemoteRepositories()),
+                project.getRemoteProjectRepositories(),
                 getReactorModelsFromSession());
         Properties userProperties = this.session.getUserProperties();
         List<String> activeProfiles = this.session.getRequest().getActiveProfiles();
@@ -1028,7 +1028,7 @@ private void createFlattenedDependenciesAll(
         final Artifact projectArtifact = this.project.getArtifact();
 
         CollectRequest collectRequest = new CollectRequest();
-        collectRequest.setRepositories(project.getRemotePluginRepositories());
+        collectRequest.setRepositories(project.getRemoteProjectRepositories());
         collectRequest.setRootArtifact(RepositoryUtils.toArtifact(projectArtifact));
         for (Dependency dependency : projectDependencies) {
             collectRequest.addDependency(RepositoryUtils.toDependency(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		invoker.settingsFile = src/it/mrm/settings-no-mirror.xml