diff --git a/src/it/distributionManagemetTile/invoker.properties b/src/it/distributionManagemetTile/invoker.properties index c9cdf7b..1265339 100644 --- a/src/it/distributionManagemetTile/invoker.properties +++ b/src/it/distributionManagemetTile/invoker.properties @@ -1 +1 @@ -invoker.goals = clean dependency:go-offline help:effective-pom +invoker.goals = clean dependency:go-offline help:effective-pom deploy diff --git a/src/it/distributionManagemetTile/pom.xml b/src/it/distributionManagemetTile/pom.xml index d20c148..54b50e9 100644 --- a/src/it/distributionManagemetTile/pom.xml +++ b/src/it/distributionManagemetTile/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.repaint.maven @@ -7,10 +8,24 @@ 1.0-SNAPSHOT pom - Maven Tiles Order Test + Maven Tiles Distribution Management Test tileA projectA + + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + true + + + + + diff --git a/src/it/distributionManagemetTile/tileA/pom.xml b/src/it/distributionManagemetTile/tileA/pom.xml index 71ab6de..7e17ab9 100644 --- a/src/it/distributionManagemetTile/tileA/pom.xml +++ b/src/it/distributionManagemetTile/tileA/pom.xml @@ -9,6 +9,19 @@ Maven Tiles Distribution Management Test - TileA + + + repaint-staging + io.repaint Staging Repository + file:///tmp/maven-tiles/staging/ + + + repaint-snapshots + io.repaint Snapshot Repository + file:///tmp/maven-tiles/snapshot/ + + + diff --git a/src/it/distributionManagemetTile/tileA/tile.xml b/src/it/distributionManagemetTile/tileA/tile.xml index 2168641..5773dcb 100644 --- a/src/it/distributionManagemetTile/tileA/tile.xml +++ b/src/it/distributionManagemetTile/tileA/tile.xml @@ -4,14 +4,14 @@ - sonatype-staging - oss.sonatype.org Staging Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + repaint-tile-staging + io.repaint Staging Repository + file:///tmp/maven-tiles/staging/ - sonatype-snapshots - oss.sonatype.org Snapshot Repository - https://oss.sonatype.org/content/repositories/snapshots/ + repaint-tile-snapshots + io.repaint Snapshot Repository + file:///tmp/maven-tiles/snapshot/ diff --git a/src/it/distributionManagemetTile/verify.bsh b/src/it/distributionManagemetTile/verify.bsh index bae48af..1da0e27 100644 --- a/src/it/distributionManagemetTile/verify.bsh +++ b/src/it/distributionManagemetTile/verify.bsh @@ -9,5 +9,7 @@ if ( !file.isFile() ) { String content = new Scanner(file).useDelimiter("\\Z").next(); // tileX should win -if (!content.contains("oss.sonatype.org Staging Repository")) - throw new Exception("oss.sonatype.org Staging Repository expected to be in effective pom"); +if (!content.contains("repaint-tile-staging")) + throw new Exception("repaint-tile-staging expected to be in effective pom"); +if (!content.contains("io.repaint Staging Repository")) + throw new Exception("io.repaint Staging Repository expected to be in effective pom"); diff --git a/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy b/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy index 628e065..4ac6354 100644 --- a/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy +++ b/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy @@ -374,14 +374,14 @@ class TilesMavenLifecycleParticipant extends AbstractMavenLifecycleParticipant { } if (distributionManagement.snapshotRepository) { - ArtifactRepositoryLayout layout = repositoryLayouts.get(distributionManagement.repository.layout); + 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.setReleaseArtifactRepository(repo) + project.setSnapshotArtifactRepository(repo) } }