Author: ggregory
Date: Mon May 26 15:25:18 2014
New Revision: 1597606
URL: http://svn.apache.org/r1597606
Log:
Replace sun.misc.BASE64Decoder with org.apache.commons.codec.binary.Base64.
Modified:
logging/log4j/log4j2/trunk/log4j-core/pom.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
logging/log4j/log4j2/trunk/pom.xml
Modified: logging/log4j/log4j2/trunk/log4j-core/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/pom.xml?rev=1597606&r1=1597605&r2=1597606&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/pom.xml Mon May 26 15:25:18 2014
@@ -207,6 +207,12 @@
<artifactId>org.apache.felix.framework</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Other -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java?rev=1597606&r1=1597605&r2=1597606&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
Mon May 26 15:25:18 2014
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import org.apache.commons.codec.binary.Base64;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.util.Clock;
@@ -33,8 +34,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import sun.misc.BASE64Decoder;
-
import static org.junit.Assert.*;
public class Log4jLogEventTest {
@@ -245,7 +244,7 @@ public class Log4jLogEventTest {
+
"TG9yZy5hcGFjaGUubG9nZ2luZy5sb2c0ai5jb3JlLmltcGwuVGhyb3dhYmxlUHJveHk7+u0B4IWi\r\n"
+ "6zkCAAB4cAAAAAA=";
- byte[] binaryDecoded = new BASE64Decoder().decodeBuffer(base64);
+ byte[] binaryDecoded = Base64.decodeBase64(base64);
final Log4jLogEvent evt2 = deserialize(binaryDecoded);
assertEquals(loggerFQN, evt2.getLoggerFqcn());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java?rev=1597606&r1=1597605&r2=1597606&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
Mon May 26 15:25:18 2014
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Stack;
+import org.apache.commons.codec.binary.Base64;
import org.apache.logging.log4j.core.jackson.Log4jJsonObjectMapper;
import org.junit.Test;
@@ -168,7 +169,7 @@ public class ThrowableProxyTest {
"ZVByb3h5O/rtAeCFous5AgAAeHAAAAAA";
- byte[] binaryDecoded = new BASE64Decoder().decodeBuffer(base64);
+ byte[] binaryDecoded = Base64.decodeBase64(base64);
final ThrowableProxy proxy2 = deserialize(binaryDecoded);
assertEquals(this.getClass().getName() + "$DeletedException",
proxy2.getName());
Modified: logging/log4j/log4j2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1597606&r1=1597605&r2=1597606&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Mon May 26 15:25:18 2014
@@ -230,6 +230,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.9</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
