From ed731d8734f32df2a5ac6065ed7b15d15303336b Mon Sep 17 00:00:00 2001
From: jiaz <jiaz@ebf7c1c2-ba36-0410-9fe8-c592906822b4>
Date: Mon, 4 Sep 2023 15:06:43 +0000
Subject: [PATCH] git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@48255
 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 64ed9a301727c809f81e7769cdeff69cf5d8d726
---
 build/newBuild/build.xml            | 24 ++++++++++++------------
 build/newBuild/build_standalone.xml | 19 ++++++++++---------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/build/newBuild/build.xml b/build/newBuild/build.xml
index 76614c1e5f..5dd91b2c06 100644
--- a/build/newBuild/build.xml
+++ b/build/newBuild/build.xml
@@ -45,46 +45,46 @@
 
 	<!-- Compiles the code -->
 	<target name="compile" depends="clean">
+		<property name="jvm_target" value="1.6" />
+		<property name="jvm_source" value="1.6" />
 		<mkdir dir="${cls}" />
 
-
-
 		<!-- Build dependencies -->
 
-		<javac srcdir="${dep.awu}/src" excludes="**/test/**" verbose="false" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
+		<javac srcdir="${dep.awu}/src" excludes="**/test/**" verbose="false" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="${jvm_source}" target="${jvm_target}" includeantruntime="false">
 			<classpath refid="classpath" />
 
 		</javac>
 
-		<javac srcdir="${dep.myjd}/src" excludes="**/test/**" verbose="false" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
+		<javac srcdir="${dep.myjd}/src" excludes="**/test/**" verbose="false" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="${jvm_source}" target="${jvm_target}" includeantruntime="false">
 			<classpath refid="classpath" />
 
 		</javac>
 
-		<javac srcdir="${dep.browser}/src" excludes="" debug="${debug}" verbose="false" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
+		<javac srcdir="${dep.browser}/src" excludes="" debug="${debug}" verbose="false" destdir="${cls}" encoding="UTF-8" source="${jvm_source}" target="${jvm_target}" includeantruntime="false">
 			<classpath refid="classpath" />
 
 		</javac>
 
 
 
-		<javac srcdir="${dep.updateclient}/src" excludes="" verbose="false" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
+		<javac srcdir="${dep.updateclient}/src" excludes="" verbose="false" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="${jvm_source}" target="${jvm_target}" includeantruntime="false">
 			<classpath refid="classpath" />
 
 
 		</javac>
 
-		<javac srcdir="src" debug="${debug}" verbose="false" excludes="jd/utils/dev/*,org/jdownloader/extensions/langfileeditor/**/*,org/jdownloader/extensions/remoteserv/**/*" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
+		<javac srcdir="src" debug="${debug}" verbose="false" excludes="jd/utils/dev/*,org/jdownloader/extensions/langfileeditor/**/*,org/jdownloader/extensions/remoteserv/**/*" destdir="${cls}" encoding="UTF-8" source="${jvm_source}" target="${jvm_target}" includeantruntime="false">
 			<classpath refid="classpath" />
 			<compilerarg line="-proc:none" />
 
 		</javac>
-		<javac srcdir="${dep.jdupdateclient}/src" excludes="" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
+		<javac srcdir="${dep.jdupdateclient}/src" excludes="" debug="${debug}" destdir="${cls}" encoding="UTF-8" source="${jvm_source}" target="${jvm_target}" includeantruntime="false">
 			<classpath refid="classpath" />
 
 		</javac>
 
-		<javac srcdir="${dep.jdc}/src" debug="${debug}" verbose="false" excludes="**/test/**" destdir="${cls}" encoding="UTF-8" source="1.6" target="1.6" includeantruntime="false">
+		<javac srcdir="${dep.jdc}/src" debug="${debug}" verbose="false" excludes="**/test/**" destdir="${cls}" encoding="UTF-8" source="${jvm_source}" target="${jvm_target}" includeantruntime="false">
 			<classpath refid="classpath" />
 		</javac>
 		<echo message="Finished." />
@@ -110,13 +110,13 @@
 		</copy>
 		<copy todir="${dist}/libs">
 			<fileset dir="${res}/libs" includes="**/*">
-				<exclude name="proxyVole.jar" />			
+				<exclude name="proxyVole.jar" />
 				<exclude name="**/*.info" />
 			</fileset>
 		</copy>
 		<copy todir="${dist}/libs">
 			<fileset dir="${dep.awu}/libs" includes="**/*.jar">
-				<exclude name="miglayout.jar" />				
+				<exclude name="miglayout.jar" />
 				<exclude name="**/*.info" />
 				<exclude name="**/*jackson*" />
 			</fileset>
@@ -382,7 +382,7 @@
 			<!--<attribute name="Class-Path" value="" />-->
 
 		</manifest>
-		<jar duplicate="fail" file="${dist}/JDownloader.jar" manifest="${dist}/Manifest.MF">			
+		<jar duplicate="fail" file="${dist}/JDownloader.jar" manifest="${dist}/Manifest.MF">
 			<zipfileset src="${dep.awu}/libs/miglayout.jar" excludes="META-INF/*" />
 			<zipfileset src="${res}/libs/proxyVole.jar" excludes="META-INF/*" />
 			<zipfileset src="${dep.updateclient}/libs/xz.jar" excludes="META-INF/*" />
diff --git a/build/newBuild/build_standalone.xml b/build/newBuild/build_standalone.xml
index d78e13009e..254674ffa4 100644
--- a/build/newBuild/build_standalone.xml
+++ b/build/newBuild/build_standalone.xml
@@ -12,10 +12,6 @@
 	<property name="dist" value="${working}/dist" />
 	<property name="res" value="ressourcen" />
 	<property name="pluginres" value="${dist}/pluginressourcen" />
-	
-	
-	<property name="jvm_target" value="1.8" />
-	<property name="jvm_source" value="1.8" />
 
 
 
@@ -38,6 +34,11 @@
 
 	<!-- Compiles the code -->
 	<target name="compile" depends="clean">
+
+		<property name="jvm_target" value="1.8" />
+		<property name="jvm_source" value="1.8" />
+
+
 		<mkdir dir="${cls}" />
 
 
@@ -87,19 +88,19 @@
 
 		<copy todir="${dist}/libs">
 			<fileset dir="${res}/libs" includes="**/*">
-				<exclude name="proxyVole.jar" />			
-				<exclude name="**/*.info" />				
+				<exclude name="proxyVole.jar" />
+				<exclude name="**/*.info" />
 			</fileset>
 		</copy>
 		<copy todir="${dist}/libs">
 			<fileset dir="${dep.awu}/libs" includes="**/*.jar">
-				<exclude name="miglayout.jar" />				
-				<exclude name="**/*.info" />				
+				<exclude name="miglayout.jar" />
+				<exclude name="**/*.info" />
 			</fileset>
 		</copy>
 		<copy todir="${dist}/libs">
 			<fileset dir="${dep.browser}/libs" includes="**/*.jar">
-				<exclude name="**/*.info" />				
+				<exclude name="**/*.info" />
 			</fileset>
 		</copy>