Combine staging-close and staging-promote maven phases to ensure consistent resolution of both steps.

Author: Steve Powell

Makefile

@@ -64,7 +64,7 @@ srcdist: distclean
 	(cd build; zip -q -r $(SRC_ARCHIVE).zip $(SRC_ARCHIVE))
 	(cd build; rm -rf $(SRC_ARCHIVE))
 
-stage-maven-bundle: maven-bundle
+stage-and-promote-maven-bundle: maven-bundle
 	( \
 	  cd build/bundle; \
 	  NEXUS_USERNAME=`cat $(GNUPG_PATH)/../nexus/username`; \
@@ -79,9 +79,11 @@ stage-maven-bundle: maven-bundle
 	    amqp-client-$(VERSION)-javadoc.jar \
 	    amqp-client-$(VERSION)-sources.jar && \
 	  mvn org.sonatype.plugins:nexus-maven-plugin:$(MAVEN_NEXUS_VERSION):staging-close \
+	      org.sonatype.plugins:nexus-maven-plugin:$(MAVEN_NEXUS_VERSION):staging-promote \
 	    -Dnexus.url=http://oss.sonatype.org \
 	    -Dnexus.username=$$NEXUS_USERNAME \
 	    -Dnexus.password=$$NEXUS_PASSWORD \
+	    -Dnexus.promote.autoSelectOverride=true \
 	    -B \
 	    -Dnexus.description="Public release of $$VERSION" \
 	)
@@ -90,11 +92,9 @@ promote-maven-bundle:
 	( \
 	  NEXUS_USERNAME=`cat $(GNUPG_PATH)/../nexus/username`; \
 	  NEXUS_PASSWORD=`cat $(GNUPG_PATH)/../nexus/password`; \
-	  mvn org.sonatype.plugins:nexus-maven-plugin:$(MAVEN_NEXUS_VERSION):staging-promote \
 	    -Dnexus.url=http://oss.sonatype.org \
 	    -Dnexus.username=$$NEXUS_USERNAME \
 	    -Dnexus.password=$$NEXUS_PASSWORD \
-	    -Dnexus.promote.autoSelectOverride=true \
 	    -DtargetRepositoryId=releases \
 	    -B \
 	)