From df1dedecc2934f2040a293f927e6bb6160d0d9fa Mon Sep 17 00:00:00 2001
From: David Marginian <david@davidmarginian.com>
Date: Fri, 22 May 2020 07:14:44 -0600
Subject: [PATCH 1/6] Pipeline changes per Mike's suggestions

---
 .github/workflows/ci.yml                   | 12 ++++++--
 build.xml                                  | 34 ++++++++--------------
 pom.xml => build/pom.xml                   |  0
 core/impl/main/java/dwr-version.properties |  5 ++--
 4 files changed, 25 insertions(+), 26 deletions(-)
 rename pom.xml => build/pom.xml (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d695e39d3..2387ac32e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,12 @@ jobs:
         with:
           path: 'core/impl/main/java/dwr-version.properties'
           property: 'revision'
+      - name: Read DWR title
+          id: read_dwr_title
+          uses: christian-draeger/read-properties@1.0.1
+          with:
+            path: 'core/impl/main/java/dwr-version.properties'
+            property: 'title'
       - name: Set up Maven OSS Repository
         uses: actions/setup-java@v1
         with:
@@ -40,8 +46,10 @@ jobs:
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
       - name: Publish to Maven OSS        
-        run: mvn deploy:deploy-file -DgeneratePom=false -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -Dfile=dist/lib/dwr-${{env.DWR_VERSION}}.jar -Dtype=jar -DartifactId=dwr -DpomFile=pom.xml -Dpackaging=jar -Djavadoc=dist/lib/dwr-${{env.DWR_VERSION}}-javadoc.jar -Dsources=dist/lib/dwr-${{env.DWR_VERSION}}-sources.jar -Dfiles=dist/lib/dwr-${{env.DWR_VERSION}}-jdk14.jar -Dclassifiers=jdk14 -Dtypes=jar
+        run: mvn deploy:deploy-file -DgeneratePom=false -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -Dfile=dist/lib/dwr-${{env.DWR_VERSION}}.jar -Dtype=jar -DartifactId=dwr -DpomFile=target/pom.xml -Dpackaging=jar -Djavadoc=dist/lib/dwr-${{env.DWR_VERSION}}-javadoc.jar -Dsources=dist/lib/dwr-${{env.DWR_VERSION}}-sources.jar -Dfiles=dist/lib/dwr-${{env.DWR_VERSION}}-jdk14.jar -Dclassifiers=jdk14 -Dtypes=jar
         env:
           MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}}
           MAVEN_PASSWORD: ${{secrets.MAVEN_PASSWORD}}
-          DWR_VERSION: ${{steps.read_dwr_major.outputs.value}}.${{steps.read_dwr_minor.outputs.value}}.${{steps.read_dwr_revision.outputs.value}}
+          DWR_VERSION: ${{steps.read_dwr_major.outputs.value}}.${{steps.read_dwr_minor.outputs.value}}.${{steps.read_dwr_revision.outputs.value}}-${{steps.read_dwr_title.outputs.value}}
+
+          
diff --git a/build.xml b/build.xml
index e553c7e66..ec717b8f1 100644
--- a/build.xml
+++ b/build.xml
@@ -7,8 +7,11 @@
 	<!-- File that contains local settings, you may need to edit this -->
 	<property file="build.properties" />
 
-	<!-- environment used during CI -->
-	<property environment="env"/>
+	<!-- Get build number from Github CI -->
+	<property environment="envgithub"/>
+	<condition property="build.number">
+		<isset property="envgithub.GITHUB_RUN_ID" />
+	</condition>
 
 	<!-- Properties for Maven Deploy, Stage, Release
 		See: https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-7c.DeploySnapshotsandStageReleaseswithAnt
@@ -17,16 +20,7 @@
 
 	<!-- Version numbers: Duplicates the logic in VersionUtil.loadProperties() -->
 	<property file="${source.root}/core/impl/main/java/dwr-version.properties" />
