Skip to content

Commit 27997b8

Browse files
SNOW-2019041: Remove Dependency on joda-time
1 parent 8d999f0 commit 27997b8

File tree

5 files changed

+8
-26
lines changed

5 files changed

+8
-26
lines changed

FIPS/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,10 +450,6 @@
450450
<pattern>google.type</pattern>
451451
<shadedPattern>${shadeBase}.google.type</shadedPattern>
452452
</relocation>
453-
<relocation>
454-
<pattern>org.joda</pattern>
455-
<shadedPattern>${shadeBase}.joda</shadedPattern>
456-
</relocation>
457453
<relocation>
458454
<pattern>com.yammer</pattern>
459455
<shadedPattern>${shadeBase}.yammer</shadedPattern>

parent-pom.xml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<jacoco.skip.instrument>true</jacoco.skip.instrument>
6060
<javax.servlet.version>3.1.0</javax.servlet.version>
6161
<jna.version>5.13.0</jna.version>
62-
<joda.time.version>2.8.1</joda.time.version>
6362
<json.smart.version>2.5.2</json.smart.version>
6463
<junit4.version>4.13.2</junit4.version>
6564
<junit.version>5.11.1</junit.version>
@@ -368,11 +367,6 @@
368367
<artifactId>javax.servlet-api</artifactId>
369368
<version>${javax.servlet.version}</version>
370369
</dependency>
371-
<dependency>
372-
<groupId>joda-time</groupId>
373-
<artifactId>joda-time</artifactId>
374-
<version>${joda.time.version}</version>
375-
</dependency>
376370
<dependency>
377371
<groupId>net.minidev</groupId>
378372
<artifactId>json-smart</artifactId>
@@ -602,6 +596,12 @@
602596
<dependency>
603597
<groupId>com.amazonaws</groupId>
604598
<artifactId>aws-java-sdk-core</artifactId>
599+
<exclusions>
600+
<exclusion>
601+
<groupId>joda-time</groupId>
602+
<artifactId>joda-time</artifactId>
603+
</exclusion>
604+
</exclusions>
605605
</dependency>
606606
<dependency>
607607
<groupId>com.amazonaws</groupId>
@@ -691,10 +691,6 @@
691691
<groupId>javax.servlet</groupId>
692692
<artifactId>javax.servlet-api</artifactId>
693693
</dependency>
694-
<dependency>
695-
<groupId>joda-time</groupId>
696-
<artifactId>joda-time</artifactId>
697-
</dependency>
698694
<dependency>
699695
<groupId>net.minidev</groupId>
700696
<artifactId>json-smart</artifactId>

pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -893,10 +893,6 @@
893893
<pattern>google.type</pattern>
894894
<shadedPattern>${shadeBase}.google.type</shadedPattern>
895895
</relocation>
896-
<relocation>
897-
<pattern>org.joda</pattern>
898-
<shadedPattern>${shadeBase}.joda</shadedPattern>
899-
</relocation>
900896
<relocation>
901897
<pattern>com.yammer</pattern>
902898
<shadedPattern>${shadeBase}.yammer</shadedPattern>

src/main/java/net/snowflake/client/core/EventHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.io.PrintWriter;
1010
import java.text.DateFormat;
1111
import java.text.SimpleDateFormat;
12+
import java.time.Instant;
1213
import java.util.ArrayList;
1314
import java.util.Comparator;
1415
import java.util.Date;
@@ -27,7 +28,6 @@
2728
import java.util.zip.GZIPOutputStream;
2829
import net.snowflake.client.log.SFLogger;
2930
import net.snowflake.client.log.SFLoggerFactory;
30-
import org.joda.time.DateTime;
3131

3232
public class EventHandler extends Handler {
3333
private static final SFLogger logger = SFLoggerFactory.getLogger(EventHandler.class);
@@ -98,7 +98,7 @@ public void run() {
9898
private final Map<String, AtomicInteger> incidentCounter;
9999

100100
// Map
101-
private final Map<String, DateTime> throttledIncidents;
101+
private final Map<String, Instant> throttledIncidents;
102102

103103
// Queue to buffer events while they are waiting to be flushed
104104
private final ArrayList<Event> eventBuffer;

thin_public_pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<jackson.version>2.18.1</jackson.version>
5555
<javax.servlet.version>3.1.0</javax.servlet.version>
5656
<jna.version>5.13.0</jna.version>
57-
<joda.time.version>2.8.1</joda.time.version>
5857
<json.smart.version>2.5.2</json.smart.version>
5958
<jsoup.version>1.15.3</jsoup.version>
6059
<metrics.version>2.2.0</metrics.version>
@@ -230,11 +229,6 @@
230229
<artifactId>javax.servlet-api</artifactId>
231230
<version>${javax.servlet.version}</version>
232231
</dependency>
233-
<dependency>
234-
<groupId>joda-time</groupId>
235-
<artifactId>joda-time</artifactId>
236-
<version>${joda.time.version}</version>
237-
</dependency>
238232
<dependency>
239233
<groupId>net.java.dev.jna</groupId>
240234
<artifactId>jna</artifactId>

0 commit comments

Comments
 (0)