summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pom.xml15
-rw-r--r--src/test/java/at/gv/util/demo/ZuseSSLTest.java10
2 files changed, 14 insertions, 11 deletions
diff --git a/pom.xml b/pom.xml
index 561b23e..ecb85c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,8 @@
<cxf.version>3.4.4</cxf.version>
<org.slf4j.version>1.7.32</org.slf4j.version>
+ <log4j.version>2.15.0</log4j.version>
+
<org.apache.httpcomponents.httpclient.version>4.5.13</org.apache.httpcomponents.httpclient.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-lang.version>2.6</commons-lang.version>
@@ -308,13 +310,14 @@
<artifactId>iaik_ecc_signed</artifactId>
<version>${iaik_ecc.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- <scope>test</scope>
- </dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
diff --git a/src/test/java/at/gv/util/demo/ZuseSSLTest.java b/src/test/java/at/gv/util/demo/ZuseSSLTest.java
index 516c228..cecbc19 100644
--- a/src/test/java/at/gv/util/demo/ZuseSSLTest.java
+++ b/src/test/java/at/gv/util/demo/ZuseSSLTest.java
@@ -30,7 +30,6 @@ import org.apache.http.ssl.PrivateKeyDetails;
import org.apache.http.ssl.PrivateKeyStrategy;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.util.EntityUtils;
-import org.apache.log4j.lf5.util.StreamUtils;
import at.gv.util.xsd.szr.pvp.sec.Security;
@@ -132,10 +131,11 @@ public class ZuseSSLTest {
System.out.println("HTTP StatusCode: " + response.getStatusLine().getStatusCode());
- if (response.getEntity().getContent() != null )
- System.out.println("Body: " + org.apache.commons.codec.binary.StringUtils.newStringUtf8(StreamUtils.getBytes(response.getEntity().getContent())));
-
-
+ if (response.getEntity().getContent() != null ) {
+ System.out.println("Body: " +
+ EntityUtils.toString(response.getEntity()));
+
+ }
System.out.println("Test finished");
} catch (Exception e) {