-	<property name="version" value="${major}.${minor}.${revision}" />
-	<property name="env.DWR_VERSION" value="${version}"/>
-	<condition property="label" value="${version}">
-		<equals arg1="${title}" arg2="" />
-	</condition>
-	<condition property="label" value="${version}.${title}">
-		<not>
-			<equals arg1="${title}" arg2="" />
-		</not>
-	</condition>
+	<property name="version" value="${major}.${minor}.${revision}-${title}" />
 
 	<!-- define Maven coordinates -->
 	<property name="groupId" value="org.directwebremoting" />
@@ -83,21 +77,17 @@
 
 	<!-- Updates the pom.xml with the version -->
 	<target name="setVersionInPom">
-		<if>
-			<isset property="env.GITHUB_RUN_ID" />
-			<then>
-				<replace casesensitive="false" file="pom.xml" token="{version}" value="${version}" />
-			</then>
-		</if>
+        <copy file="build/pom.xml" todir="target"/>
+		<replace casesensitive="false" file="target/pom.xml" token="{version}" value="${version}" />
 	</target>
 
 	<!-- Updates the build number in dwr-version.properties with the build number from CI -->
 	<target name="setBuildNumber" description="Update dwr-version.properties with CI build number.">
 		<if>
-			<isset property="env.GITHUB_RUN_ID" />
+			<isset property="build.number" />
 			<then>
 				<propertyfile file="${target.root}/classes/main/dwr-version.properties">
-					<entry key="build.number" value="${env.GITHUB_RUN_ID}" />
+					<entry key="build.number" value="${build.number}" />
 				</propertyfile>
 			</then>
 		</if>
@@ -174,7 +164,7 @@
 		</if>
 		<!-- Documentation: Javadoc and DTDDoc -->
 		<mkdir dir="${target.root}/javadoc" />
-		<javadoc access="public" author="true" destdir="${target.root}/javadoc" doctitle="DWR Version ${label}" use="true" splitindex="true" version="true">
+		<javadoc access="public" author="true" destdir="${target.root}/javadoc" doctitle="DWR Version ${version}" use="true" splitindex="true" version="true">
 			<sourcepath>
 				<pathelement path="${source.root}/core/api/main/java" />
 				<pathelement path="${source.root}/core/impl/main/java" />
@@ -210,7 +200,7 @@
 			<exclude name="common/*.dtd" />
 		</DTDDoc>
 		<!-- Source package -->
-		<zip destfile="${target.root}/dwr-${label}-src.zip">
+		<zip destfile="${target.root}/dwr-${version}-src.zip">
 			<fileset dir="${source.root}">
 				<exclude name="target/**" />
 				<exclude name="**/*.iml" />
diff --git a/pom.xml b/build/pom.xml
similarity index 100%
rename from pom.xml
rename to build/pom.xml
diff --git a/core/impl/main/java/dwr-version.properties b/core/impl/main/java/dwr-version.properties
index fb94a28ff..49ac63a38 100644
--- a/core/impl/main/java/dwr-version.properties
+++ b/core/impl/main/java/dwr-version.properties
@@ -1,5 +1,6 @@
 major=3
 minor=0
-revision=3-SNAPSHOT
-title=dev
+revision=3
+title=SNAPSHOT
+# build.number property is added by CI builds
 build.number=
\ No newline at end of file

From 093e2c0f5e726dfc0b491faa1acf25d3bd6c8a56 Mon Sep 17 00:00:00 2001
From: David Marginian <david@davidmarginian.com>
Date: Fri, 22 May 2020 13:09:56 -0600
Subject: [PATCH 2/6] Addressing Mike's comments

---
 build.xml                                  | 38 +++++++++-------------
 core/impl/main/java/dwr-version.properties |  3 +-
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/build.xml b/build.xml
index ec717b8f1..ea4c161ec 100644
--- a/build.xml
+++ b/build.xml
@@ -7,12 +7,6 @@
 	<!-- File that contains local settings, you may need to edit this -->
 	<property file="build.properties" />
 
-	<!-- Get build number from Github CI -->
-	<property environment="envgithub"/>
-	<condition property="build.number">
-		<isset property="envgithub.GITHUB_RUN_ID" />
-	</condition>
-
 	<!-- Properties for Maven Deploy, Stage, Release
 		See: https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-7c.DeploySnapshotsandStageReleaseswithAnt
 	-->
