From 6f357c432b597a136342009c09f54ed2d148f29a Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu>
Date: Wed, 16 May 2018 18:11:04 +0200
Subject: [PATCH] add dependency-check-maven plugin. use javax.servlet-api
from maven repo
---
pom.xml | 21 +++++++++++++++++++++
smp-parent-pom/pom.xml | 4 ++--
smp-webapp/pom.xml | 2 +-
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06596ed7a..ef0daa345 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,6 +170,27 @@
</build>
</profile>
+ <profile>
+ <id>dependency-check</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>3.1.2</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
<build>
diff --git a/smp-parent-pom/pom.xml b/smp-parent-pom/pom.xml
index 939f2b5b3..0b1236219 100644
--- a/smp-parent-pom/pom.xml
+++ b/smp-parent-pom/pom.xml
@@ -88,7 +88,7 @@
<commons-net.version>1.4.1</commons-net.version>
<ant-commons-net.version>1.6.5</ant-commons-net.version>
<jetty.version>8.1.15.v20140411</jetty.version>
- <servlet-api.version>3.0</servlet-api.version>
+ <servlet-api.version>3.0.1</servlet-api.version>
<metro.version>2.2.1-1</metro.version>
<commons-io.version>2.4</commons-io.version>
<junitparams.version>1.0.5</junitparams.version>
@@ -497,7 +497,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/smp-webapp/pom.xml b/smp-webapp/pom.xml
index 628a629ac..49af3b13d 100644
--- a/smp-webapp/pom.xml
+++ b/smp-webapp/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>eu.europa.ec.edelivery</groupId>
--
GitLab