mirror of
https://github.com/sirjonasxx/G-Earth.git
synced 2024-11-26 10:20:51 +01:00
Merge pull request #1 from Laande/snyk-fix-2dcdc35854cbcbff45ec2ddb1aeed8cf
[Snyk] Security upgrade org.eclipse.jetty.websocket:javax-websocket-server-impl from 9.4.41.v20210516 to 9.4.43.v20210629
This commit is contained in:
commit
d3ff2b624f
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user