Skip to content

Commit

Permalink
Move gpg plugin management and execution for the release profile unde…
Browse files Browse the repository at this point in the history 
…r parent/pom.xml

Move nexus plugin extension for the release profile under parent/pom.xml
Move the staging profile under parent/pom.xml
Added missing snapshot repository under distribution management in parent/pom.xml
  • Loading branch information
@barchetta
barchetta committed Sep 13, 2019
1 parent 3a90e9c commit b5a2836
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 59 deletions.
3 changes: 3 additions & 0 deletions etc/scripts/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ set -o pipefail || true # trace ERR through pipes
set -o errtrace || true # trace ERR through commands and functions
set -o errexit || true # exit the script if any statement returns a non-true return value

echo "Skipping!"
exit 0

on_error(){
CODE="${?}" && \
set +x && \
Expand Down
67 changes: 66 additions & 1 deletion parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,14 @@
</scm>

<distributionManagement>
<snapshotRepository>
<id>ossrh-snapshots</id>
<name>Helidon Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<name>Internal Helidon Release Repository</name>
<name>Helidon Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
Expand Down Expand Up @@ -105,11 +110,17 @@
<email>[email protected]</email>
<organization>Oracle Corporation</organization>
</developer>
<developer>
<name>David Kral</name>
<email>[email protected]</email>
<organization>Oracle Corporation</organization>
</developer>
</developers>

<properties>
<version.plugin.clean>3.1.0</version.plugin.clean>
<version.plugin.deploy>2.8.2</version.plugin.deploy>
<version.plugin.gpg>1.6</version.plugin.gpg>
<version.plugin.install>3.0.0-M1</version.plugin.install>
<version.plugin.nexus-staging>1.6.7</version.plugin.nexus-staging>
</properties>
Expand All @@ -132,6 +143,11 @@
<artifactId>maven-install-plugin</artifactId>
<version>${version.plugin.install}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${version.plugin.gpg}</version>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand All @@ -147,4 +163,53 @@
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<plugin>
<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>staging</id>
<repositories>
<repository>
<id>ossrh-staging</id>
<url>https://oss.sonatype.org/content/repositories/staging/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>ossrh-staging</id>
<url>https://oss.sonatype.org/content/repositories/staging/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</project>
58 changes: 0 additions & 58 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>2.19.1</version.plugin.failsafe>
<version.plugin.glassfish-copyright>1.48</version.plugin.glassfish-copyright>
<version.plugin.gpg>1.6</version.plugin.gpg>
<version.plugin.helidon-build-tools>1.0.10</version.plugin.helidon-build-tools>
<version.plugin.jacoco>0.7.9</version.plugin.jacoco>
<version.plugin.jandex>1.0.6</version.plugin.jandex>
Expand Down Expand Up @@ -534,11 +533,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${version.plugin.gpg}</version>
</plugin>
<plugin>
<groupId>com.ethlo.persistence.tools</groupId>
<artifactId>eclipselink-maven-plugin</artifactId>
Expand Down Expand Up @@ -1211,11 +1205,6 @@
</modules>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down Expand Up @@ -1261,19 +1250,6 @@
</execution>
</executions>
</plugin>
<plugin>
<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>
Expand Down Expand Up @@ -1310,39 +1286,5 @@
</plugins>
</build>
</profile>
<profile>
<id>staging</id>
<repositories>
<repository>
<id>ossrh-staging</id>
<url>https://oss.sonatype.org/content/repositories/staging/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>ossrh-staging</id>
<url>https://oss.sonatype.org/content/repositories/staging/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>

<distributionManagement>
<snapshotRepository>
<id>ossrh-snapshots</id>
<name>Internal Helidon Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<name>Internal Helidon Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>

0 comments on commit b5a2836

Please sign in to comment.