diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-05-15 17:34:15 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-05-16 07:05:28 +0700 |
| commit | fcb563dee0a426645cc9c1935869ac8e79f2426c (patch) | |
| tree | 3bbc6e1f7384cab7fb48e113315b5dafa796ba1e | |
| parent | f9bd419b71a6071d8ec5c903b1ea8e79a841b8b1 (diff) | |
| download | aspectj-fcb563dee0a426645cc9c1935869ac8e79f2426c.tar.gz aspectj-fcb563dee0a426645cc9c1935869ac8e79f2426c.zip | |
Fix selective Nexus deployment to Sonatype OSSRH
Other than Maven Deploy, Nexus Staging plugin cannot just be added to
the 'build/plugins' section of the parent POM once and (de-)activated
with a simple property like 'maven.deploy.skip' on a per-module basis.
See also https://issues.sonatype.org/browse/OSSRH-68966. Consequently,
we do not add it to the parent but separately to each module meant to be
published.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
| -rw-r--r-- | asm-renamed/pom.xml | 6 | ||||
| -rw-r--r-- | aspectjmatcher/pom.xml | 6 | ||||
| -rw-r--r-- | aspectjrt/pom.xml | 6 | ||||
| -rw-r--r-- | aspectjtools/pom.xml | 7 | ||||
| -rw-r--r-- | aspectjweaver/pom.xml | 6 | ||||
| -rw-r--r-- | pom.xml | 16 |
6 files changed, 39 insertions, 8 deletions
diff --git a/asm-renamed/pom.xml b/asm-renamed/pom.xml index e62b98565..6a7b479b4 100644 --- a/asm-renamed/pom.xml +++ b/asm-renamed/pom.xml @@ -254,6 +254,12 @@ </executions> </plugin> + <!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) --> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + </plugin> + </plugins> </build> diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml index ff456caa1..6dd942809 100644 --- a/aspectjmatcher/pom.xml +++ b/aspectjmatcher/pom.xml @@ -235,6 +235,12 @@ </executions> </plugin> + <!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) --> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + </plugin> + </plugins> </build> diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml index c674b3601..bc5e36e59 100644 --- a/aspectjrt/pom.xml +++ b/aspectjrt/pom.xml @@ -228,6 +228,12 @@ </executions> </plugin> + <!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) --> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + </plugin> + </plugins> </build> diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml index 03bb6ed96..78b8539f5 100644 --- a/aspectjtools/pom.xml +++ b/aspectjtools/pom.xml @@ -258,6 +258,13 @@ </execution> </executions> </plugin> + + <!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) --> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + </plugin> + </plugins> </build> diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml index 4db51b332..5e4ec2e40 100644 --- a/aspectjweaver/pom.xml +++ b/aspectjweaver/pom.xml @@ -260,6 +260,12 @@ </executions> </plugin> + <!-- Deploy this module to Nexus (Sonatype OSSRH, releases promotable to Maven Central) --> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + </plugin> + </plugins> </build> @@ -19,7 +19,7 @@ <!-- By default, do not deploy artifacts - override for the ones which actually should be deployed --> <maven.deploy.skip>true</maven.deploy.skip> - <!-- By default, do create javadoc - override in release profile or manually --> + <!-- By default, do not create javadoc - override in release profile or manually --> <maven.javadoc.skip>true</maven.javadoc.skip> <!-- Dependency versions --> @@ -189,7 +189,7 @@ <profile> <id>release</id> <properties> - <!-- By default, do create javadoc - override in release profile --> + <!-- By default, do not create javadoc - override in release profile --> <maven.javadoc.skip>false</maven.javadoc.skip> </properties> <build> @@ -198,10 +198,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - </plugin> </plugins> </build> </profile> @@ -351,6 +347,12 @@ </configuration> </plugin> <plugin> + <!-- + Other than Maven Deploy, this plugin cannot just be added to the 'build/plugins' section of the parent POM + once and (de-)activated with a simple property like 'maven.deploy.skip' on a per-module basis. See also + https://issues.sonatype.org/browse/OSSRH-68966. Consequently, we do not add it to the parent but separately + to each module meant to be published. + --> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <version>1.6.8</version> @@ -359,8 +361,6 @@ <serverId>ossrh</serverId> <nexusUrl>https://oss.sonatype.org/</nexusUrl> <autoReleaseAfterClose>false</autoReleaseAfterClose> - <!-- Only stage artifacts to which are also meant to be deployed --> - <skipStaging>${maven.deploy.skip}</skipStaging> </configuration> </plugin> <plugin> |