FC-274 - Upgrade maven plugins and dependencies
diff --git a/pom.xml b/pom.xml
index 4469ca5..1639014 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
<version.api.all>1.0.3</version.api.all>
<version.commons.beanutils>1.7.0</version.commons.beanutils>
<version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
- <version.commons.codec>1.11</version.commons.codec>
+ <version.commons.codec>1.13</version.commons.codec>
<version.commons.collections>3.2.2</version.commons.collections>
<version.commons.configuration>1.10</version.commons.configuration>
<version.commons.digester>1.8</version.commons.digester>
@@ -110,28 +110,28 @@
<version.dom4j>1.6.1</version.dom4j>
<version.ehcache.core>2.6.11</version.ehcache.core>
<version.hamcrest.core>1.3</version.hamcrest.core>
- <version.httpcomponent.httpclient>4.5.6</version.httpcomponent.httpclient>
- <version.httpcomponent.httpcore>4.4.10</version.httpcomponent.httpcore>
- <version.jasypt>1.9.2</version.jasypt>
- <version.javaee.api>8.0</version.javaee.api>
- <version.javax.ws.rs-api>2.1</version.javax.ws.rs-api>
+ <version.httpcomponent.httpclient>4.5.10</version.httpcomponent.httpclient>
+ <version.httpcomponent.httpcore>4.4.12</version.httpcomponent.httpcore>
+ <version.jasypt>1.9.3</version.jasypt>
+ <version.javaee.api>8.0.1</version.javaee.api>
+ <version.javax.ws.rs-api>2.1.1</version.javax.ws.rs-api>
<version.jaxb>2.3.0.1</version.jaxb>
<version.jaxb.api>2.3.0</version.jaxb.api>
- <version.jgrapht-core>1.0.0</version.jgrapht-core>
+ <version.jgrapht-core>1.3.1</version.jgrapht-core>
<version.jmeter.core>2.11</version.jmeter.core>
<version.jmeter.java>2.11</version.jmeter.java>
<version.junit>4.12</version.junit>
<version.log4j>1.2.17</version.log4j>
<version.mina.core>2.0.13</version.mina.core>
<version.opencsv>2.3</version.opencsv>
- <version.slf4j.api>1.7.21</version.slf4j.api>
+ <version.slf4j.api>1.7.29</version.slf4j.api>
<version.slf4j.log4j12>1.7.21</version.slf4j.log4j12>
<version.stax2.api>3.1.1</version.stax2.api>
<version.woodstox.core.asl>4.2.0</version.woodstox.core.asl>
<version.xml.apis>1.0b2</version.xml.apis>
<version.xmlschema.core>2.0.3</version.xmlschema.core>
<version.xpp3>1.1.4c</version.xpp3>
- <version.jackson-annotations>2.9.7</version.jackson-annotations>
+ <version.jackson-annotations>2.10.1</version.jackson-annotations>
<!-- ===================================================== -->
<!-- This is a hack to allow someone to release -->
@@ -221,6 +221,11 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
+ <!-- CVE-2018-1000632 -->
+ <exclusion>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -490,24 +495,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<inherited>true</inherited>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
@@ -546,7 +553,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -558,7 +565,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.2.0</version>
<configuration>
<excludes>
<exclude>**/bootstrap</exclude>
@@ -612,7 +619,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>3.3.4</version>
+ <version>5.0.0</version>
<configuration>
<failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
<suppressionFile>${project.basedir}/src/owasp/suppression.xml</suppressionFile>
@@ -632,7 +639,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
index 77b3d69..179fcbd 100755
--- a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
@@ -46,7 +46,7 @@
import org.apache.directory.fortress.core.model.User;
import org.apache.directory.fortress.core.model.UserRole;
import org.apache.directory.fortress.core.util.Config;
-import org.jgrapht.UndirectedGraph;
+//import org.jgrapht.UndirectedGraph;
import org.jgrapht.graph.DefaultEdge;
import org.jgrapht.graph.SimpleDirectedGraph;
import org.jgrapht.graph.SimpleGraph;
@@ -1228,6 +1228,7 @@
* @throws org.apache.directory.fortress.core.SecurityException
*
*/
+/*
public static Hier toHierTest(UndirectedGraph<String, Relationship> graph)
{
Hier he = new Hier();
@@ -1246,6 +1247,7 @@
}
return he;
}
+*/
/**
@@ -1285,6 +1287,7 @@
return graph;
}
+/*
public static void addJGraph2()
{
ReaderUtil.clearScreen();
@@ -1313,6 +1316,7 @@
System.out.println("ENTER to continue");
ReaderUtil.readChar();
}
+*/
private static String getTestDataLabel2()
{
