Fixing an issue with distribution management repositories losing authentication settings.

This commit is contained in:
Riesen, Stefan 2023-11-27 12:54:36 +01:00 committed by Mark Derricutt
parent 66f6450a2d
commit e5bedd523c

View File

@ -361,28 +361,35 @@ class TilesMavenLifecycleParticipant extends AbstractMavenLifecycleParticipant {
if (distributionManagement) { if (distributionManagement) {
if (distributionManagement.repository) { if (distributionManagement.repository) {
var candidate = project.getRemoteArtifactRepositories().find { it.id == distributionManagement.repository.id }
ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.repository.layout); if( candidate !=null && candidate instanceof MavenArtifactRepository) {
MavenArtifactRepository repo = new MavenArtifactRepository( project.setReleaseArtifactRepository(candidate)
distributionManagement.repository.id, } else {
getReleaseDistributionManagementRepositoryUrl(project), ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.repository.layout);
layout, MavenArtifactRepository repo = new MavenArtifactRepository(
getArtifactRepositoryPolicy(distributionManagement.repository.snapshots), distributionManagement.repository.id,
getArtifactRepositoryPolicy(distributionManagement.repository.releases)) getReleaseDistributionManagementRepositoryUrl(project),
project.setReleaseArtifactRepository(repo) layout,
getArtifactRepositoryPolicy(distributionManagement.repository.snapshots),
getArtifactRepositoryPolicy(distributionManagement.repository.releases))
project.setReleaseArtifactRepository(repo)
}
} }
if (distributionManagement.snapshotRepository) { if (distributionManagement.snapshotRepository) {
var candidate = project.getRemoteArtifactRepositories().find { it.id == distributionManagement.snapshotRepository.id }
ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.snapshotRepository.layout); if( candidate !=null && candidate instanceof MavenArtifactRepository) {
MavenArtifactRepository repo = new MavenArtifactRepository( project.setSnapshotArtifactRepository(candidate)
distributionManagement.snapshotRepository.id, } else {
getSnapshotDistributionManagementRepositoryUrl(project), ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.snapshotRepository.layout);
layout, MavenArtifactRepository repo = new MavenArtifactRepository(
getArtifactRepositoryPolicy(distributionManagement.snapshotRepository.snapshots), distributionManagement.snapshotRepository.id,
getArtifactRepositoryPolicy(distributionManagement.snapshotRepository.releases)) getSnapshotDistributionManagementRepositoryUrl(project),
project.setSnapshotArtifactRepository(repo) layout,
getArtifactRepositoryPolicy(distributionManagement.snapshotRepository.snapshots),
getArtifactRepositoryPolicy(distributionManagement.snapshotRepository.releases))
project.setSnapshotArtifactRepository(repo)
}
} }
} }
} }