FGJ-87 Update dependencies in fabric-sdk-java (#61)

Update version of log4j due to security alert

Signed-off-by: andrew-coleman <[email protected]>

Author: andrew-coleman

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.hyperledger.fabric-sdk-java</groupId>
     <artifactId>fabric-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>2.1.3-snapshot</version>
+    <version>2.1.3</version>
     <name>fabric-java-sdk</name>
     <description>Java SDK for Hyperledger fabric project</description>
     <url>https://www.hyperledger.org/community/projects</url>
@@ -37,7 +37,7 @@
         <alpn-boot-version>8.1.7.v20160121</alpn-boot-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jacoco.version>0.8.2</jacoco.version>
-        <log4j.version>1.2.17</log4j.version>
+        <log4j.version>2.13.3</log4j.version>
         <org.hyperledger.fabric.sdktest.ITSuite>IntegrationSuite.java</org.hyperledger.fabric.sdktest.ITSuite>
         <gpg.executable>gpg2</gpg.executable>
     </properties>
@@ -148,15 +148,15 @@
 
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <version>${log4j.version}</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/log4j/apache-log4j-extras -->
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api -->
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>apache-log4j-extras</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-1.2-api</artifactId>
             <version>${log4j.version}</version>
         </dependency>
 

src/test/java/org/hyperledger/fabric/sdk/helper/ConfigTest.java

@@ -107,31 +107,6 @@ public void testExtraLogLevel() {
         Assert.assertFalse(config.extraLogLevel(99));
     }
 
-    @Test
-    public void testLogLevelTrace() {
-        testLogLevelAny("TRACE", org.apache.log4j.Level.TRACE);
-    }
-
-    @Test
-    public void testLogLevelDebug() {
-        testLogLevelAny("DEBUG", org.apache.log4j.Level.DEBUG);
-    }
-
-    @Test
-    public void testLogLevelInfo() {
-        testLogLevelAny("INFO", org.apache.log4j.Level.INFO);
-    }
-
-    @Test
-    public void testLogLevelWarn() {
-        testLogLevelAny("WARN", org.apache.log4j.Level.WARN);
-    }
-
-    @Test
-    public void testLogLevelError() {
-        testLogLevelAny("ERROR", org.apache.log4j.Level.ERROR);
-    }
-
     @Test
     public void defaultChaincodeEndorsementPluginTest() {
         assertNull(Config.getConfig().getDefaultChaincodeEndorsementPlugin());
@@ -156,18 +131,4 @@ private Object setSystemProperty(String propName, String propValue) {
         return propValue;
     }
 
-    // Helper function to test one of the possible log levels
-    private void testLogLevelAny(String levelString, Level level) {
-        String originalValue = System.setProperty(Config.LOGGERLEVEL, levelString);
-        try {
-            // Dummy call to ensure that a config instance is created and the
-            // underlying logging level is set...
-            Config.getConfig();
-            Assert.assertEquals(level, org.apache.log4j.Logger.getLogger("org.hyperledger.fabric").getLevel());
-        } finally {
-            // Restore the original value so that other tests run consistently
-            setSystemProperty(Config.LOGGERLEVEL, originalValue);
-        }
-    }
-
 }

src/test/java/org/hyperledger/fabric_ca/sdk/helper/ConfigTest.java

@@ -92,31 +92,6 @@ public void testGetters() {
         Assert.assertNotNull(config.getPeerCACerts());
     }
 
-    @Test
-    public void testLogLevelTrace() {
-        testLogLevelAny("TRACE", org.apache.log4j.Level.TRACE);
-    }
-
-    @Test
-    public void testLogLevelDebug() {
-        testLogLevelAny("DEBUG", org.apache.log4j.Level.DEBUG);
-    }
-
-    @Test
-    public void testLogLevelInfo() {
-        testLogLevelAny("INFO", org.apache.log4j.Level.INFO);
-    }
-
-    @Test
-    public void testLogLevelWarn() {
-        testLogLevelAny("WARN", org.apache.log4j.Level.WARN);
-    }
-
-    @Test
-    public void testLogLevelError() {
-        testLogLevelAny("ERROR", org.apache.log4j.Level.ERROR);
-    }
-
     // ==========================================================================================
     // Helper methods
     // ==========================================================================================
@@ -130,18 +105,4 @@ private void setSystemProperty(String propName, String propValue) {
         }
     }
 
-    // Helper function to test one of the possible log levels
-    private void testLogLevelAny(String levelString, Level level) {
-        String originalValue = System.setProperty(Config.LOGGERLEVEL, levelString);
-        try {
-            // Dummy call to ensure that a config instance is created and the
-            // underlying logging level is set...
-            Config.getConfig();
-            Assert.assertEquals(level, org.apache.log4j.Logger.getLogger("org.hyperledger.fabric_ca").getLevel());
-        } finally {
-            // Restore the original value so that other tests run consistently
-            setSystemProperty(Config.LOGGERLEVEL, originalValue);
-        }
-    }
-
 }