Skip to content

Commit

Permalink
Merge pull request #38262 from gsmet/auto-deploy
Browse files Browse the repository at this point in the history 
[3.2] Remove config overriding the parent config
  • Loading branch information
@aloubyansky
aloubyansky authored Jan 18, 2024
2 parents bc41c19 + 40f0785 commit 0a3c72e
Show file tree
Hide file tree
Showing 19 changed files with 29 additions and 661 deletions.
70 changes: 0 additions & 70 deletions build-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,76 +890,6 @@
</plugins>
</build>
</profile>

<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<serverId>ossrh</serverId>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
<keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!--
## IMPORTANT ##
In your ~/.m2/settings.xml you need to add and edit the following profile:
<profile>
<id>release</id>
<properties>
<gpg.useagent>false</gpg.useagent>
<gpg.executable>/usr/local/Cellar/[email protected]/1.4.23_1/bin/gpg1</gpg.executable> <- use gpg1 on Mac OS X
<gpg.homedir>~/.gnupg</gpg.homedir> <- Update to your own directory
<gpg.passphrase>******</gpg.passphrase> <- Add your passphrase
</properties>
</profile>
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>dokka</id>
<activation>
Expand Down
1 change: 0 additions & 1 deletion devtools/gradle/gradle-application-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
Expand Down
3 changes: 1 addition & 2 deletions devtools/gradle/gradle-extension-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,10 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
1 change: 0 additions & 1 deletion extensions/spring-web/resteasy-classic/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion extensions/spring-web/resteasy-reactive/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
Expand Down
63 changes: 0 additions & 63 deletions independent-projects/arc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<version.compiler.plugin>3.11.0</version.compiler.plugin>
<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.0.0</version.surefire.plugin>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
</properties>

<modules>
Expand Down Expand Up @@ -341,68 +340,6 @@
<format.skip>true</format.skip>
</properties>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<serverId>ossrh</serverId>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
<keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!-- ## IMPORTANT ## In your ~/.m2/settings.xml you
need to add and edit the following profile: <profile> <id>release</id> <properties>
<gpg.useagent>false</gpg.useagent> <gpg.executable>/usr/local/Cellar/[email protected]/1.4.23_1/bin/gpg1</gpg.executable>
<- use gpg1 on Mac OS X <gpg.homedir>~/.gnupg</gpg.homedir> <- Update to
your own directory <gpg.passphrase>******</gpg.passphrase> <- Add your passphrase
</properties> </profile> -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>format</id>
<activation>
Expand Down
1 change: 0 additions & 1 deletion independent-projects/arc/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
Expand Down
68 changes: 0 additions & 68 deletions independent-projects/bootstrap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<version.compiler.plugin>3.11.0</version.compiler.plugin>
<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.0.0</version.surefire.plugin>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<jandex.version>3.1.6</jandex.version>

<!-- Dependency versions -->
Expand Down Expand Up @@ -283,73 +282,6 @@
<format.skip>true</format.skip>
</properties>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<serverId>ossrh</serverId>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
<keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!-- ## IMPORTANT ## In your ~/.m2/settings.xml you
need to add and edit the following profile:
<profile>
<id>release</id>
<properties>
<gpg.useagent>false</gpg.useagent>
<gpg.executable>/usr/local/Cellar/[email protected]/1.4.23_1/bin/gpg1</gpg.executable> <- use gpg1 on Mac OS X
<gpg.homedir>~/.gnupg</gpg.homedir> <- Update to your own directory <gpg.passphrase>******</gpg.passphrase> <- Add your passphrase
</properties>
</profile>
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>format</id>
<activation>
Expand Down
63 changes: 0 additions & 63 deletions independent-projects/enforcer-rules/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<maven-invoker-plugin.version>3.5.1</maven-invoker-plugin.version>
<maven-core.version>3.8.8</maven-core.version>

<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<!--
Supported Maven versions, interpreted as a version range (Also defined in build-parent)
-->
Expand Down Expand Up @@ -210,68 +209,6 @@
<invoker.skip>true</invoker.skip> <!-- maven-invoker-plugin -->
</properties>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<serverId>ossrh</serverId>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
<keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!-- ## IMPORTANT ## In your ~/.m2/settings.xml you
need to add and edit the following profile: <profile> <id>release</id> <properties>
<gpg.useagent>false</gpg.useagent> <gpg.executable>/usr/local/Cellar/[email protected]/1.4.23_1/bin/gpg1</gpg.executable>
<- use gpg1 on Mac OS X <gpg.homedir>~/.gnupg</gpg.homedir> <- Update to
your own directory <gpg.passphrase>******</gpg.passphrase> <- Add your passphrase
</properties> </profile> -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>format</id>
<activation>
Expand Down
Loading

0 comments on commit 0a3c72e

Please sign in to comment.