update to 2018a

Author: MenoData

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.time4j</groupId>
     <artifactId>time4j-tzdata</artifactId>
-    <version>1.10-2017b</version>
+    <version>2.0-2018a</version>
     <packaging>jar</packaging>
     <name>Time4J-TZDATA</name>
 
@@ -196,19 +196,19 @@
         <dependency>
             <groupId>net.time4j</groupId>
             <artifactId>time4j-core</artifactId>
-            <version>[3.5,]</version>
+            <version>[4.34,]</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.time4j</groupId>
             <artifactId>time4j-olson</artifactId>
-            <version>[3.5,]</version>
+            <version>[4.34,]</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.time4j</groupId>
             <artifactId>time4j-i18n</artifactId>
-            <version>[3.5,]</version>
+            <version>[4.34,]</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/net/time4j/tz/spi/TimezoneRepositoryProviderSPI.java

@@ -1,6 +1,6 @@
 /*
  * -----------------------------------------------------------------------
- * Copyright © 2013-2016 Meno Hochschild, <http://www.menodata.de/>
+ * Copyright © 2013-2018 Meno Hochschild, <http://www.menodata.de/>
  * -----------------------------------------------------------------------
  * This file (TimezoneRepositoryProviderSPI.java) is part of project Time4J.
  *
@@ -29,7 +29,6 @@
 import net.time4j.tz.TransitionHistory;
 import net.time4j.tz.ZoneModelProvider;
 import net.time4j.tz.ZoneNameProvider;
-import net.time4j.tz.ZoneProvider;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -54,13 +53,13 @@
 
 /**
  * <p>Reads timezone repository-files compiled by the class
- * {@code net.time4j.tool.TimezoneRepositoryCompiler}. </p>
+ * {@code net.time4j.tool.TimezoneRepositoryCompiler (v2.0)}. </p>
  *
  * @author  Meno Hochschild
  * @since   1.0
  */
 public class TimezoneRepositoryProviderSPI
-    implements ZoneProvider, ZoneModelProvider, LeapSecondProvider {
+    implements ZoneModelProvider, ZoneNameProvider, LeapSecondProvider {
 
     //~ Statische Felder/Initialisierungen --------------------------------
 

src/main/resources/tzrepo/tzdata.repository

@@ -33,7 +33,7 @@
 @RunWith(JUnit4.class)
 public class RepositoryTest {
 
-    private static final String STD_VERSION = "2017b";
+    private static final String STD_VERSION = "2018a";
     private static final ChronoFormatter<Moment> PARSER = Iso8601Format.EXTENDED_DATE_TIME_OFFSET;
 
     private String propertyValue = null;
@@ -107,6 +107,24 @@ public void tzAfricaCasablanca() throws ParseException {
         checkTransitions(zoneID, start, end, data);
     }
 
+    @Test
+    public void tzAfricaSudan() throws ParseException {
+        use("2017c"); // splitting of zones Africa/Khartoum and Africa/Juba
+        String zoneID1 = "Africa/Khartoum";
+        String zoneID2 = "Africa/Juba";
+        int start = 2000;
+        int end = 2017;
+        Object[][] data1 = {
+            {"2000-01-15T12:00+02:00", 2, 3, 0},
+            {"2017-11-01T00:00+03:00", 3, 2, 0},
+        };
+        Object[][] data2 = {
+            {"2000-01-15T12:00+02:00", 2, 3, 0},
+        };
+        checkTransitions(zoneID1, start, end, data1);
+        checkTransitions(zoneID2, start, end, data2);
+    }
+
     @Test
     public void tzAmericaNewYork() throws ParseException {
         String zoneID = "America/New_York";
@@ -581,6 +599,26 @@ public void tzEuropeSaratov() throws ParseException, IOException {
         assertThat(zt.getDaylightSavingOffset(), is(0));
     }
 
+    @Test
+    public void tzEuropeDublin() throws ParseException, IOException {
+        use("2018a");
+        Timezone tz = Timezone.of("Europe/Dublin");
+
+        Moment winter = PlainTimestamp.of(2018, 1, 16, 0, 0).atUTC();
+        assertThat(tz.getStandardOffset(winter).getIntegralAmount(), is(3600));
+        assertThat(tz.getDaylightSavingOffset(winter).getIntegralAmount(), is(-3600));
+        assertThat(tz.getOffset(winter).getIntegralAmount(), is(0));
+        assertThat(tz.isDaylightSaving(winter), is(false));
+
+        Moment summer = PlainTimestamp.of(2018, 7, 16, 0, 0).atUTC();
+        assertThat(tz.getStandardOffset(summer).getIntegralAmount(), is(3600));
+        assertThat(tz.getDaylightSavingOffset(summer).getIntegralAmount(), is(0));
+        assertThat(tz.getOffset(summer).getIntegralAmount(), is(3600));
+        assertThat(tz.isDaylightSaving(summer), is(true));
+
+        // tz.dump(System.out);
+    }
+
     @Test
     public void leapSecondAtEndOf2016() {
         use("2016h");