@@ -33,6 +27,21 @@
 	<property name="dwr-maven-jdk14-jar" value="${dist}/lib/${artifactId}-${version}-jdk14.jar" />
 	<!-- End Properties for Maven -->
 
+	<!-- Get build number from Github CI -->
+	<property environment="envgithub"/>
+
+	<!-- Updates version-properties with a build number if this is a CI run -->
+	<target name="updateVersionPropertiesWithBuildNumber">
+		<if>
+			<isset property="envgithub.GITHUB_RUN_ID" />
+			<then>
+				<propertyfile file="${target.root}/classes/main/dwr-version.properties">
+					<entry key="build.number" value="${envgithub.GITHUB_RUN_ID}" />
+				</propertyfile>
+			</then>
+		</if>
+	</target>
+
 	<target name="init">
 		<mkdir dir="${build}" />
 		<mkdir dir="${dist}/lib" />
@@ -81,25 +90,10 @@
 		<replace casesensitive="false" file="target/pom.xml" token="{version}" value="${version}" />
 	</target>
 
-	<!-- Updates the build number in dwr-version.properties with the build number from CI -->
-	<target name="setBuildNumber" description="Update dwr-version.properties with CI build number.">
-		<if>
-			<isset property="build.number" />
-			<then>
-				<propertyfile file="${target.root}/classes/main/dwr-version.properties">
-					<entry key="build.number" value="${build.number}" />
-				</propertyfile>
-			</then>
-		</if>
-	</target>
-
 	<!--=======================================================================-->
-	<target name="jar" depends="prepare, source" description="Create dwr.jar">
+	<target name="jar" depends="prepare, source, updateVersionPropertiesWithBuildNumber" description="Create dwr.jar">
 		<build target="${target.root}" include="" modules="${modules}" />
-		<!-- Set the version in the pom if a CI run -->
 		<antcall target="setVersionInPom" />
-		<!-- Set the build number if a CI run -->
-		<antcall target="setBuildNumber" />
 		<jar destfile="${target.root}/dwr.jar" compress="true">
 			<fileset dir="${target.root}/classes/main" />
 		</jar>
diff --git a/core/impl/main/java/dwr-version.properties b/core/impl/main/java/dwr-version.properties
index 49ac63a38..54f554404 100644
--- a/core/impl/main/java/dwr-version.properties
+++ b/core/impl/main/java/dwr-version.properties
@@ -2,5 +2,4 @@ major=3
 minor=0
 revision=3
 title=SNAPSHOT
-# build.number property is added by CI builds
-build.number=
\ No newline at end of file
+# build.number property is added by CI builds
\ No newline at end of file

From dbfa7a1231a0eb2d3735ecd69c68e457b1cb5f37 Mon Sep 17 00:00:00 2001
From: David Marginian <david@davidmarginian.com>
Date: Fri, 22 May 2020 13:33:51 -0600
Subject: [PATCH 3/6] fix workflow syntax

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 070a9e7a6..a4e9a6b30 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,11 +32,11 @@ jobs:
           path: 'core/impl/main/java/dwr-version.properties'
           property: 'revision'
       - name: Read DWR title
-          id: read_dwr_title
-          uses: christian-draeger/read-properties@1.0.1
-          with:
-            path: 'core/impl/main/java/dwr-version.properties'
-            property: 'title'
+        id: read_dwr_title
+        uses: christian-draeger/read-properties@1.0.1
+        with:
+          path: 'core/impl/main/java/dwr-version.properties'
+          property: 'title'
       - name: Set up Maven OSS Repository
         uses: actions/setup-java@v1
         with:

From 6baf39f891718e8be00bed1885902ce6acd44dd8 Mon Sep 17 00:00:00 2001
From: David Marginian <dmarginian@users.noreply.github.com>
Date: Fri, 22 May 2020 13:36:56 -0600
Subject: [PATCH 4/6] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a4e9a6b30..66706ff2b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
       - name: Publish to Maven OSS
