branch develop updated (8a165b9 -> f233b23)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git from 8a165b9 -Update guava to fix CVE-2018-10237 --> update to Java 8 - Update Struts2 to fix CVE-2018-11776 new c71cfa8 Upgrade dependencies : Guava 27.1 ; commons-collections4 4.3 ; commons-lang3 3.9 ; commons-io 2.6 ; nuiton-csv 3.0 new becc352 Upgrade Maven dependencies : Maven 3.6.1 ; maven-plugin-annotations 3.6.0 ; antlr4 4.7.3 ; maven-dependency-plugin 3.0.1 ; plexus-utils 3.2.0 new 3e81d2a [iso] Code style new f233b23 Make I18nTest compatible with Java9+ at runtime The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f233b23f63d9c71b0b71c5770cf17366f6e72371 Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 18:15:35 2019 +0200 Make I18nTest compatible with Java9+ at runtime commit 3e81d2a057e1db620fa4363f40b0e3cc4b83fceb Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 16:44:19 2019 +0200 [iso] Code style commit becc352ee242b55e9e01fe38171d501a2c3e6312 Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 15:33:29 2019 +0200 Upgrade Maven dependencies : Maven 3.6.1 ; maven-plugin-annotations 3.6.0 ; antlr4 4.7.3 ; maven-dependency-plugin 3.0.1 ; plexus-utils 3.2.0 commit c71cfa82b40ae074dca6b4256e524533fa29719b Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 15:26:14 2019 +0200 Upgrade dependencies : Guava 27.1 ; commons-collections4 4.3 ; commons-lang3 3.9 ; commons-io 2.6 ; nuiton-csv 3.0 Summary of changes: .../src/main/java/org/nuiton/i18n/I18nUtil.java | 9 ++++----- .../java/org/nuiton/i18n/bundle/I18nBundleUtil.java | 3 +-- .../nuiton/i18n/init/ClassPathI18nInitializer.java | 4 ++-- .../src/test/java/org/nuiton/i18n/I18nTest.java | 13 ++++++++++--- pom.xml | 19 ++++++++++--------- 5 files changed, 27 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit c71cfa82b40ae074dca6b4256e524533fa29719b Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 15:26:14 2019 +0200 Upgrade dependencies : Guava 27.1 ; commons-collections4 4.3 ; commons-lang3 3.9 ; commons-io 2.6 ; nuiton-csv 3.0 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0330cde..1823ef5 100644 --- a/pom.xml +++ b/pom.xml @@ -86,25 +86,25 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>27.0.1-jre</version> + <version>27.1-jre</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.1</version> + <version>4.3</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.9</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> + <version>2.6</version> </dependency> <dependency> @@ -136,7 +136,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>3.0-rc-6</version> + <version>3.0</version> </dependency> <!-- see http://stackoverflow.com/a/32918434/2038100 --> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit becc352ee242b55e9e01fe38171d501a2c3e6312 Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 15:33:29 2019 +0200 Upgrade Maven dependencies : Maven 3.6.1 ; maven-plugin-annotations 3.6.0 ; antlr4 4.7.3 ; maven-dependency-plugin 3.0.1 ; plexus-utils 3.2.0 --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1823ef5..9828129 100644 --- a/pom.xml +++ b/pom.xml @@ -68,8 +68,9 @@ <!--Multilanguage maven-site --> <locales>fr,en</locales> - <mavenVersion>3.3.9</mavenVersion> - <antlr4Version>4.6.0.3</antlr4Version> + <mavenVersion>3.6.1</mavenVersion> + <pluginPluginVersion>3.6.0</pluginPluginVersion> + <antlr4Version>4.7.3</antlr4Version> <javaVersion>1.8</javaVersion> <signatureArtifactId>java18</signatureArtifactId> @@ -180,7 +181,7 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> - <version>3.0</version> + <version>3.0.1</version> </dependency> <!-- provided dependencies --> @@ -236,7 +237,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.24</version> + <version>3.2.0</version> <scope>compile</scope> </dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 3e81d2a057e1db620fa4363f40b0e3cc4b83fceb Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 16:44:19 2019 +0200 [iso] Code style --- nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java | 9 ++++----- .../src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java | 3 +-- .../main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java index 8c9d2cd..81b6c68 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java @@ -213,7 +213,7 @@ public class I18nUtil { log.trace("search '" + pattern + "' in " + repository); } - List<URL> urlList = new ArrayList<URL>(); + List<URL> urlList = new ArrayList<>(); File[] filesList = repository.listFiles(); if (filesList != null) { @@ -265,8 +265,8 @@ public class I18nUtil { * @return all the url found in the classloader */ static public URL[] getDeepURLs(URLClassLoader loader) { - Stack<URL> urlToTreate = new Stack<URL>(); - List<URL> urlTreated = new ArrayList<URL>(); + Stack<URL> urlToTreate = new Stack<>(); + List<URL> urlTreated = new ArrayList<>(); // first get the urls from classloader URL[] result = getURLs(loader); @@ -285,8 +285,7 @@ public class I18nUtil { if (newArrayURLs == null) { continue; } - List<URL> newURLs = Arrays.asList(newArrayURLs); - for (URL newURL : newURLs) { + for (URL newURL : newArrayURLs) { if (!urlTreated.contains(newURL) && !urlToTreate.contains(newURL)) { urlToTreate.add(newURL); diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java index bfce0c4..46466ee 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java @@ -203,8 +203,7 @@ public class I18nBundleUtil { try { // on calcule toutes les urls utilisable dans le classloader donnee - List<URL> urlToSeek = new ArrayList<URL>(); - urlToSeek.addAll(Arrays.asList(urls)); + List<URL> urlToSeek = new ArrayList<>(Arrays.asList(urls)); // on va maintenant supprimer toutes les urls qui ne respectent pas // le pattern i18n : il faut que la resource contienne un diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java index 005f3aa..192129f 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java @@ -76,9 +76,9 @@ public class ClassPathI18nInitializer extends I18nInitializer { public URL[] resolvURLs() throws Exception { // on calcule toutes les urls utilisable dans le classloader donnee - List<URL> urlToSeek = new ArrayList<URL>(); URLClassLoader loader = (URLClassLoader) getLoader(); - urlToSeek.addAll(Arrays.asList(I18nUtil.getDeepURLs(loader))); + URL[] deepURLs = I18nUtil.getDeepURLs(loader); + List<URL> urlToSeek = new ArrayList<>(Arrays.asList(deepURLs)); // on va maintenant supprimer toutes les urls qui ne respectent pas // le pattern i18n : il faut que la resource contienne un repertoire i18n -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit f233b23f63d9c71b0b71c5770cf17366f6e72371 Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 18:15:35 2019 +0200 Make I18nTest compatible with Java9+ at runtime --- nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java b/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java index 6751bff..7afafe6 100644 --- a/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java +++ b/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java @@ -31,9 +31,12 @@ import org.junit.Test; import org.nuiton.i18n.format.MessageFormatI18nMessageFormatter; import org.nuiton.i18n.init.DefaultI18nInitializer; +import java.util.Arrays; import java.util.Date; import java.util.GregorianCalendar; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; /** * Test the class {@link I18n}. @@ -210,11 +213,15 @@ public class I18nTest { Date date = new GregorianCalendar(2011, 4, 5).getTime(); - String expected = "Key with 05-May-2011"; + // From Java9, the default locale provider is CLDR : https://openjdk.java.net/jeps/252 + // This the expected output depends on the JRE you are using + String expectedBeforeJava9 = "Key with 05-May-2011"; + String expectedAfterJava8 = "Key with 5 May 2011"; + Set<String> expectedSet = new HashSet<>(Arrays.asList(expectedBeforeJava9, expectedAfterJava8)); String actual = I18n.l(Locale.UK, "key.with.date", date); - Assert.assertEquals(expected, actual); + Assert.assertTrue(actual + " is not one of " + expectedSet, expectedSet.contains(actual)); - expected = "とキー 2011/05/05"; + String expected = "とキー 2011/05/05"; actual = I18n.l(Locale.JAPAN, "key.with.date", date); Assert.assertEquals(expected, actual); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm