Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit 72bf98a

Browse files
stepanvstepanv
committed
JERSEY-3122: Jersey release improvements
* Using sonatype staging maven plugin for atomic deployment to maven.java.net * Adding a possiblity to change preparation goals in the release. * Added maven-gpg-plugin version to avoid warnings during releases. * fixed release.tests.args for testsSkip profile Change-Id: Ie7f9dd0697c0e2f6a48bd95c20ba31cd3e4faec3
1 parent df5ff57 commit 72bf98a

File tree

4 files changed

+95
-6
lines changed

4 files changed

+95
-6
lines changed

‎archetypes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<plugin>
9090
<groupId>org.apache.maven.plugins</groupId>
9191
<artifactId>maven-gpg-plugin</artifactId>
92-
<version>1.6</version>
92+
<version>${gpg.mvn.plugin.version}</version>
9393
<executions>
9494
<execution>
9595
<id>sign-artifact</id>

‎bom/pom.xml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -428,5 +428,40 @@
428428
</site>
429429
</distributionManagement>
430430
</profile>
431+
<profile>
432+
<id>release</id>
433+
<activation>
434+
<activeByDefault>false</activeByDefault>
435+
</activation>
436+
<build>
437+
<plugins>
438+
<plugin>
439+
<groupId>org.apache.maven.plugins</groupId>
440+
<artifactId>maven-deploy-plugin</artifactId>
441+
<configuration>
442+
<skip>true</skip>
443+
</configuration>
444+
</plugin>
445+
<plugin>
446+
<groupId>org.sonatype.plugins</groupId>
447+
<artifactId>nexus-staging-maven-plugin</artifactId>
448+
<version>1.6.7</version>
449+
<executions>
450+
<execution>
451+
<id>default-deploy</id>
452+
<phase>deploy</phase>
453+
<goals>
454+
<goal>deploy</goal>
455+
</goals>
456+
</execution>
457+
</executions>
458+
<configuration>
459+
<serverId>jvnet-nexus-staging</serverId>
460+
<nexusUrl>https://maven.java.net/</nexusUrl>
461+
</configuration>
462+
</plugin>
463+
</plugins>
464+
</build>
465+
</profile>
431466
</profiles>
432467
</project>

‎pom.xml

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
<configuration>
388388
<mavenExecutorId>forked-path</mavenExecutorId>
389389
<autoVersionSubmodules>true</autoVersionSubmodules>
390-
<preparationGoals>clean install</preparationGoals>
390+
<preparationGoals>${release.preparationGoals}</preparationGoals>
391391
<pushChanges>false</pushChanges>
392392
<useReleaseProfile>false</useReleaseProfile>
393393
<arguments>${release.tests.args} ${release.arguments}</arguments>
@@ -714,7 +714,7 @@
714714
</property>
715715
</activation>
716716
<properties>
717-
<skip.release.tests>-Dmaven.test.skip=true -Dskip.tests=true</skip.release.tests>
717+
<release.tests.args>-Dskip.tests=true</release.tests.args>
718718
<skip.tests>true</skip.tests>
719719
</properties>
720720
</profile>
@@ -793,6 +793,20 @@
793793
<activeByDefault>false</activeByDefault>
794794
</activation>
795795
<build>
796+
<pluginManagement>
797+
<plugins>
798+
<plugin>
799+
<groupId>org.sonatype.plugins</groupId>
800+
<artifactId>nexus-staging-maven-plugin</artifactId>
801+
<version>${nexus-staging.mvn.plugin.version}</version>
802+
</plugin>
803+
<plugin>
804+
<groupId>org.apache.maven.plugins</groupId>
805+
<artifactId>maven-gpg-plugin</artifactId>
806+
<version>${gpg.mvn.plugin.version}</version>
807+
</plugin>
808+
</plugins>
809+
</pluginManagement>
796810
<plugins>
797811
<plugin>
798812
<groupId>org.apache.maven.plugins</groupId>
@@ -805,6 +819,26 @@
805819
<plugin>
806820
<groupId>org.apache.maven.plugins</groupId>
807821
<artifactId>maven-deploy-plugin</artifactId>
822+
<configuration>
823+
<skip>true</skip>
824+
</configuration>
825+
</plugin>
826+
<plugin>
827+
<groupId>org.sonatype.plugins</groupId>
828+
<artifactId>nexus-staging-maven-plugin</artifactId>
829+
<executions>
830+
<execution>
831+
<id>default-deploy</id>
832+
<phase>deploy</phase>
833+
<goals>
834+
<goal>deploy</goal>
835+
</goals>
836+
</execution>
837+
</executions>
838+
<configuration>
839+
<serverId>jvnet-nexus-staging</serverId>
840+
<nexusUrl>https://maven.java.net/</nexusUrl>
841+
</configuration>
808842
</plugin>
809843
</plugins>
810844
</build>
@@ -1825,6 +1859,7 @@
18251859
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18261860
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18271861
<release.tests.args>-Dmaven.test.skip=false</release.tests.args>
1862+
<release.preparationGoals>clean install</release.preparationGoals>
18281863
<skip.tests>false</skip.tests>
18291864
<xdk.absolute.path />
18301865
<surefire.security.argline />
@@ -1849,6 +1884,7 @@
18491884
<findbugs.version>3.0.2</findbugs.version>
18501885
<freemarker.version>2.3.23</freemarker.version>
18511886
<gae.version>1.8.4</gae.version>
1887+
<gpg.mvn.plugin.version>1.6</gpg.mvn.plugin.version>
18521888
<grizzly.client.version>1.10</grizzly.client.version>
18531889
<grizzly2.version>2.3.23</grizzly2.version>
18541890
<guava.version>18.0</guava.version>
@@ -1886,8 +1922,10 @@
18861922
<kryo.version>3.0.2</kryo.version>
18871923
<logback.version>1.1.3</logback.version>
18881924
<mimepull.version>1.9.6</mimepull.version>
1925+
<mockito.version>1.10.19</mockito.version>
18891926
<moxy.version>2.6.0</moxy.version>
18901927
<mustache.version>0.8.17</mustache.version>
1928+
<nexus-staging.mvn.plugin.version>1.6.7</nexus-staging.mvn.plugin.version>
18911929
<osgi.version>4.2.0</osgi.version>
18921930
<pax.exam.version>3.3.0</pax.exam.version>
18931931
<pax.web.version>0.7.4</pax.web.version><!-- TODO: UPGRADE! -->
@@ -1905,6 +1943,5 @@
19051943
<weld.version>2.2.14.Final</weld.version>
19061944
<xerces.version>2.11.0</xerces.version>
19071945
<xmlunit.version>1.6</xmlunit.version>
1908-
<mockito.version>1.10.19</mockito.version>
19091946
</properties>
19101947
</project>

‎tests/pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2011-2016 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -100,4 +100,21 @@
100100
</plugin>
101101
</plugins>
102102
</build>
103+
104+
<profiles>
105+
<profile>
106+
<id>release</id>
107+
<build>
108+
<plugins>
109+
<plugin>
110+
<groupId>org.sonatype.plugins</groupId>
111+
<artifactId>nexus-staging-maven-plugin</artifactId>
112+
<configuration>
113+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
114+
</configuration>
115+
</plugin>
116+
</plugins>
117+
</build>
118+
</profile>
119+
</profiles>
103120
</project>

0 commit comments

Comments
 (0)