Skip to content

[Snyk] Fix for 1 vulnerabilities #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cryptokat wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[Snyk] Fix for 1 vulnerabilities #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,39 +321,39 @@
<!-- windows build -->
<copy todir="${dist.base}/windows">
<fileset dir="${project.basedir}">
<include name="config/**" />
<include name="LICENSE*" />
<include name="config/**"/>
<include name="LICENSE*"/>
</fileset>
<fileset dir="${project.basedir}/target">
<include name="semux.exe" />
<include name="semux.exe"/>
</fileset>
</copy>
<copy file="${project.basedir}/misc/launch4j/semux.l4j.ini" tofile="${dist.base}/windows/semux.l4j.ini" />
<fixcrlf srcdir="${dist.base}/windows" includes="**/*.ini" eol="dos" eof="asis" />
<fixcrlf srcdir="${dist.base}/windows" includes="config/*" eol="dos" eof="asis" />
<fixcrlf srcdir="${dist.base}/windows" includes="LICENSE*" eol="dos" eof="asis" />
<copy file="${project.basedir}/misc/launch4j/semux.l4j.ini" tofile="${dist.base}/windows/semux.l4j.ini"/>
<fixcrlf srcdir="${dist.base}/windows" includes="**/*.ini" eol="dos" eof="asis"/>
<fixcrlf srcdir="${dist.base}/windows" includes="config/*" eol="dos" eof="asis"/>
<fixcrlf srcdir="${dist.base}/windows" includes="LICENSE*" eol="dos" eof="asis"/>

<!-- linux build (executable jar) -->
<copy todir="${dist.base}/linux">
<fileset dir="${project.basedir}">
<include name="config/**" />
<include name="LICENSE*" />
<include name="config/**"/>
<include name="LICENSE*"/>
</fileset>
</copy>
<copy file="${project.basedir}/src/main/resources/org/semux/gui/splash.png" todir="${dist.base}/linux/resources" />
<copy file="${project.basedir}/target/semux-${project.version}-shaded.jar" tofile="${dist.base}/linux/semux.jar" />
<copy file="${project.basedir}/scripts/semux-cli.sh" tofile="${dist.base}/linux/semux-cli.sh" />
<copy file="${project.basedir}/scripts/semux-gui.sh" tofile="${dist.base}/linux/semux-gui.sh" />
<chmod file="${dist.base}/linux/semux.jar" perm="755" />
<chmod file="${dist.base}/linux/semux*.sh" perm="755" />
<copy file="${project.basedir}/src/main/resources/org/semux/gui/splash.png" todir="${dist.base}/linux/resources"/>
<copy file="${project.basedir}/target/semux-${project.version}-shaded.jar" tofile="${dist.base}/linux/semux.jar"/>
<copy file="${project.basedir}/scripts/semux-cli.sh" tofile="${dist.base}/linux/semux-cli.sh"/>
<copy file="${project.basedir}/scripts/semux-gui.sh" tofile="${dist.base}/linux/semux-gui.sh"/>
<chmod file="${dist.base}/linux/semux.jar" perm="755"/>
<chmod file="${dist.base}/linux/semux*.sh" perm="755"/>

<!-- macos build -->
<!-- use fat jar because .app bundle is not production ready -->
<copy todir="${dist.base}/macos">
<fileset dir="${dist.base}/linux"></fileset>
<fileset dir="${dist.base}/linux"/>
</copy>
<chmod file="${dist.base}/macos/semux.jar" perm="755" />
<chmod file="${dist.base}/macos/semux*.sh" perm="755" />
<chmod file="${dist.base}/macos/semux.jar" perm="755"/>
<chmod file="${dist.base}/macos/semux*.sh" perm="755"/>
</target>
</configuration>
<goals>
Expand Down Expand Up @@ -395,7 +395,7 @@
<instrumentation>
<ignoreTrivial>true</ignoreTrivial>
</instrumentation>
<check />
<check/>
</configuration>
</plugin>

Expand Down Expand Up @@ -474,7 +474,7 @@
<configuration>
<skip>false</skip>
<rules>
<DependencyConvergence />
<DependencyConvergence/>
<digestRule implementation="uk.co.froot.maven.enforcer.DigestRule">
<!-- Create a snapshot to build the list of URNs below -->
<buildSnapshot>false</buildSnapshot>
Expand Down Expand Up @@ -602,7 +602,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down Expand Up @@ -739,12 +739,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.4</version>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.4</version>
<version>2.15.0</version>
</dependency>

<!-- ED25519 -->
Expand Down