Merge pull request #204 from ppalaga/190919-deployer-properties

Set the missing deploy plugin properties for the reusable-test-jar ex…
apache · Sep 19, 2019 · 76570d8 · 76570d8
2 parents 4e6f90d + 7139f71
commit 76570d8
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -138,9 +138,9 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <inherited>false</inherited>
                 <executions>
                     <execution>
+                        <inherited>false</inherited>
                         <id>generate-test-poms</id>
                         <goals>
                             <goal>execute</goal>
@@ -187,6 +187,26 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.gmaven</groupId>
+                        <artifactId>groovy-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>set-deployer-properties</id>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <phase>deploy</phase>
+                                <configuration>
+                                    <source><![CDATA[
+                                        def distManagementRepo = project.version.endsWith('-SNAPSHOT') ? project.distributionManagement.snapshotRepository : project.distributionManagement.repository
+                                        project.properties.setProperty('deploy.test.jar.repositoryId', distManagementRepo.id)
+                                        project.properties.setProperty('deploy.test.jar.url', distManagementRepo.url)
+                                    ]]></source>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-deploy-plugin</artifactId>
@@ -198,6 +218,8 @@
                                 </goals>
                                 <phase>deploy</phase>
                                 <configuration>
+                                    <repositoryId>${deploy.test.jar.repositoryId}</repositoryId><!-- set via groovy above -->
+                                    <url>${deploy.test.jar.url}</url><!-- set via groovy above -->
                                     <pomFile>${basedir}/../target/${project.artifactId}-tests-pom.xml</pomFile>
                                     <version>${project.version}</version>
                                     <file>${basedir}/target/${project.artifactId}-${project.version}-tests.jar</file>