Merge pull request #401 from ashitsalesforce/master

update log4j to 2.17.1
forcedotcom · Jan 3, 2022 · 6df81f3 · 6df81f3
2 parents 6d6303b + f2d00dc
commit 6df81f3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/dlbuilder.sh b/dlbuilder.sh
@@ -43,6 +43,7 @@ run_mvn() {
   echo "removing JndiLookup.class from ${log4j_version_num}"
   zip -q -d ${HOME}/.m2/repository/org/apache/logging/log4j/log4j-core/${log4j_version_num}/log4j-core-${log4j_version_num}.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
   zip -q -d ${HOME}/.m2/repository/org/apache/logging/log4j/log4j-core/${log4j_version_num}/log4j-core-${log4j_version_num}.jar org/apache/logging/log4j/core/appender/mom/JmsAppender.class
+  zip -q -d ${HOME}/.m2/repository/org/apache/logging/log4j/log4j-core/${log4j_version_num}/log4j-core-${log4j_version_num}.jar org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.class
 
   # build uber jar
   mvn clean package -DskipTests 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.force</groupId>
   <artifactId>dataloader</artifactId>
   <packaging>jar</packaging>
-  <version>53.0.2</version>
+  <version>53.0.3</version>
   <name>Data Loader</name>
   <url>https://github.com/forcedotcom/dataloader</url>
   <organization>
@@ -89,13 +89,13 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.17.0</version>
+      <version>2.17.1</version>
     </dependency>
 <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.17.0</version>
+      <version>2.17.1</version>
     </dependency>
 <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
     <dependency>

diff --git a/src/main/java/com/salesforce/dataloader/util/DateOnlyCalendar.java b/src/main/java/com/salesforce/dataloader/util/DateOnlyCalendar.java
@@ -30,11 +30,19 @@
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import com.salesforce.dataloader.process.DataLoaderRunner;
 
 
 public class DateOnlyCalendar extends GregorianCalendar {
     static final TimeZone GMT_TZ = TimeZone.getTimeZone("GMT");
+    static final Logger logger;
+
+    static {
+        logger = LogManager.getLogger(DateOnlyCalendar.class);
+    }
 
     public DateOnlyCalendar() {
         super();
@@ -47,6 +55,12 @@ private DateOnlyCalendar(TimeZone tz) {
 
     public void setTimeInMillis(long specifiedTimeInMilliSeconds) {
         TimeZone myTimeZone = super.getTimeZone();
+
+        if (myTimeZone == null) {
+            logger.info("timezone is null");
+        } else {
+            logger.info("Timezone is " + myTimeZone.getDisplayName());
+        }
         Calendar cal = Calendar.getInstance(myTimeZone);
         cal.setTimeInMillis(specifiedTimeInMilliSeconds);
 

diff --git a/src/test/resources/testfiles/data/dateWithTimeZone.csv b/src/test/resources/testfiles/data/dateWithTimeZone.csv
@@ -1,3 +1,3 @@
 NAME,TYPE,PHONE,ACCOUNTNUMBER__C,WEBSITE,ANNUALREVENUE,ORACLE_ID__C,DATE,DATE_ONLY
 account insert #0,Account,415-555-0000,ACCT_0,http://www.accountInsert0.com,0,1-00000,2010-10-14T12:00:00.000Z-0300,2010-10-14T12:00:00.000Z
-account insert #1,Account,415-555-0000,ACCT_1,http://www.accountInsert1.com,0,1-00001,2010-10-14T12:00:00.000Z-0300,2010-10-14T12:00:00.000
+account insert #1,Account,415-555-0000,ACCT_1,http://www.accountInsert1.com,0,1-00001,2010-10-14T12:00:00.000Z-0300,2010-10-14T00:00:00.000