Merge "Removing log4j from policy/parent"

diff --combined integration/pom.xml
index 9758098,9cb5675..17c278e
--- 1/integration/pom.xml
--- 2/integration/pom.xml
+++ b/integration/pom.xml
@@@ -281,11 -281,6 +281,6 @@@
                  <artifactId>slf4j-api</artifactId>
                  <version>1.7.25</version>
              </dependency>
-             <dependency>
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-                 <version>1.2.17</version>
-             </dependency>
              <dependency>
                  <groupId>ch.qos.logback</groupId>
                  <artifactId>logback-core</artifactId>
@@@ -341,7 -336,7 +336,7 @@@
              <dependency>
                  <groupId>org.java-websocket</groupId>
                  <artifactId>Java-WebSocket</artifactId>
 -                <version>1.3.8</version>
 +                <version>1.5.1</version>
              </dependency>
  
              <!-- SnakeYAML -->