Skip to content
Snippets Groups Projects
Commit 79eec30f authored by bhill6@wisc.edu's avatar bhill6@wisc.edu
Browse files

Removing log4j dependencies from test and substituting logback as the slf4j...

Removing log4j dependencies from test and substituting logback as the slf4j provider, adding gitlab security scanning configurations
parent 9de23040
No related branches found
No related tags found
1 merge request!36Dependency updates to eliminate vulnerabilities discovered by dependency-check
Pipeline #137713 passed with warnings
This commit is part of merge request !36. Comments created here will be created in the context of that merge request.
include:
# Security scanning
- template: Security/SAST.gitlab-ci.yml
- template: Security/Secret-Detection.gitlab-ci.yml
- template: Security/Dependency-Scanning.gitlab-ci.yml
image: maven:3-amazoncorretto-8 image: maven:3-amazoncorretto-8
variables: variables:
...@@ -20,10 +26,21 @@ default: ...@@ -20,10 +26,21 @@ default:
- aws - aws
- docker - docker
stages:
- test # GitLab security scanning jobs use the 'test' stage
- deploy
test: test:
stage: test stage: test
script: script:
- mvn clean $MAVEN_CLI_OPTS verify - mvn clean $MAVEN_CLI_OPTS verify
artifacts:
paths:
- uw-spring-security-config/target/dependency-check-report.html
- uw-spring-security-core/target/dependency-check-report.html
- uw-spring-security-sample-war/target/dependency-check-report.html
- uw-spring-security-web/target/dependency-check-report.html
expire_in: 1 year
deploy: deploy:
stage: deploy stage: deploy
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Documentation: https://jeremylong.github.io/DependencyCheck/general/suppression.html
-->
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress>
<notes><![CDATA[Long discussion about this CVE by Spring: https://github.com/spring-projects/spring-framework/issues/24434]]></notes>
<packageUrl regex="true">^pkg:maven/org\.springframework/spring.*$</packageUrl>
<cve>CVE-2016-1000027</cve>
</suppress>
</suppressions>
\ No newline at end of file
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<revision>3.0.4</revision> <revision>3.0.4</revision>
<adi.development.version>2.0.1</adi.development.version> <adi.development.version>2.0.1</adi.development.version>
<jackson.version>2.14.0-rc1</jackson.version> <jackson.version>2.14.0-rc1</jackson.version>
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>2.0.3</slf4j.version>
<spring.framework.version>5.3.23</spring.framework.version> <spring.framework.version>5.3.23</spring.framework.version>
<spring.security.version>5.7.3</spring.security.version> <spring.security.version>5.7.3</spring.security.version>
</properties> </properties>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.13.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
...@@ -161,9 +161,9 @@ ...@@ -161,9 +161,9 @@
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>logback-classic</artifactId>
<version>${slf4j.version}</version> <version>1.3.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
...@@ -274,6 +274,9 @@ ...@@ -274,6 +274,9 @@
<groupId>org.owasp</groupId> <groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId> <artifactId>dependency-check-maven</artifactId>
<version>7.0.4</version> <version>7.0.4</version>
<configuration>
<suppressionFile>cve-supressions.xml</suppressionFile>
</configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>
......
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>logback-classic</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>logback-classic</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -50,16 +50,15 @@ ...@@ -50,16 +50,15 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>jcl-over-slf4j</artifactId> <artifactId>logback-classic</artifactId>
<scope>runtime</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>logback-classic</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment