Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit b3d5979e authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Merge pull request #99 in EDELIVERY/smp from...

Merge pull request #99 in EDELIVERY/smp from feature/EDELIVERY-3370-produce-a-raport-on-every to development

* commit '27a23d43b3f7559427480ebebfd451781e2d4385':
  Disable .Net Assembly Analyzer for dependency-check.
  Set dependency-check to skip artifacts not bundled in distribution (Provided and Runtime scope).
  add dependency-check-maven plugin. use javax.servlet-api  from maven repo
parents bcf7a3c9 3cdfe979
No related branches found
No related tags found
No related merge requests found
......@@ -170,6 +170,33 @@
</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>
<configuration>
<skipProvidedScope>true</skipProvidedScope>
<skipRuntimeScope>true</skipRuntimeScope>
<!-- Disable .Net Assembly Analyzer -->
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
</configuration>
<executions>
<execution>
<goals>
<goal>aggregate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
......
......@@ -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>
......
......@@ -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>
......
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