From f2ed584d712c2570625f78b8c2648bf33d0946de Mon Sep 17 00:00:00 2001
From: highsource <aleksei.valikov@gmail.com>
Date: Thu, 2 Oct 2014 23:52:16 +0200
Subject: [PATCH] Updated release files a bit.

---
 pom.xml      | 17 +++++++----------
 qrelease.bat | 16 ++++++++--------
 release.bat  | 51 +++++++++++++++++++++++++++------------------------
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b9ad4c3..6c906a73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,26 +72,23 @@
 	<profiles>
 		<profile>
 			<id>samples</id>
-			<activation>
-				<property>
-					<name>samples</name>
-				</property>
-			</activation>
 			<modules>
 				<module>samples</module>
 			</modules>
 		</profile>
 		<profile>
 			<id>tests</id>
-			<activation>
-				<property>
-					<name>tests</name>
-				</property>
-			</activation>
 			<modules>
 				<module>tests</module>
 			</modules>
 		</profile>
+		<profile>
+			<id>all</id>
+			<modules>
+				<module>samples</module>
+				<module>tests</module>
+			</modules>
+		</profile>
 	</profiles>
 	<properties>
 		<jaxb.version>2.2.7</jaxb.version>
diff --git a/qrelease.bat b/qrelease.bat
index 10ed3890..88657dde 100644
--- a/qrelease.bat
+++ b/qrelease.bat
@@ -4,22 +4,22 @@ set JAVA_HOME=%JAVA6_HOME%
 
 echo Performing a full clean build.
 rem pause
-call mvn clean install -DperformRelease -Ptests,samples
+call mvn clean install -DperformRelease -Pall
 echo Full clean build completed.
 rem pause
 
 echo Setting new version to %1.
 rem pause
-call mvn versions:set -Ptests,samples -DnewVersion=%1
+call mvn versions:set -Pall -DnewVersion=%1
 echo Version was set to %1.
 rem pause
-call mvn versions:commit -Ptests,samples
+call mvn versions:commit -Pall
 echo Version %1 committed.
 rem pause
 
 echo Performing a full clean build.
 rem pause
-call mvn clean install -Ptests,samples -DperformRelease
+call mvn clean install -Pall -DperformRelease
 echo Full clean build completed.
 rem pause
 
@@ -44,22 +44,22 @@ rem pause
 
 echo Performing full clean deploy.
 rem pause
-call mvn -DperformRelease -Psonatype-oss-release,tests,samples clean deploy
+call mvn -DperformRelease -Psonatype-oss-release,all clean deploy
 echo Full clean deploy done.
 rem pause
 
 echo Setting new version to %2.
 rem pause
-call mvn versions:set -Ptests,samples -DnewVersion=%2
+call mvn versions:set -Pall -DnewVersion=%2
 echo Version was set to %2.
 rem pause
-call mvn versions:commit -Ptests,samples
+call mvn versions:commit -Pall
 echo Version %2 was committed.
 rem pause
 
 echo Performing a full clean build.
 rem pause
-call mvn clean install -DperformRelease -Ptests,samples
+call mvn clean install -DperformRelease -Pall
 echo Full clean build completed.
 rem pause
 
diff --git a/release.bat b/release.bat
index 245c602b..2115eee7 100644
--- a/release.bat
+++ b/release.bat
@@ -2,75 +2,78 @@ setlocal
 echo Setting JAVA_HOME to %JAVA6_HOME%.
 set JAVA_HOME=%JAVA6_HOME%
 
-echo Performing a short clean build.
-pause
-call mvn clean install -DperformRelease
-echo Short clean build completed.
-pause
-
 echo Performing a full clean build.
 pause
-call mvn clean install -DperformRelease -Psamples,tests,dist
+call mvn clean install -DperformRelease -Pall
 echo Full clean build completed.
 pause
 
 echo Setting new version to %1.
 pause
-call mvn versions:set -Psamples,tests,dist -DnewVersion=%1
+call mvn versions:set -Pall -DnewVersion=%1
 echo Version was set to %1.
 pause
-call mvn versions:commit -Psamples,tests,dist
+call mvn versions:commit -Pall
 echo Version %1 committed.
 pause
 
-echo Performing a short clean build.
-pause
-call mvn clean install -DperformRelease
-echo Short clean build completed.
-pause
-
 echo Performing a full clean build.
 pause
-call mvn clean install -Psamples,tests,dist -DperformRelease
+call mvn clean install -Pall -DperformRelease
 echo Full clean build completed.
 pause
 
 echo Checking in version %1.
 pause
-call mvn scm:checkin -Dmessage="Version %1"
+git commit -a -m "Version %1"
 echo Version %1 was checked in.
 pause
 
 echo Tagging version %1.
 pause
-call mvn scm:tag -Dtag=%1
+git tag -a %1 -m "Version %1"
 echo Version %1 was tagged.
 pause
 
+echo Pushing version %1.
+pause
+git push origin master
+git push --tags origin master
+echo Version %1 was pushed.
+pause
+
 echo Performing full clean deploy.
 pause
-call mvn -DperformRelease -Psonatype-oss-release,samples,tests,dist clean deploy
+call mvn -DperformRelease -Psonatype-oss-release,all clean deploy
 echo Full clean deploy done.
 pause
 
 echo Setting new version to %2.
 pause
-call mvn versions:set -Psamples,tests,dist -DnewVersion=%2
+call mvn versions:set -Pall -DnewVersion=%2
 echo Version was set to %2.
 pause
-call mvn versions:commit -Psamples,tests,dist
+call mvn versions:commit -Pall
 echo Version %2 was committed.
 pause
 
-echo Performing a short clean build.
+echo Performing a full clean build.
 pause
-call mvn clean install -DperformRelease
+call mvn clean install -DperformRelease -Pall
+echo Full clean build completed.
 pause
 
 echo Checking in version %2.
 pause
-call mvn scm:checkin -Dmessage="Version %2"
+git commit -a -m "Version %2"
 echo Version %2 was checked in.
 pause
 
+echo Pushing version %2.
+pause
+git push origin master
+git push --tags origin master
+echo Version %2 was pushed.
+pause
+
 endlocal
\ No newline at end of file