Merge "Removing log4j from policy/parent"

diff --git a/docs/development/devtools/zip/frankfurt/apex_s3p_result.tar b/docs/development/devtools/zip/frankfurt/apex_s3p_result.tar
deleted file mode 100644 (file)
index 1b4eeea..0000000
Binary files a/docs/development/devtools/zip/frankfurt/apex_s3p_result.tar and /dev/null differ

diff --git a/docs/development/devtools/zip/frankfurt/apex_s3p_result.tar.gz b/docs/development/devtools/zip/frankfurt/apex_s3p_result.tar.gz
new file mode 100644 (file)
index 0000000..4e4d6e8
Binary files /dev/null and b/docs/development/devtools/zip/frankfurt/apex_s3p_result.tar.gz differ

diff --git a/docs/development/devtools/zip/result.tar b/docs/development/devtools/zip/result.tar
deleted file mode 100644 (file)
index 39a2945..0000000
Binary files a/docs/development/devtools/zip/result.tar and /dev/null differ

diff --git a/docs/development/devtools/zip/result.zip b/docs/development/devtools/zip/result.zip
deleted file mode 100644 (file)
index 8b5049b..0000000
Binary files a/docs/development/devtools/zip/result.zip and /dev/null differ

diff --git a/integration/pom.xml b/integration/pom.xml
index 9cb5675..17c278e 100644 (file)
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -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 -->