From ba7731b7cd7f18d37eb25fca16bab656d0f193be Mon Sep 17 00:00:00 2001
From: Jaco de Groot <jaco.de.groot@ibissource.org>
Date: Thu, 16 Nov 2023 18:21:15 +0100
Subject: [PATCH] Use mvn.bat/sh when building a frank

---
 build.xml                      | 18 +++++++++++-------
 mvn.bat                        |  2 ++
 mvn.sh                         |  2 ++
 specials/iaf-example/build.xml |  5 ++---
 specials/iaf-test/build.xml    | 11 ++++-------
 specials/iaf-webapp/build.xml  | 14 +++++---------
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/build.xml b/build.xml
index f5d310e..a76640d 100644
--- a/build.xml
+++ b/build.xml
@@ -135,7 +135,9 @@
 		<property name="ant.zip.url" value="${ant.base.url}${ant.zip}"/>
 		<property name="ant.gz.url" value="${ant.base.url}${ant.gz}"/>
 		<property name="ant.dir" value="build/apache-ant-${ant.version.}"/>
-		<property name="maven.version" value="3.9.5"/>
+		<property name="maven.remark.line1" value="Maven will by default use 1.8 for source and target (independent of Java version being used to run Maven)"/>
+		<property name="maven.remark.line2" value="For example java 11 can be specified in the pom.xml of your project by adding property &lt;maven.compiler.release>11&lt;/maven.compiler.release>"/>
+		<property name="maven.version" value="3.9.5"/><!-- check whether remark above about 1.8 is still correct, see https://maven.apache.org/plugins/maven-compiler-plugin/ -->
 		<property name="maven.base" value="apache-maven-${maven.version}-bin"/>
 		<property name="maven.zip" value="${maven.base}.zip"/>
 		<property name="maven.tar" value="${maven.base}.tar"/>
@@ -427,12 +429,10 @@
 		<echo file="${maven.exec.dir}/.gitignore" message="&#10;" append="true" if:true="${project.gitignore.add.newline}"/>
 		<echo file="${maven.exec.dir}/.gitignore" message="${project.gitignore}" append="true" if:true="${project.gitignore.add}"/>
 		<delete includeEmptyDirs="true" verbose="${maven.verbose}" unless:true="${webapp.clean.skip}" if:true="${maven}"><fileset dir="${webapp.dir}" includes="${webapp.clean}" defaultexcludes="false"/></delete><!-- maven clean war:inplace doesn't clean the webapp (see also: https://stackoverflow.com/questions/12497081/maven-war-inplace-clean-classes-and-lib-folder) -->
-		<condition property="mvn.ext" value=".cmd" else=""><os family="windows"/></condition>
-		<property name="maven.jdk.dir" value="${jdk.17.dir}"/><!-- maven 3.9.5 default source and target is 1.8, values can be changed in pom.xml with property <maven.compiler.release>11</maven.compiler.release> -->
-		<property name="maven.jdk.dir.windows" value="${jdk.17.dir.windows}"/>
-		<exec executable="${basedir}\${maven.dir}\bin\mvn${mvn.ext}" dir="${maven.exec.dir}" vmlauncher="false" failonerror="true" if:true="${maven}">
-			<env key="JAVA_HOME" value="${basedir}/${maven.jdk.dir}" unless:true="${os.windows}"/>
-			<env key="JAVA_HOME" value="${basedir}\${maven.jdk.dir.windows}" if:true="${os.windows}"/>
+		<condition property="mvn.exe" value="${basedir}\mvn.bat" else="/bin/bash"><os family="windows"/></condition>
+		<condition property="mvn.arg" value="${basedir}/mvn.sh" else=""><os family="unix"/></condition>
+		<exec executable="${mvn.exe}" dir="${maven.exec.dir}" vmlauncher="false" failonerror="true" if:true="${maven}">
+			<arg value="${mvn.arg}" unless:blank="${mvn.arg}"/>
 			<arg value="--settings" if:set="maven.settings.xml"/>
 			<arg value="${maven.settings.xml}" if:set="maven.settings.xml"/>
 			<arg value="${maven.args}" if:set="maven.args"/>
