Skip to content

Commit c9f76f4

Browse files
authored
Merge pull request #897 from Super-Sky/oscs_fix_cd3s72oau51of7vbl3pg
fix(sec): upgrade com.fasterxml.jackson.core:jackson-databind to 2.12.6.1
2 parents 86dbda6 + fafde85 commit c9f76f4

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

scouter.webapp/pom.xml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<parent>
64
<groupId>io.github.scouter-project</groupId>
75
<artifactId>scouter-parent</artifactId>
@@ -80,7 +78,7 @@
8078
<dependency>
8179
<groupId>com.fasterxml.jackson.core</groupId>
8280
<artifactId>jackson-databind</artifactId>
83-
<version>2.9.10.8</version>
81+
<version>2.12.6.1</version>
8482
</dependency>
8583
<dependency>
8684
<groupId>org.glassfish.jersey.media</groupId>
@@ -257,36 +255,36 @@
257255
<phase>package</phase>
258256
<configuration>
259257
<target>
260-
<mkdir dir="${scouter.assembly.working.dir}" />
258+
<mkdir dir="${scouter.assembly.working.dir}"/>
261259
<copy todir="${scouter.assembly.working.dir}">
262260
<fileset dir="${project.basedir}/scripts">
263-
<include name="**/*" />
261+
<include name="**/*"/>
264262
</fileset>
265263
</copy>
266-
<copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${scouter.webapp.jarName}.jar" overwrite="true" verbose="true" />
264+
<copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${scouter.webapp.jarName}.jar" overwrite="true" verbose="true"/>
267265

268-
<fixcrlf srcdir="${scouter.assembly.working.dir}" includes="**/*.sh" eol="lf" eof="remove" />
266+
<fixcrlf srcdir="${scouter.assembly.working.dir}" includes="**/*.sh" eol="lf" eof="remove"/>
269267
<tar destfile="${project.build.directory}/${scouter.webapp.assembly.name}.tar">
270268
<tarfileset dir="${scouter.assembly.working.dir}" mode="755">
271-
<include name="**/*.sh" />
269+
<include name="**/*.sh"/>
272270
</tarfileset>
273271
<tarfileset dir="${scouter.assembly.working.dir}">
274-
<exclude name="**/*.sh" />
272+
<exclude name="**/*.sh"/>
275273
</tarfileset>
276274
<tarfileset dir="${project.build.directory}">
277-
<include name="${project.build.finalName}.jar" />
278-
<include name="${scouter.webapp.jarName}.jar" />
279-
<include name="lib/**/*" />
275+
<include name="${project.build.finalName}.jar"/>
276+
<include name="${scouter.webapp.jarName}.jar"/>
277+
<include name="lib/**/*"/>
280278
</tarfileset>
281279
<tarfileset dir="${project.basedir}">
282-
<include name="conf/**/*" />
283-
<include name="extweb/**/*" />
280+
<include name="conf/**/*"/>
281+
<include name="extweb/**/*"/>
284282
</tarfileset>
285283
</tar>
286284

287285
<!-- copy for preparing whole packaging -->
288-
<mkdir dir="${scouter.whole.packaging.prepare.dir}" />
289-
<copy file="${project.build.directory}/${scouter.webapp.assembly.name}.tar" todir="${scouter.whole.packaging.prepare.dir}" />
286+
<mkdir dir="${scouter.whole.packaging.prepare.dir}"/>
287+
<copy file="${project.build.directory}/${scouter.webapp.assembly.name}.tar" todir="${scouter.whole.packaging.prepare.dir}"/>
290288
</target>
291289
</configuration>
292290
<goals>
@@ -297,4 +295,4 @@
297295
</plugin>
298296
</plugins>
299297
</build>
300-
</project>
298+
</project>

0 commit comments

Comments
 (0)