Fixing an issue with distribution management repositories losing auth…

…entication settings.
repaint-io · Dec 11, 2023 · e5bedd5 · e5bedd5
1 parent 66f6450
commit e5bedd5
Showing 1 changed file with 26 additions and 19 deletions.
diff --git a/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy b/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy
@@ -361,28 +361,35 @@ class TilesMavenLifecycleParticipant extends AbstractMavenLifecycleParticipant {
 
 		if (distributionManagement) {
 			if (distributionManagement.repository) {
-
-				ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.repository.layout);
-				MavenArtifactRepository repo = new MavenArtifactRepository(
-						distributionManagement.repository.id,
-						getReleaseDistributionManagementRepositoryUrl(project),
-						layout,
-						getArtifactRepositoryPolicy(distributionManagement.repository.snapshots),
-						getArtifactRepositoryPolicy(distributionManagement.repository.releases))
-				project.setReleaseArtifactRepository(repo)
+				var candidate = project.getRemoteArtifactRepositories().find {	it.id == distributionManagement.repository.id }
+				if( candidate !=null && candidate instanceof MavenArtifactRepository) {
+					project.setReleaseArtifactRepository(candidate)
+				} else {
+					ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.repository.layout);
+					MavenArtifactRepository repo = new MavenArtifactRepository(
+							distributionManagement.repository.id,
+							getReleaseDistributionManagementRepositoryUrl(project),
+							layout,
+							getArtifactRepositoryPolicy(distributionManagement.repository.snapshots),
+							getArtifactRepositoryPolicy(distributionManagement.repository.releases))
+					project.setReleaseArtifactRepository(repo)
+				}
 
 			}
 			if (distributionManagement.snapshotRepository) {
-
-				ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.snapshotRepository.layout);
-				MavenArtifactRepository repo = new MavenArtifactRepository(
-						distributionManagement.snapshotRepository.id,
-						getSnapshotDistributionManagementRepositoryUrl(project),
-						layout,
-						getArtifactRepositoryPolicy(distributionManagement.snapshotRepository.snapshots),
-						getArtifactRepositoryPolicy(distributionManagement.snapshotRepository.releases))
-				project.setSnapshotArtifactRepository(repo)
-
+				var candidate = project.getRemoteArtifactRepositories().find {	it.id == distributionManagement.snapshotRepository.id }
+				if( candidate !=null && candidate instanceof MavenArtifactRepository) {
+					project.setSnapshotArtifactRepository(candidate)
+				} else {
+					ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.snapshotRepository.layout);
+					MavenArtifactRepository repo = new MavenArtifactRepository(
+							distributionManagement.snapshotRepository.id,
+							getSnapshotDistributionManagementRepositoryUrl(project),
+							layout,
+							getArtifactRepositoryPolicy(distributionManagement.snapshotRepository.snapshots),
+							getArtifactRepositoryPolicy(distributionManagement.snapshotRepository.releases))
+					project.setSnapshotArtifactRepository(repo)
+				}
 			}
 		}
 	}