-        if: equals(steps.read_dwr_title.outputs.value, "SNAPSHOT")
+        if: ${{steps.read_dwr_title.outputs.value}} == "SNAPSHOT"
         run: mvn deploy:deploy-file -DgeneratePom=false -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -Dfile=dist/lib/dwr-${{env.DWR_VERSION}}.jar -Dtype=jar -DartifactId=dwr -DpomFile=target/pom.xml -Dpackaging=jar -Djavadoc=dist/lib/dwr-${{env.DWR_VERSION}}-javadoc.jar -Dsources=dist/lib/dwr-${{env.DWR_VERSION}}-sources.jar -Dfiles=dist/lib/dwr-${{env.DWR_VERSION}}-jdk14.jar -Dclassifiers=jdk14 -Dtypes=jar
         env:
           MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}}

From b71ea6ea2f695f91a89a9d01a03b85c7710b43b8 Mon Sep 17 00:00:00 2001
From: David Marginian <david@davidmarginian.com>
Date: Fri, 22 May 2020 13:40:11 -0600
Subject: [PATCH 5/6] fix build

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index ea4c161ec..9b404dcfe 100644
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,7 @@
 	</target>
 
 	<!--=======================================================================-->
-	<target name="jar" depends="prepare, source, updateVersionPropertiesWithBuildNumber" description="Create dwr.jar">
+	<target name="jar" depends="prepare, source" description="Create dwr.jar">
 		<build target="${target.root}" include="" modules="${modules}" />
 		<antcall target="setVersionInPom" />
 		<jar destfile="${target.root}/dwr.jar" compress="true">
@@ -121,7 +121,7 @@
 	</target>
 
 	<!--=======================================================================-->
-	<target name="package" depends="war" description="Create packaged outputs: dwrdemo.war, dwr-jdk14.jar, and the source .zip">
+	<target name="package" depends="war, updateVersionPropertiesWithBuildNumber" description="Create packaged outputs: dwrdemo.war, dwr-jdk14.jar, and the source .zip">
 		<!-- Run retroweaver if dwr.jar has changed since we last ran it -->
 		<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
 			<classpath>

From d542039d1381d1e2d2befe36812ff0c67d1327a4 Mon Sep 17 00:00:00 2001
From: David Marginian <david@davidmarginian.com>
Date: Sat, 23 May 2020 07:01:05 -0600
Subject: [PATCH 6/6] Addressing mike's comment

---
 build.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index 9b404dcfe..960356827 100644
--- a/build.xml
+++ b/build.xml
@@ -29,18 +29,9 @@
 
 	<!-- Get build number from Github CI -->
 	<property environment="envgithub"/>
-
-	<!-- Updates version-properties with a build number if this is a CI run -->
-	<target name="updateVersionPropertiesWithBuildNumber">
-		<if>
-			<isset property="envgithub.GITHUB_RUN_ID" />
-			<then>
-				<propertyfile file="${target.root}/classes/main/dwr-version.properties">
-					<entry key="build.number" value="${envgithub.GITHUB_RUN_ID}" />
-				</propertyfile>
-			</then>
-		</if>
-	</target>
+	<condition property="build.number" value="${envgithub.GITHUB_RUN_ID}">
+		<isset property="envgithub.GITHUB_RUN_ID" />
+	</condition>
 
 	<target name="init">
 		<mkdir dir="${build}" />
@@ -90,10 +81,23 @@
 		<replace casesensitive="false" file="target/pom.xml" token="{version}" value="${version}" />
 	</target>
 
+	<!-- Updates the build number in dwr-version.properties with the build number from CI -->
+	<target name="updateVersionPropertiesWithBuildNumber" description="Update dwr-version.properties with CI build number.">
+		<if>
+			<isset property="build.number" />
+			<then>
+				<propertyfile file="${target.root}/classes/main/dwr-version.properties">
+					<entry key="build.number" value="${build.number}" />
+				</propertyfile>
+			</then>
+		</if>
+	</target>
+
 	<!--=======================================================================-->
 	<target name="jar" depends="prepare, source" description="Create dwr.jar">
 		<build target="${target.root}" include="" modules="${modules}" />
 		<antcall target="setVersionInPom" />
+		<antcall target="updateVersionPropertiesWithBuildNumber" />
 		<jar destfile="${target.root}/dwr.jar" compress="true">
 			<fileset dir="${target.root}/classes/main" />
 		</jar>