Skip to content

Commit

Permalink
Fix deploy,sign,Javadoc and source plugins after experimenting with p…
Browse files Browse the repository at this point in the history 
…ublishing artifacts
  • Loading branch information
@fabiobrz
fabiobrz committed Jan 26, 2024
1 parent f0bd32d commit d2d2a26
Show file tree
Hide file tree
Showing 10 changed files with 103 additions and 41 deletions.
10 changes: 3 additions & 7 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@

<build>
<plugins>
<!--
The intersmash-core POM must be published because is transitively pulled in by the build
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
Expand Down Expand Up @@ -117,13 +120,6 @@
<id>publish</id>
<build>
<plugins>
<!--
The intersmash-core POM must be published because is transitively pulled in by the build
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
19 changes: 19 additions & 0 deletions examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,23 @@
<module>wstrust</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
16 changes: 8 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,14 @@
</java>
</configuration>
</plugin>
<!--
The intersmash-parent POM must be published because there are projects which could use it, even as a
transitive dependency
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand All @@ -619,14 +627,6 @@
<id>publish</id>
<build>
<plugins>
<!--
The intersmash-parent POM must be published because there are projects which could use it, even as a
transitive dependency
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
17 changes: 10 additions & 7 deletions provisioners/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,13 @@
</execution>
</executions>
</plugin>
<!--
The intersmash-provisioners POM must be published because is transitively pulled in by the build
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand All @@ -267,6 +274,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>none</doclint>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -283,13 +293,6 @@
<id>publish</id>
<build>
<plugins>
<!--
The intersmash-core POM must be published because is transitively pulled in by the build
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions testsuite/deployments/deployments-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -102,10 +106,6 @@
<id>publish</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
16 changes: 16 additions & 0 deletions testsuite/deployments/eap7-shared/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,22 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
Expand Down
9 changes: 1 addition & 8 deletions testsuite/deployments/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<name>Intersmash Test Deployments</name>

<modules>
<module>deployments-provider</module>
<module>wildfly-shared</module>
<module>openshift-jakarta-sample-standalone</module>
<module>eap7-shared</module>
<module>deployments-provider</module>
</modules>

<properties>
Expand Down Expand Up @@ -117,9 +117,6 @@
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<!--
The test-deployments POM and submodules must be published because are pulled in transitively
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
Expand All @@ -131,10 +128,6 @@
<id>publish</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
16 changes: 16 additions & 0 deletions testsuite/deployments/wildfly-shared/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,22 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
Expand Down
14 changes: 14 additions & 0 deletions testsuite/integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,20 @@
<excludedGroups>${intersmash.test.excludedGroups.by.execution-profile},${intersmash.test.excludedGroups.by.wildfly-target-distribution}</excludedGroups>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
19 changes: 12 additions & 7 deletions testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,23 @@
</dependencies>
</dependencyManagement>

<build>
<plugins>
<!--
The intersmash-testsuite POM must be published because is transitively pulled in by the build
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>publish</id>
<build>
<plugins>
<!--
The intersmash-testsuite POM must be published because is transitively pulled in by the build
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down

0 comments on commit d2d2a26

Please sign in to comment.