@@ -909,6 +909,8 @@ if not exist "%~dp0${maven.dir.windows}" (
 		<echo file="${filename}.bat" append="true" unless:set="mvn">
 set JAVA_HOME=%JDK_8_DIR%</echo>
 		<echo file="${filename}.bat" append="true" if:set="mvn">
+rem ${maven.remark.line1}
+rem ${maven.remark.line2}
 set JAVA_HOME=%JDK_17_DIR%</echo>
 		<echo file="${filename}.bat" append="true">
 set ANT_HOME=%~dp0${ant.dir.windows}</echo><!-- prevent problems on systems with ant installed (e.g. when ANT_HOME points to an old ant version that version will be used which might not support all tasks and attributes) -->
@@ -986,6 +988,8 @@ fi</echo>
 		<echo file="${filename}.sh" append="true" unless:set="mvn">
 export JAVA_HOME="$${JDK_8_DIR}"</echo>
 		<echo file="${filename}.sh" append="true" if:set="mvn">
+# ${maven.remark.line1}
+# ${maven.remark.line2}
 export JAVA_HOME="$${JDK_17_DIR}"</echo>
 		<echo file="${filename}.sh" append="true">
 export ANT_HOME="$${FR_DIR}${ant.dir}"</echo><!-- prevent problems on systems with ant installed (e.g. when ANT_HOME points to an old ant version that version will be used which might not support all tasks and attributes) -->
diff --git a/mvn.bat b/mvn.bat
index 2a2116e..dccd6ee 100644
--- a/mvn.bat
+++ b/mvn.bat
@@ -56,6 +56,8 @@ if not exist "%JDK_17_DIR%" (
 if not exist "%~dp0build\apache-maven-3.9.5" (
 	set RUN_INSTALL=true
 )
+rem Maven will by default use 1.8 for source and target (independent of Java version being used to run Maven)
+rem For example java 11 can be specified in the pom.xml of your project by adding property <maven.compiler.release>11</maven.compiler.release>
 set JAVA_HOME=%JDK_17_DIR%
 set ANT_HOME=%~dp0build\apache-ant-1.10.10
 if "%RUN_INSTALL%" == "true" (
diff --git a/mvn.sh b/mvn.sh
index c52cd72..18336c1 100755
--- a/mvn.sh
+++ b/mvn.sh
@@ -77,6 +77,8 @@ fi
 if [[ ! -d "${FR_DIR}build/apache-maven-3.9.5" ]]; then
 	RUN_INSTALL="true"
 fi
+# Maven will by default use 1.8 for source and target (independent of Java version being used to run Maven)
+# For example java 11 can be specified in the pom.xml of your project by adding property <maven.compiler.release>11</maven.compiler.release>
 export JAVA_HOME="${JDK_17_DIR}"
 export ANT_HOME="${FR_DIR}build/apache-ant-1.10.10"
 if [[ "$RUN_INSTALL" == "true" ]]; then
diff --git a/specials/iaf-example/build.xml b/specials/iaf-example/build.xml
index 031cea5..1fe70df 100644
--- a/specials/iaf-example/build.xml
+++ b/specials/iaf-example/build.xml
@@ -31,7 +31,7 @@
 		<delete dir="../../../iaf/webapp/src/main/webapp/WEB-INF/lib" verbose="${maven.verbose}" unless:true="${maven.skip.clean}"/>
 
 		<echo message="iaf-example: Build iaf"/>
-		<exec dir="../../../iaf" executable="${mvn.exe}" vmlauncher="false" failonerror="true">
+		<exec executable="${mvn.exe}" dir="../../../iaf" vmlauncher="false" failonerror="true">
 			<arg value="${mvn.arg}" unless:blank="${mvn.arg}"/>
 			<arg value="clean" unless:true="${maven.skip.clean}"/>
 			<arg value="install"/>
@@ -56,8 +56,7 @@
 			<arg value="-Dmaven=true"/>
 			<arg value="-Dmaven.skip.clean=${maven.skip.clean}"/>
 			<arg value="-Dmaven.verbose=${maven.verbose}"/>
-			<!-- Folder target already present in iaf/.gitginore -->
-			<arg value="-Dproject.gitignore.skip=true"/>
+			<arg value="-Dproject.gitignore.skip=true"/><!-- Folder target already present in iaf/.gitginore -->
 			<arg value="-Dtests.dir=src/test/resources/TestTool"/>
 		</exec>
 	</target>
diff --git a/specials/iaf-test/build.xml b/specials/iaf-test/build.xml
index 81ed22c..a8fd24a 100644
--- a/specials/iaf-test/build.xml
+++ b/specials/iaf-test/build.xml
@@ -31,7 +31,7 @@
 		<delete dir="../../../iaf/webapp/src/main/webapp/WEB-INF/lib" verbose="${maven.verbose}" unless:true="${maven.skip.clean}"/>
 
 		<echo message="iaf-test: Build iaf"/>
-		<exec dir="../../../iaf" executable="${mvn.exe}" vmlauncher="false" failonerror="true">
+		<exec executable="${mvn.exe}" dir="../../../iaf" vmlauncher="false" failonerror="true">
 			<arg value="${mvn.arg}" unless:blank="${mvn.arg}"/>
 			<arg value="clean" unless:true="${maven.skip.clean}"/>
 			<arg value="install"/>
@@ -56,12 +56,9 @@
 			<arg value="-Dmaven=true"/>
 			<arg value="-Dmaven.skip.clean=${maven.skip.clean}"/>
 			<arg value="-Dmaven.verbose=${maven.verbose}"/>
-			<!-- Folder target already present in iaf/.gitginore -->
-			<arg value="-Dproject.gitignore.skip=true"/>
-			<!-- In DeploymentSpecifics.properties the configurations part of the path is added to configurations.*.* properties, hence remove it here from configurations.dir that has default value src/main/configurations -->
-			<arg value="-Dconfigurations.dir=src/main"/>
-			<!-- A number of test scenario's of iaf-test depend on ${web.contextpath} -->
-			<arg value="-Dweb.contextpath=/"/>
+			<arg value="-Dproject.gitignore.skip=true"/><!-- Folder target already present in iaf/.gitginore -->
+			<arg value="-Dconfigurations.dir=src/main"/><!-- In DeploymentSpecifics.properties the configurations part of the path is added to configurations.*.* properties, hence remove it here from configurations.dir that has default value src/main/configurations -->
+			<arg value="-Dweb.contextpath=/"/><!-- A number of test scenario's of iaf-test depend on ${web.contextpath} -->
 			<!--
 			Optionally change application.server.type.custom as described in StageSpecifics_LOC.properties
 			Please note that ACTIVEMQ requires extra jar files that the Frank!Runner doesn't download yet, see:
diff --git a/specials/iaf-webapp/build.xml b/specials/iaf-webapp/build.xml
index 11aa845..0979f00 100644
--- a/specials/iaf-webapp/build.xml
+++ b/specials/iaf-webapp/build.xml
@@ -31,7 +31,7 @@
 		</exec>
 
 		<echo message="iaf-webapp: Build iaf"/>
-		<exec dir="../../../iaf" executable="${mvn.exe}" vmlauncher="false" failonerror="true">
+		<exec executable="${mvn.exe}" dir="../../../iaf" vmlauncher="false" failonerror="true">
 			<arg value="${mvn.arg}" unless:blank="${mvn.arg}"/>
 			<arg value="clean" unless:true="${maven.skip.clean}"/>
 			<arg value="install"/>
@@ -56,14 +56,10 @@
 			<arg value="-Dmaven=true"/>
 			<arg value="-Dmaven.skip.clean=${maven.skip.clean}"/>
 			<arg value="-Dmaven.verbose=${maven.verbose}"/>
-			<!-- Folder target already present in iaf/.gitginore -->
-			<arg value="-Dproject.gitignore.skip=true"/>
-			<!-- Don't gitignore resources in webapp except javax.xml.stream.XMLInputFactory because this is the iaf-webapp artifact that should contain those resources (which are stored in git, in the src/main/webapp folder) (javax.xml.stream.XMLInputFactory is copied from src/main/resources) -->
-			<arg value="-Dwebapp.gitignore=WEB-INF/classes/META-INF/services/**"/>
-			<!-- Don't clean resources in webapp except lib folder                           because this is the iaf-webapp artifact that should contain those resources (which are stored in git, in the src/main/webapp folder) -->
-			<arg value="-Dwebapp.clean=WEB-INF/lib/**"/>
-			<!-- Run webapp with configurations and tests from another project as it doesn't have it's own -->
-			<arg value="-Dconfigurations.dir=${configurations.dir}"/>
+			<arg value="-Dproject.gitignore.skip=true"/><!-- Folder target already present in iaf/.gitginore -->
+			<arg value="-Dwebapp.gitignore=WEB-INF/classes/META-INF/services/**"/><!-- Don't gitignore resources in webapp except javax.xml.stream.XMLInputFactory because this is the iaf-webapp artifact that should contain those resources (which are stored in git, in the src/main/webapp folder) (javax.xml.stream.XMLInputFactory is copied from src/main/resources) -->
+			<arg value="-Dwebapp.clean=WEB-INF/lib/**"/><!-- Don't clean resources in webapp except lib folder because this is the iaf-webapp artifact that should contain those resources (which are stored in git, in the src/main/webapp folder) -->
+			<arg value="-Dconfigurations.dir=${configurations.dir}"/><!-- Run webapp with configurations and tests from another project as it doesn't have it's own -->
 			<arg value="-Dtests.dir=${tests.dir}"/>
 		</exec>
 	</target>