nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-26 18:30:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from Laande/snyk-fix-2dcdc35854cbcbff45ec2ddb1aeed8cf

Browse Source 
[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:
Lande 2022-02-18 23:29:53 +01:00 committed by GitHub
commit d3ff2b624f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
G-Earth/pom.xml
View File

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