harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim Ellison <t.p.elli...@gmail.com>
Subject [build] Reload your dependencies (was: Re: svn commit: r796705)
Date Wed, 22 Jul 2009 13:23:00 GMT
Heads-up that you will need to fetch the dependencies again after this
update to ICU 4.2.1

Regards,
Tim

On 22/Jul/2009 14:20, tellison@apache.org wrote:
> Author: tellison
> Date: Wed Jul 22 13:20:39 2009
> New Revision: 796705
> 
> URL: http://svn.apache.org/viewvc?rev=796705&view=rev
> Log:
> Apply patch for HARMONY-6278 ([classlib] Upgrade icu4j 4.0 to the latest icu4j 4.2.1)
> 
> Added:
>     harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/
>     harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/
>     harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/MANIFEST.MF
  (with props)
> Removed:
>     harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.0/
> Modified:
>     harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
>     harmony/enhanced/classlib/trunk/depends/jars/   (props changed)
>     harmony/enhanced/classlib/trunk/make/build-java.xml
>     harmony/enhanced/classlib/trunk/make/depends.properties
>     harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java
>     harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
>     harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
> 
> Modified: harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties?rev=796705&r1=796704&r2=796705&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties (original)
> +++ harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties Wed Jul 22
13:20:39 2009
> @@ -161,8 +161,8 @@
>  
>  # ICU functionality for text/characters are provided by the ICU4J 
>  # and ICU4J-charsets JAR files.
> -bootclasspath.31=icu4j_4.0/icu4j-4_0.jar
> -bootclasspath.32=icu4j_4.0/icu4j-charsets-4_0.jar
> +bootclasspath.31=icu4j_4.2.1/icu4j-4_2_1.jar
> +bootclasspath.32=icu4j_4.2.1/icu4j-charsets-4_2_1.jar
>  
>  # The following JARs are from Xerces/Xalan
>  bootclasspath.34=xalan-j_2.7.0/xalan.jar
> 
> Propchange: harmony/enhanced/classlib/trunk/depends/jars/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Wed Jul 22 13:20:39 2009
> @@ -9,3 +9,4 @@
>  bcprov-jdk15-141
>  asm-3.1
>  icu4j_4.0
> +icu4j_4.2.1
> 
> Added: harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/MANIFEST.MF?rev=796705&view=auto
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/MANIFEST.MF
(added)
> +++ harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/MANIFEST.MF
Wed Jul 22 13:20:39 2009
> @@ -0,0 +1,26 @@
> +Manifest-Version: 1.0
> +Bundle-ManifestVersion: 2
> +Bundle-Name: ICU4J
> +Bundle-SymbolicName: com.ibm.icu4j;singleton:=true
> +Bundle-Version: 4.2.1
> +Bundle-ClassPath: icu4j-4_2_1.jar,icu4j-charsets-4_2_1.jar
> +Eclipse-JREBundle: true
> +Import-Package: java.io,
> + java.lang,
> + java.lang.ref,
> + java.lang.reflect,
> + java.math,
> + java.net,
> + java.nio,
> + java.nio.charset,
> + java.security,
> + java.text,
> + java.util,
> + java.util.jar,
> + java.util.regex,
> + java.util.zip
> +Export-Package: com.ibm.icu.lang,
> + com.ibm.icu.math,
> + com.ibm.icu.text,
> + com.ibm.icu.util,
> + com.ibm.icu.charset
> 
> Propchange: harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/MANIFEST.MF
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=796705&r1=796704&r2=796705&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
> +++ harmony/enhanced/classlib/trunk/make/build-java.xml Wed Jul 22 13:20:39 2009
> @@ -201,7 +201,7 @@
>          <!-- Copy across the boot dependency jars --><!-- TOFIX clean these?
-->
>          <copy todir="${hy.jdk}/jre/lib/boot">
>              <fileset dir="${depends.jars}">
> -                <patternset includes="icu4j_4.0/*.jar" />
> +                <patternset includes="icu4j_4.2.1/*.jar" />
>                  <patternset includes="xalan-j_2.7.0/xalan.jar" />
>                  <patternset includes="xerces_2.9.1/*.jar" />
>              </fileset>
> 
> Modified: harmony/enhanced/classlib/trunk/make/depends.properties
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=796705&r1=796704&r2=796705&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/make/depends.properties (original)
> +++ harmony/enhanced/classlib/trunk/make/depends.properties Wed Jul 22 13:20:39 2009
> @@ -108,14 +108,14 @@
>  bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.jar
>  bcprov.md5=f7cd7e1dcfe4b84d820b3a0937dc13f4
>  
> -icu4j.ver=icu4j_4.0
> +icu4j.ver=icu4j_4.2.1
>  icu4j.dir=${depends.jars}/${icu4j.ver}
> -icu4j.jar=${icu4j.dir}/icu4j-4_0.jar
> -icu4j.url=http://download.icu-project.org/files/icu4j/4.0/icu4j-4_0.jar
> -icu4j.md5=08397653119558593204474fd5a9a7e3
> +icu4j.jar=${icu4j.dir}/icu4j-4_2_1.jar
> +icu4j.url=http://download.icu-project.org/files/icu4j/4.2.1/icu4j-4_2_1.jar
> +icu4j.md5=2bef290de1db6970a6699bf78f0dca77
>  
> -icu4j-charsets.ver=icu4j_4.0
> +icu4j-charsets.ver=icu4j_4.2.1
>  icu4j-charsets.dir=${depends.jars}/${icu4j.ver}
> -icu4j-charsets.jar=${icu4j.dir}/icu4j-charsets-4_0.jar
> -icu4j-charsets.url=http://download.icu-project.org/files/icu4j/4.0/icu4j-charsets-4_0.jar
> -icu4j-charsets.md5=5dd1d6aaffa6762e09541b3bb412d8ee
> +icu4j-charsets.jar=${icu4j.dir}/icu4j-charsets-4_2_1.jar
> +icu4j-charsets.url=http://download.icu-project.org/files/icu4j/4.2.1/icu4j-charsets-4_2_1.jar
> +icu4j-charsets.md5=bccab3c39d735171fb54ce5e4f49207b
> 
> Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java?rev=796705&r1=796704&r2=796705&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java
(original)
> +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java
Wed Jul 22 13:20:39 2009
> @@ -121,13 +121,13 @@
>          Locale.setDefault(Locale.US);
>          assertEquals("currK.getSymbol()", "\u20a9", currK.getSymbol());
>          // Some non-bug differences below because of CLDR data.
> -        assertEquals("currI.getSymbol()", "\u20a8", currI
> +        assertEquals("currI.getSymbol()", "Rs", currI
>                  .getSymbol());
>          assertEquals("currUS.getSymbol()", "$", currUS.getSymbol());
>  
>          Locale.setDefault(new Locale("ko", "KR"));
> -        assertEquals("currK.getSymbol()", "\uffe6", currK.getSymbol());
> -        assertEquals("currI.getSymbol()", "0\u2264Rs.|1\u2264Re.|1<Rs.", currI
> +        assertEquals("currK.getSymbol()", "\u20a9", currK.getSymbol());
> +        assertEquals("currI.getSymbol()", "Rs", currI
>                  .getSymbol());
>          assertEquals("currUS.getSymbol()", "US$", currUS.getSymbol());
>  
> @@ -135,8 +135,8 @@
>          // one with Korean country but an India language
>          // this method should return the currency codes in that case
>          Locale.setDefault(new Locale("kr", "KR"));
> -        assertEquals("currK.getSymbol()", "KRW", currK.getSymbol());
> -        assertEquals("currI.getSymbol()", "0#Rs.|1#Re.|1<Rs.", currI
> +        assertEquals("currK.getSymbol()", "\u20a9", currK.getSymbol());
> +        assertEquals("currI.getSymbol()", "Rs", currI
>                  .getSymbol());
>          assertEquals("currUS.getSymbol()", "US$", currUS.getSymbol());
>      }
> @@ -161,7 +161,7 @@
>          assertEquals("JPY", currJ.getSymbol(Locale.FRENCH));
>  
>          Currency currUS = Currency.getInstance("USD");
> -        assertEquals("US$", currUS.getSymbol(Locale.JAPAN));
> +        assertEquals("$", currUS.getSymbol(Locale.JAPAN));
>  
>          Locale.setDefault(new Locale("ja", "JP"));
>          assertEquals("JP\u00a5", currJ.getSymbol(new Locale("", "JP")));
> @@ -185,20 +185,20 @@
>          assertEquals("US$", currUS.getSymbol(new Locale("", "US")));
>  
>          Currency currCA = Currency.getInstance("CAD");
> -        assertEquals("CAD", currCA.getSymbol(Locale.JAPAN));
> +        assertEquals("CA$", currCA.getSymbol(Locale.JAPAN));
>          assertEquals("CAD", currCA.getSymbol(Locale.JAPANESE));
> -        assertEquals("$Ca", currCA.getSymbol(Locale.FRANCE));
> +        assertEquals("$CA", currCA.getSymbol(Locale.FRANCE));
>          assertEquals("CAD", currCA.getSymbol(Locale.FRENCH));
>          assertEquals("CA$", currCA.getSymbol(Locale.US));
>          assertEquals("CAD", currCA.getSymbol(Locale.ENGLISH));
> -        assertEquals("Can$", currCA.getSymbol(new Locale("es", "US")));
> +        assertEquals("CA$", currCA.getSymbol(new Locale("es", "US")));
>          assertEquals("CA$", currCA.getSymbol(new Locale("en", "US")));
>  
>          assertEquals("$", currCA.getSymbol(Locale.CANADA));
>          assertEquals("$", currCA.getSymbol(Locale.CANADA_FRENCH));
>          assertEquals("$", currCA.getSymbol(new Locale("en", "CA")));
>          assertEquals("$", currCA.getSymbol(new Locale("fr", "CA")));
> -        assertEquals("CAD", currCA.getSymbol(new Locale("", "CA")));
> +        assertEquals("CA$", currCA.getSymbol(new Locale("", "CA")));
>  
>          // tests what happens with improper locales, i.e. countries without the
>          // given language
> @@ -206,13 +206,13 @@
>                  currUS.getSymbol(new Locale("ar", "US")));
>          assertEquals("currUS.getSymbol(new Locale(\"ar\", \"CA\"))", "US$",
>                  currUS.getSymbol(new Locale("ar", "CA")));
> -        assertEquals("currCA.getSymbol(new Locale(\"ar\", \"US\"))", "CAD",
> +        assertEquals("currCA.getSymbol(new Locale(\"ar\", \"US\"))", "CA$",
>                  currCA.getSymbol(new Locale("ar", "US")));
> -        assertEquals("currCA.getSymbol(new Locale(\"ar\", \"CA\"))", "CAD",
> +        assertEquals("currCA.getSymbol(new Locale(\"ar\", \"CA\"))", "CA$",
>                  currCA.getSymbol(new Locale("ar", "CA")));
>          assertEquals("currJ.getSymbol(new Locale(\"ja\", \"US\"))", "\uffe5",
>                  currJ.getSymbol(new Locale("ja", "US")));
> -        assertEquals("currUS.getSymbol(new Locale(\"ja\", \"US\"))", "US$",
> +        assertEquals("currUS.getSymbol(new Locale(\"ja\", \"US\"))", "$",
>                  currUS.getSymbol(new Locale("ja", "US")));
>  
>          // cross testing between USD and JPY when locale is JAPANESE JAPAN
> @@ -264,9 +264,9 @@
>          // bogus Locales , when default locale is Locale_ja_JP
>          assertEquals("US$", currUS2.getSymbol(new Locale("ar", "JP")));
>          assertEquals("US$", currUS2.getSymbol(new Locale("ar", "US")));
> -        assertEquals("US$", currUS2.getSymbol(new Locale("ja", "AE")));
> +        assertEquals("$", currUS2.getSymbol(new Locale("ja", "AE")));
>          assertEquals("$", currUS2.getSymbol(new Locale("en", "AE")));
> -        assertEquals("currUS.getSymbol(new Locale(\"ja\", \"US\"))", "US$",
> +        assertEquals("currUS.getSymbol(new Locale(\"ja\", \"US\"))", "$",
>                  currUS.getSymbol(new Locale("ja", "US")));
>  
>          Locale.setDefault(Locale.US);
> @@ -280,7 +280,7 @@
>          assertEquals("DKK", currDKK.getSymbol(new Locale("da", "")));
>  
>          assertEquals("\u20ac", currE.getSymbol(new Locale("", "DK")));
> -        assertEquals("DKK", currDKK.getSymbol(new Locale("", "DK")));
> +        assertEquals("Dkr", currDKK.getSymbol(new Locale("", "DK")));
>  
>          Locale.setDefault(new Locale("da", "DK"));
>          assertEquals("\u20ac", currE.getSymbol(new Locale("da", "DK")));
> @@ -290,10 +290,10 @@
>          assertEquals("DKK", currDKK.getSymbol(new Locale("da", "")));
>  
>          assertEquals("\u20ac", currE.getSymbol(new Locale("", "DK")));
> -        assertEquals("DKK", currDKK.getSymbol(new Locale("", "DK")));
> +        assertEquals("Dkr", currDKK.getSymbol(new Locale("", "DK")));
>  
>          assertEquals("\u20ac", currE.getSymbol(new Locale("ar", "AE")));
> -        assertEquals("DKK", currDKK.getSymbol(new Locale("ar", "AE")));
> +        assertEquals("Dkr", currDKK.getSymbol(new Locale("ar", "AE")));
>      }
>  
>      /**
> 
> Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java?rev=796705&r1=796704&r2=796705&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
(original)
> +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
Wed Jul 22 13:20:39 2009
> @@ -678,12 +678,12 @@
>          GregorianCalendar g = new GregorianCalendar(TimeZone
>                  .getTimeZone("Europe/London"), new Locale("en", "GB"));
>          int minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
> -        assertEquals(1, minimalDaysInFirstWeek);
> +        assertEquals(4, minimalDaysInFirstWeek);
>  
>          g = new GregorianCalendar(TimeZone.getTimeZone("Europe/London"),
>                  new Locale("fr"));
>          minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
> -        assertEquals(1, minimalDaysInFirstWeek);
> +        assertEquals(4, minimalDaysInFirstWeek);
>          
>          g = new GregorianCalendar(TimeZone.getTimeZone("Europe/London"),
>                  new Locale("fr", "CA"));
> 
> Modified: harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java?rev=796705&r1=796704&r2=796705&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
(original)
> +++ harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
Wed Jul 22 13:20:39 2009
> @@ -80,7 +80,7 @@
>                  "KR"));
>          assertTrue("Test1: Returned incorrect currency",
>                  dfs1.getCurrency() == currK);
> -        assertEquals("Test1: Returned incorrect currencySymbol", "\uffe6", dfs1
> +        assertEquals("Test1: Returned incorrect currencySymbol", "\u20a9", dfs1
>                  .getCurrencySymbol());
>          assertEquals("Test1: Returned incorrect intlCurrencySymbol", "KRW",
>                  dfs1.getInternationalCurrencySymbol());
> @@ -88,7 +88,7 @@
>          dfs1 = new DecimalFormatSymbols(new Locale("", "KR"));
>          assertTrue("Test2: Returned incorrect currency",
>                  dfs1.getCurrency() == currK);
> -        assertEquals("Test2: Returned incorrect currencySymbol", "KRW", dfs1
> +        assertEquals("Test2: Returned incorrect currencySymbol", "\u20a9", dfs1
>                  .getCurrencySymbol());
>          assertEquals("Test2: Returned incorrect intlCurrencySymbol", "KRW",
>                  dfs1.getInternationalCurrencySymbol());
> 
> 
> 

Mime
View raw message