diff --git a/src/it/mrm/settings-no-mirror.xml b/src/it/mrm/settings-no-mirror.xml new file mode 100644 index 00000000..2f045db9 --- /dev/null +++ b/src/it/mrm/settings-no-mirror.xml @@ -0,0 +1,47 @@ + + + + + + it-repo + + + snapshots + @localRepositoryUrl@ + + true + ignore + never + + + true + ignore + always + + + + + + snapshots + @localRepositoryUrl@ + + true + ignore + never + + + true + ignore + always + + + + + + + it-repo + + \ No newline at end of file diff --git a/src/it/projects/issue-348-repository-from-project/invoker.properties b/src/it/projects/issue-348-repository-from-project/invoker.properties new file mode 100644 index 00000000..e5174222 --- /dev/null +++ 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 new file mode 100644 index 00000000..85e310a8 --- /dev/null +++ b/src/it/projects/issue-348-repository-from-project/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + org.github.zuisong + flatten-maven-plugin-issue348 + 0.0.1 + + Check if repository in project is considered + + https://github.com/mojohaus/flatten-maven-plugin/issues/348 + + + + repository.spring.milestone + Spring Milestone Repository + https://repo.spring.io/milestone + + + + + + + org.springframework.boot + spring-boot-dependencies + 3.0.0-M5 + pom + import + + + + + + + org.springframework + spring-core + + + + diff --git a/src/it/projects/issue-348-repository-from-project/verify.groovy b/src/it/projects/issue-348-repository-from-project/verify.groovy new file mode 100644 index 00000000..306bee89 --- /dev/null +++ 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 index f8b36c66..5d1f4f21 100644 --- 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 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(