Skip to content
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

Jump to bottom

[Snyk] Fix for 3 vulnerabilities #45

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

[Snyk] Fix for 3 vulnerabilities #45

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
30 changes: 10 additions & 20 deletions digidoc4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<logback-classic.version>1.2.3</logback-classic.version>
<junit.version>4.13.1</junit.version>
<dss.groupId>org.digidoc4j.dss</dss.groupId>
<dss.version>5.7.d4j.1</dss.version>
<dss.version>5.8.d4j.1</dss.version>
<dss.util.build>${project.build.directory}/build/util</dss.util.build>
<dss.util.lib>${project.build.directory}/library/util</dss.util.lib>
<dss.zip.lib>${project.build.directory}/library/zip</dss.zip.lib>
Expand Down Expand Up @@ -515,21 +515,16 @@
<configuration>
<target>
<jar jarfile="${dss.util.build}/temp.jar">
<zipgroupfileset dir="${dss.util.lib}"
includes="**/dss*.jar **/validation-policy*.jar"/>
<zipgroupfileset dir="${dss.util.lib}" includes="**/dss*.jar **/validation-policy*.jar"/>
<zipgroupfileset dir="${dss.util.lib}" includes="**/*.jar" excludes="bcprov-*.jar"/>
<zipgroupfileset dir="${project.build.directory}" includes="**/digidoc4j-*.jar"
excludes="*-javadoc.jar *-sources.jar"/>
<zipgroupfileset dir="${project.build.directory}"
includes="**/logback-*.jar"/>
<zipgroupfileset dir="${project.build.directory}" includes="**/digidoc4j-*.jar" excludes="*-javadoc.jar *-sources.jar"/>
<zipgroupfileset dir="${project.build.directory}" includes="**/logback-*.jar"/>
</jar>
<jar destfile="${dss.util.build}/digidoc4j-util.jar">
<zipfileset src="${dss.util.build}/temp.jar"
excludes="META-INF/*.SF META-INF/*.RSA META-INF/*.DSA"/>
<zipfileset src="${dss.util.build}/temp.jar" excludes="META-INF/*.SF META-INF/*.RSA META-INF/*.DSA"/>
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Implementation-Vendor"
value="Republic of Estonia Information System Authority"/>
<attribute name="Implementation-Vendor" value="Republic of Estonia Information System Authority"/>
<attribute name="Implementation-Title" value="Java BDoc/DigiDoc utility"/>
<attribute name="Implementation-Version" value="${project.version}"/>
<attribute name="Main-Class" value="org.digidoc4j.main.DigiDoc4J"/>
Expand All @@ -544,9 +539,7 @@
<copy todir="${dss.util.build}/">
<fileset dir="${project.basedir}/src/main/etc" includes="*.xml"/>
</copy>
<zip
destfile="${project.build.directory}/${project.artifactId}-${project.version}-util.zip"
basedir="${dss.util.build}"/>
<zip destfile="${project.build.directory}/${project.artifactId}-${project.version}-util.zip" basedir="${dss.util.build}"/>
<copy tofile="${project.build.directory}/${project.artifactId}-${project.version}.pom">
<fileset dir="${project.basedir}" includes="**/pom.xml"/>
</copy>
Expand All @@ -561,13 +554,10 @@
<phase>install</phase>
<configuration>
<target>
<jar
jarfile="${project.build.directory}/${project.artifactId}-${project.version}-bundle.jar">
<fileset dir="${project.build.directory}" includes="**/digidoc4j-*.jar"
excludes="*-library.jar"/>
<jar jarfile="${project.build.directory}/${project.artifactId}-${project.version}-bundle.jar">
<fileset dir="${project.build.directory}" includes="**/digidoc4j-*.jar" excludes="*-library.jar"/>
<fileset dir="${project.build.directory}" includes="**/*.pom"/>
<fileset dir="${project.build.directory}" includes="**/*.asc"
excludes="*-library.*.asc"/>
<fileset dir="${project.build.directory}" includes="**/*.asc" excludes="*-library.*.asc"/>
</jar>
</target>
</configuration>
Expand Down