adapt to new time4j-version 3.0

MenoData · Apr 26, 2015 · 46bd23c · 46bd23c
1 parent 77d5564
commit 46bd23c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.time4j</groupId>
     <artifactId>time4j-tzdata</artifactId>
-    <version>1.1-2015b</version>
+    <version>1.2-2015d</version>
     <packaging>jar</packaging>
     <name>Time4J-TZDATA</name>
 
@@ -196,15 +196,21 @@
         <dependency>
             <groupId>net.time4j</groupId>
             <artifactId>time4j-core</artifactId>
-            <version>[2.4,3.0)</version>
+            <version>[3.0,4.0)</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.time4j</groupId>
             <artifactId>time4j-olson</artifactId>
-            <version>[2.4,3.0)</version>
+            <version>[3.0,4.0)</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>net.time4j</groupId>
+            <artifactId>time4j-i18n</artifactId>
+            <version>[3.0,4.0)</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/src/test/java/net/time4j/tz/repository/RepositoryTest.java b/src/test/java/net/time4j/tz/repository/RepositoryTest.java
@@ -1,22 +1,23 @@
 package net.time4j.tz.repository;
 
-import net.time4j.Iso8601Format;
 import net.time4j.Moment;
-import net.time4j.PatternType;
 import net.time4j.PlainTimestamp;
-import net.time4j.format.ChronoFormatter;
+import net.time4j.format.expert.ChronoFormatter;
+import net.time4j.format.expert.Iso8601Format;
+import net.time4j.format.expert.PatternType;
 import net.time4j.tz.ZonalTransition;
 import net.time4j.tz.ZoneProvider;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.List;
+import java.util.Locale;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
@@ -569,9 +570,10 @@ private static Moment atStartOfYear(int year) {
 
     private static long parse(String time) throws ParseException {
         ChronoFormatter<Moment> p =
-            Moment.localFormatter(
+            ChronoFormatter.setUp(Moment.class, Locale.ROOT).addPattern(
                 "uuuu-MM-dd'T'HH:mmXXXXX",
-                PatternType.CLDR);
+                PatternType.CLDR
+            ).build();
         return p.parse(time).getPosixTime();
     }