Merge pull request #119 from Laande/master

snyk vuln
This commit is contained in:
sirjonasxx 2022-05-03 06:31:16 +02:00 committed by GitHub
commit a98bab39cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,7 +10,7 @@
<properties>
<javafx.version>1.8</javafx.version>
<jettyVersion>9.4.41.v20210516</jettyVersion>
<jettyVersion>9.4.43.v20210629</jettyVersion>
</properties>
<parent>
@ -75,24 +75,24 @@
<target name="copy G-Earth.jar to Build folder">
<copy todir="../Build/Mac/">
<fileset dir="target/bin" includes="**/*" />
<fileset dir="src/main/resources/build/common" includes="**/*" />
<fileset dir="src/main/resources/build/mac" includes="**/*" excludes=".gitkeep" />
<fileset dir="target/bin" includes="**/*"/>
<fileset dir="src/main/resources/build/common" includes="**/*"/>
<fileset dir="src/main/resources/build/mac" includes="**/*" excludes=".gitkeep"/>
</copy>
<copy todir="../Build/Linux/">
<fileset dir="target/bin" includes="**/*" />
<fileset dir="src/main/resources/build/common" includes="**/*" />
<fileset dir="src/main/resources/build/linux" includes="**/*" excludes=".gitkeep" />
<fileset dir="target/bin" includes="**/*"/>
<fileset dir="src/main/resources/build/common" includes="**/*"/>
<fileset dir="src/main/resources/build/linux" includes="**/*" excludes=".gitkeep"/>
</copy>
<copy todir="../Build/Windows_32bit/">
<fileset dir="target/bin" includes="**/*" />
<fileset dir="src/main/resources/build/common" includes="**/*" />
<fileset dir="src/main/resources/build/windows/32bit" includes="**/*" excludes=".gitkeep" />
<fileset dir="target/bin" includes="**/*"/>
<fileset dir="src/main/resources/build/common" includes="**/*"/>
<fileset dir="src/main/resources/build/windows/32bit" includes="**/*" excludes=".gitkeep"/>
</copy>
<copy todir="../Build/Windows_64bit/">
<fileset dir="target/bin" includes="**/*" />
<fileset dir="src/main/resources/build/common" includes="**/*" />
<fileset dir="src/main/resources/build/windows/64bit" includes="**/*" excludes=".gitkeep" />
<fileset dir="target/bin" includes="**/*"/>
<fileset dir="src/main/resources/build/common" includes="**/*"/>
<fileset dir="src/main/resources/build/windows/64bit" includes="**/*" excludes=".gitkeep"/>
</copy>
</target>
@ -106,8 +106,7 @@
<phase>clean</phase>
<configuration>
<target name="clean our own build folder">
<delete dir="../Build"
includeemptydirs="true"/>
<delete dir="../Build" includeemptydirs="true"/>
</target>
</configuration>
<goals>