Merge pull request #50 from unzerdev/develop

Merge Develop into Master for Release 1.1.2.2 with Hotfix for Log4j-Exploit

Author: DerAusHeidelberg

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres
 to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.1.2.2][1.1.2.2]
+
+### Changed
+
+*   Upgrade of the used Log4j Dependencies to fix the Log4j Zero-Day-Exploit
+*   Several minor improvements.
+
 ## [1.1.2.1][1.1.2.1]
 
 ### Changed
@@ -85,6 +92,8 @@ to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 *   Remove deprecated classes
     *   RestCommunication
 
+[1.1.2.2]: http://github.com/unzerdev/java-sdk/compare/1.1.2.1..1.1.2.2
+
 [1.1.2.1]: http://github.com/unzerdev/java-sdk/compare/1.1.2.0..1.1.2.1
 
 [1.1.2.0]: http://github.com/unzerdev/java-sdk/compare/1.1.1.1..1.1.2.0

README.md

@@ -12,7 +12,7 @@ Java 1.8 or later.
 <dependency>
   <groupId>com.unzer.payment</groupId>
   <artifactId>java-sdk</artifactId>
-  <version>1.1.2.1</version>
+  <version>1.1.2.2</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.unzer.payment</groupId>
     <artifactId>java-sdk</artifactId>
-    <version>1.1.2.1</version>
+    <version>1.1.2.2</version>
     <name>Unzer Java SDK</name>
     <description>Unzer Java SDK</description>
     <url>https://docs.unzer.com/</url>
@@ -247,13 +247,13 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.13.1</version>
+            <version>2.15.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.1</version>
+            <version>2.15.0</version>
         </dependency>
 
 

src/test/java/com/unzer/payment/business/paymenttypes/PaypalTest.java

@@ -50,7 +50,7 @@ public void testCreatePaypalWithEmail() throws HttpCommunicationException {
 		paypal.setEmail("test.user@email.com");
 		paypal = (Paypal) getUnzer().createPaymentType(paypal);
 		assertNotNull(paypal.getId());
-		assertEquals(null, paypal.getEmail());
+		assertEquals("test.user@email.com", paypal.getEmail());
 	}
 
 	@Test

src/test/java/com/unzer/payment/communication/JsonDateConverterTest.java

@@ -14,26 +14,24 @@ public class JsonDateConverterTest {
 
     @Test
     public void getDateTestFormatDateTime(){
-        System.setProperty("user.timezone", "UTC");
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("date", "1980-12-01 12:00:00");
 
 
         JsonDateConverter jsonDateConverter = new JsonDateConverter();
         Date jsonDate = jsonDateConverter.getDate(jsonObject.get("date"));
-        assertEquals("Mon Dec 01 12:00:00 UTC 1980", jsonDate.toString());
+        assertEquals("Mon Dec 01 13:00:00 CET 1980", jsonDate.toString());
     }
 
     @Test
     public void getDateTestFormatDate(){
-        System.setProperty("user.timezone", "UTC");
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("date", "1980-12-01");
 
 
         JsonDateConverter jsonDateConverter = new JsonDateConverter();
         Date jsonDate = jsonDateConverter.getDate(jsonObject.get("date"));
-        assertEquals("Mon Dec 01 00:00:00 UTC 1980", jsonDate.toString());
+        assertEquals("Mon Dec 01 01:00:00 CET 1980", jsonDate.toString());
     }
 
     @Test