updated libs

zeusbaba · Aug 3, 2016 · c750d28 · c750d28
1 parent c7a4bbd
commit c750d28
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@
 target/*
 bin/*
 
+/target/
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>strtotime-for-java</groupId>
   <artifactId>strtotime-for-java</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.3-SNAPSHOT</version>
   <name>strtotime-for-java</name>
   <description>strtotime Java library</description>
   <build>
@@ -19,23 +19,24 @@
     </plugins>
   </build>
   	<dependencies>
+  		<!-- 
 	    <dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 			<version>2.6</version>
 		</dependency>
-		<!--
+		-->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 		  	<artifactId>commons-lang3</artifactId>
-		  	<version>3.2.1</version> 
+		  	<version>3.4</version> 
 	  	</dependency>
-		 -->
+
 	</dependencies>
 	<developers>
         <developer>
             <id>WareNinja</id>
-            <name>Incognito Ninja</name>
+            <name>incognito</name>
             <email>yg@wareninja.com</email>
         </developer>
     </developers>

diff --git a/src/ExampleUsage.java b/src/ExampleUsage.java
@@ -7,6 +7,11 @@
  */
 
 
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+import java.util.TimeZone;
+
 import com.wareninja.opensource.strtotime.MyUtils;
 import com.wareninja.opensource.strtotime.Str2Time;
 
@@ -44,8 +49,22 @@ public static void main(String[] args) {
 		System.out.println("+2 weeks -> " + MyUtils.getFormattedDate( Str2Time.convert("2 weeks") ));
 		System.out.println("-4 weeks -> " + MyUtils.getFormattedDate( Str2Time.convert("-4 weeks") ));
 		System.out.println("Mon Sep 24 03:35:21 +0000 2012 -> " + MyUtils.getFormattedDate( Str2Time.convert("Mon Sep 24 03:35:21 +0000 2012") ));
+		System.out.println("2014-03-04T08:45:17.315-05:00 -> " + MyUtils.getFormattedDate( Str2Time.convert("2014-03-04T08:45:17.315-05:00") ));
 
-
+		/*
+		 String[] formats = new String[] {
+				   "yyyy-MM-dd HH:mm:ss.SSSZ",
+				   "yyyy-MM-dd'T'HH:mm:ss.SSSZ",
+				   "yyyy-MM-dd'T'HH:mm:ss.SSSZZZ",
+				   "yyyy-MM-dd'T'HH:mm:ss.SSS ZZZZZ",
+				 };
+				 for (String format : formats) {
+				   SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.US);
+				   System.out.format("%30s %s\n", format, sdf.format(new Date(System.currentTimeMillis())));
+				   //sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+				   //System.out.format("%30s %s\n", format, sdf.format(new Date(System.currentTimeMillis())));
+				 }
+				 */
 	}
 
 }
diff --git a/src/com/wareninja/opensource/strtotime/DaysMatcher.java b/src/com/wareninja/opensource/strtotime/DaysMatcher.java
@@ -12,8 +12,8 @@
 import java.util.Date;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 
 class DaysMatcher implements Matcher {
 

diff --git a/src/com/wareninja/opensource/strtotime/MinutesMatcher.java b/src/com/wareninja/opensource/strtotime/MinutesMatcher.java
@@ -8,8 +8,8 @@
 import java.util.Date;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 
 class MinutesMatcher implements Matcher {
 

diff --git a/src/com/wareninja/opensource/strtotime/MyUtils.java b/src/com/wareninja/opensource/strtotime/MyUtils.java
@@ -14,7 +14,7 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class MyUtils {
 

diff --git a/src/com/wareninja/opensource/strtotime/Str2Time.java b/src/com/wareninja/opensource/strtotime/Str2Time.java
@@ -42,8 +42,9 @@ public final class Str2Time {
         matchers.add(new DateFormatMatcher(new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss")));// e.g. Mon, 03 Dec 2012 20:00:00
         matchers.add(new DateFormatMatcher(new SimpleDateFormat("yyyy MM dd")));
         matchers.add(new DateFormatMatcher(new SimpleDateFormat("EEE MMM d HH:mm:ss Z yyyy"))); // format used by TWITTER! e.g. "Mon Sep 24 03:35:21 +0000 2012"
-
-        // NOTE: you can add more custom matchers as you like!!!
+        matchers.add(new DateFormatMatcher(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"))); // format used by DISCOURSE! e.g. "2014-03-04T08:45:17.315-05:00"
+
+        // NOTE: you can add more custom matchers as you need!!!
     }
 
     public static void registerMatcher(Matcher matcher) {

diff --git a/src/com/wareninja/opensource/strtotime/WeeksMatcher.java b/src/com/wareninja/opensource/strtotime/WeeksMatcher.java
@@ -12,8 +12,8 @@
 import java.util.Date;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 
 class WeeksMatcher implements Matcher {