From 8a16e7ead1ded1ae96881c4755d83beb44180a39 Mon Sep 17 00:00:00 2001 From: Meno Hochschild Date: Mon, 15 Jun 2015 06:26:33 +0200 Subject: [PATCH] update to version 2015e including new Android service-loader-file (see issue #289) --- pom.xml | 14 ++++++++++---- .../TimezoneRepositoryProviderSPI.java | 5 +++-- .../services/net.time4j.tz.ExtZoneProvider | 4 ++++ src/main/resources/tzrepo/tzdata.repository | Bin 70745 -> 70777 bytes 4 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/META-INF/services/net.time4j.tz.ExtZoneProvider diff --git a/pom.xml b/pom.xml index 466e317..3a6884d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.time4j time4j-tzdata - 1.3-2015d + 1.4-2015e jar Time4J-TZDATA @@ -196,19 +196,25 @@ net.time4j time4j-core - [3.1,) + [3.2,] provided net.time4j time4j-olson - [3.1,) + [3.2,] + provided + + + net.time4j + time4j-misc + [3.2,] provided net.time4j time4j-i18n - [3.1,) + 3.2 test diff --git a/src/main/java/net/time4j/tz/repository/TimezoneRepositoryProviderSPI.java b/src/main/java/net/time4j/tz/repository/TimezoneRepositoryProviderSPI.java index 6d3be4d..2a10766 100644 --- a/src/main/java/net/time4j/tz/repository/TimezoneRepositoryProviderSPI.java +++ b/src/main/java/net/time4j/tz/repository/TimezoneRepositoryProviderSPI.java @@ -24,6 +24,7 @@ import net.time4j.PlainDate; import net.time4j.base.GregorianDate; import net.time4j.scale.LeapSecondProvider; +import net.time4j.tz.ExtZoneProvider; import net.time4j.tz.NameStyle; import net.time4j.tz.Timezone; import net.time4j.tz.TransitionHistory; @@ -56,7 +57,7 @@ * @since 1.0 */ public class TimezoneRepositoryProviderSPI - implements ZoneProvider, LeapSecondProvider { + implements ExtZoneProvider, LeapSecondProvider { //~ Statische Felder/Initialisierungen -------------------------------- @@ -72,7 +73,7 @@ public class TimezoneRepositoryProviderSPI JDK_NAME_REFS = Collections.unmodifiableSet(jdkNameRefs); } - private static final ZoneProvider NAME_PROVIDER = new ZoneNameProviderSPI(); + private static final ExtZoneProvider NAME_PROVIDER = new ZoneNameProviderSPI(); //~ Instanzvariablen -------------------------------------------------- diff --git a/src/main/resources/META-INF/services/net.time4j.tz.ExtZoneProvider b/src/main/resources/META-INF/services/net.time4j.tz.ExtZoneProvider new file mode 100644 index 0000000..d244991 --- /dev/null +++ b/src/main/resources/META-INF/services/net.time4j.tz.ExtZoneProvider @@ -0,0 +1,4 @@ +net.time4j.tz.spi.ZoneNameProviderSPI +net.time4j.tz.spi.WinZoneProviderSPI +net.time4j.tz.spi.MilZoneProviderSPI +net.time4j.tz.repository.TimezoneRepositoryProviderSPI diff --git a/src/main/resources/tzrepo/tzdata.repository b/src/main/resources/tzrepo/tzdata.repository index 8a53e73d377b9a8b71c61730b001d60707d39c66..5d5b83585f00b8c1cee9ff8288661b79fd5403ef 100644 GIT binary patch delta 2768 zcmc&$?{8D*6+Q<$aen!COh^+TA!|s361SyM>e7_iPDs+&A*&OT%ciDpuHVErvF{D{ z`Vxmt1c^~h-uS4bQGjjmD-i60#-g(tQ!K>6;18V^-unT zeXuOQ_I=Jd&-0w;^`~#!zk1u=a_%2cv(}kCq4QM@YMy-ji2)9P>+iJu&0ZVc0Dxrv zj{Q{fqU63F@(f9yPeR_ElK0yo@22F7hJ4?be7_3$+a>?`kpGs{YzsBNECu$20wYo& z6$;#wwx0=Ye^c6iIn?r!)bb#-qfXkfFSO$$sr78=k%Q7BUxeCzBef?&J6oik7xV8s zo^xK6`s7f5ztsOhDEQNSckO4jtyULOzR@xFf9hguN8R7L2m>3{#C` zaFV#|vf8WJ_~x67xcP(UZcCo41KtagZ(zXRl@CkXx4!QB@(p~D|My>>##8y=|p)dc-yAeE}zj-&g`_h^h+~aCeVQMhW z(n;kwHwtxuisSzLOZO%S;@rJ!xO?mL{fq;Kl47Ejo)4MQSs!(r^X@N*lsBKpKRJGNu5xN66_UA=2WK^bP2 zrPInot@Mh6HTZ_>uTUR06c!98xe6bOFKTdaeGcqL&9sT_VplB=;fvyXwYX2aAAQl|>O!HZAN14i!G<7!3sDun-V$*^9@V>a= zz)qYIU(?&pVQ`n=Moq4(ML>%LtCV=Q4tw^$1)hk`PAKW%FrUfd&if$_Y(na2y=tGN)0Ja2tFDE@zfWocSp_VkFRIXe^wLF@1q}xF)oEQuIfq z(+P8pDOvas+~s|lP_^9r_$0&#ji}RQ;)n&~a@^FD8qPpN0WHpCrop>}QdBjjWhjaW zrTFpC2>?6joM*K)mCjvpo>OEk7-7pSVd{WPcpI=kK(dv2j+h4diK}=>OgG@Sd>s`* z6D!*4GRF?_lLp-D|0lRg3Py<$o$T?dc((z&hdK(pj4&fhg24(I&NQs=Er&;^;Q=^C zBYh)^&dC~Oi1M$`h`o)td*YMQbi+)R8T=MpB@aY+dXaGH!9ba&M0P&H^lXZ!d1f7Q z;4C{c!7>`djCi#XyPp{#5=%LBNYk_PvuvFdoPfrXbHcLD;S_jEb*%N_DV9<3F>$96 zn>TVLnc}7)vn*_arwkWXmrNy1i?{tDJr)e%OR_8(&td($q0iR;;Sdf)B=xEK?WEH1<{}jnnEH zT-T}LTxH!Vi#P<1$)kPIvG6p`lD8`w&2l3PUsX}2h%arP2(l4F;zcJu>U|cPN<g^FYh0h7qAZfR0fPlIR*_?xsTjwJJPxzM>%#7UTu~sl zY%ZjiDIv&iF&DPC^?`j{XDZyNM%onZ-73dbaoUA@`g2e}qf*rC21{dm#k5D+lFk>f zqa@&TO35ska8rEb!p_!9P&>(vvtRQ)O*UQ7HxPh+}RH;D5xA-MDLzbT95ah3}H4!tbiR$Ccz7TgOaQ(h&+bD-huo zal?&q%!ytPcHy7Iqz4c53|51I(m+`6JVQ}juH!XV;bEL z^n%~hQFI#HDl1po6Zo09@4?t%GLn^;4^vo)qEWrr8M&yO*1l%m8!Cy*&Nxrs7 zA)hQn;LGBy7n|n?OYV%av}|Ux4E_u?&ojD*;O}62;cyf_t!zQq$S|FO(>kAkkHJ3M zmzcq)9_INwCg-X__~fH)PbJ}B!sf%r0w=3H&{|9=*{lIM5%ysq@&NqdLU0CS#KAhJ z=v}8|8>l`ptYs9Hf|b~;Bm~{|NuJisRZcj+@L|u!A`Na`w=-0n;wG!<@EL5IJW4TK z(IAmhR&`BYAuE;dW~zCtcsJV%dAGL`WJj2l<|l)vt+J%G!F$oiRpti-K~&;$_*tD>nW3>;C~SA5bR% delta 2763 zcmc&$TXS1i6<#ZrEnju9tT>LHICc`pCMZgpHbg0*NU|f}48s6v9tt!=TP`UH54HdqZ-@fQ-|L*%xTj(*@b-t=W?L)^;Jdy>#%dfV-<*G|;0Kj7L zudXjHZ%N+YMSN!^->)P7F3JB`#Q%!a8jrNDORdjG0$ozz@YFbzO+; zYnS$I6@TphOv^1Pl!+V*NymN}2|rgnPiY$EMA-n-=1`#SdO@#~VfWt<(5k@w2zu@ukh#TgFlJ7vK0WhA$Pp+u80L z1wVL4)U3?ZaFQum`4Tsbi|`Zx{lkZf&uxzp#NF+8aR27_|DJc_;mw2py;Fk&U;7w` zuvZKr_H-R7c%XTbW#mOU6HZtxUqv{)bp`PcxGzxfLQDCTNv1HX`p#*wQG2MGH zfp|_+4ZemUXqrle zlbS^cvI=L!6*rz~y9VAkQ(2aHFcn4>GLR5&y74G(i;vvcgK4q99((r1!Rx>!EUv3N zfHnzsDe;AR>_7Pe_+mO+mzD4!pU`wo%`wPBz1`9dsSa0BBe#-c3oHxQ#a2C@JP-m` z+*)8TT?ehG{ z1dI_HQKx5!BNk3(l9ry;Fb$0*v?R+g4Sqr>wyNs@E@0ttEzfD@y^hl7bk0q!pwf{i z$uG+pEgWOZEM@6{PlywZcq~Y=m3fX?2KkArI3&zQJk;7<5j3@;tuAxy7T<2fBY{7I z$5Aj&jOgT!uZTZ3V&B>B5-&r{Fi9|2Cc{~V{oM9^JPr53orr~oWSx^W$`IwZpB0HF z>>hi^x!oYkWEgx8JdOuqTv;Ss`Y>3gDP_*bm~Q5{!t-lTsLpMQ)6MxAwnhq$LX+d1Xh!F-0Y0aWJw80g@+$TVe>1ji6dak7mXTp5ybQiFTvT1M zWQ7K);7m}A<#gNVzu2)LS=Am2FImODWN0V87}YKhVvOb4ibmq>O2lkR9ElQK*SQzTCfkt#GMxGdE}5I zPRWd9*>SDF_4!E(qzpIUR26w#vt;8Ek;h?LobX^@aG|2W__DR2EK@>|-4qXYb$$|D zBRWOkoob{_(%h|b)WkPD*n6x14O1#@1l?c?c2-O~$Ch-yfZdLO>71Nju;5+sp$B_9 zZb01xyTq0?I8!oh*~uqF$ctTV12jSvUMO139Q;i@?#0fIG_+NpNKDOW1zDvO_>1_e z7lZgu@l7x8{}k!IGxHR_OPUIs)!vhGw!qdzvH;thnvN_RuKQOr_(*LjABt`+@%8H9Cr?ac^bhoCJrf zBIw8Q^JFADF(0I`5=9Apr!#U+I6lX!{;o{ zRijko197kw2ZB#ld7!ZvlTFirf?%x}jNOMov=p3VLUn14Q}nJ;vOQe=Vo=M=Dg`UC zSxE@`QIO?|X039<`9Ul8Z*aP}y>6$dF2#+h>2MczP0UdYS2RfFc$>L?%=fs-<{MP>f+lN&1