branch develop updated (823b552 -> 07cbdf3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git from 823b552 Fix more javadoc issues (See #3797) new e90aa63 Update to nuitonpom 10 (Fixes #3933) new 07cbdf3 Let's define java level to 1.6 (Fixes #3934) The 2 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 07cbdf3562f34c05ac390bb2a2b8d8dfa120331c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 10:34:20 2016 +0200 Let's define java level to 1.6 (Fixes #3934) commit e90aa63850726040abfa28d69551f18ad2f22f55 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 10:34:11 2016 +0200 Update to nuitonpom 10 (Fixes #3933) Summary of changes: README.txt => README.md | 0 pom.xml | 15 +++++++-------- src/main/java/org/nuiton/util/FileUtil.java | 9 ++++++++- src/main/java/org/nuiton/util/beans/Binder.java | 2 +- .../java/org/nuiton/util/beans/BinderModelBuilder.java | 2 +- .../java/org/nuiton/util/version/VersionComparator.java | 2 +- src/site/site.xml | 9 ++++----- src/test/java/org/nuiton/util/ResourceTest.java | 2 +- src/test/java/org/nuiton/util/beans/BinderTest.java | 2 +- 9 files changed, 24 insertions(+), 19 deletions(-) rename README.txt => README.md (100%) -- 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 nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit e90aa63850726040abfa28d69551f18ad2f22f55 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 10:34:11 2016 +0200 Update to nuitonpom 10 (Fixes #3933) --- README.txt => README.md | 0 pom.xml | 15 +++++++-------- src/site/site.xml | 9 ++++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/README.txt b/README.md similarity index 100% rename from README.txt rename to README.md diff --git a/pom.xml b/pom.xml index 2f1db7f..c0ed0c5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>5-rc-2</version> + <version>10</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -125,17 +125,16 @@ <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/nuiton-utils.git</developerConnection> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> - <properties> <!-- redmine project Id --> <projectId>nuiton-utils</projectId> + <ciViewId>nuiton-utils</ciViewId> + + <!-- Java level --> + <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> diff --git a/src/site/site.xml b/src/site/site.xml index 733c606..db1a14f 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,9 +22,10 @@ --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -58,12 +59,10 @@ <footer> <div id='mavenProjectProperties' locale='fr' - platform='${project.platform}' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='${project.siteSourcesType}' - scmUrl='${project.scm.connection}' - editorUrl='${project.scmwebeditorUrl}'/> + scmwebeditor_vmFiles=",update,"/> </footer> </body> -- 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 nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit 07cbdf3562f34c05ac390bb2a2b8d8dfa120331c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 10:34:20 2016 +0200 Let's define java level to 1.6 (Fixes #3934) --- pom.xml | 4 ++-- src/main/java/org/nuiton/util/FileUtil.java | 9 ++++++++- src/main/java/org/nuiton/util/beans/Binder.java | 2 +- src/main/java/org/nuiton/util/beans/BinderModelBuilder.java | 2 +- src/main/java/org/nuiton/util/version/VersionComparator.java | 2 +- src/test/java/org/nuiton/util/ResourceTest.java | 2 +- src/test/java/org/nuiton/util/beans/BinderTest.java | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index c0ed0c5..cf55fcd 100644 --- a/pom.xml +++ b/pom.xml @@ -132,8 +132,8 @@ <ciViewId>nuiton-utils</ciViewId> <!-- Java level --> - <javaVersion>1.7</javaVersion> - <signatureArtifactId>java17</signatureArtifactId> + <javaVersion>1.6</javaVersion> + <signatureArtifactId>java16</signatureArtifactId> <signatureVersion>1.0</signatureVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> diff --git a/src/main/java/org/nuiton/util/FileUtil.java b/src/main/java/org/nuiton/util/FileUtil.java index 7799ef0..2e0ee33 100644 --- a/src/main/java/org/nuiton/util/FileUtil.java +++ b/src/main/java/org/nuiton/util/FileUtil.java @@ -23,6 +23,7 @@ package org.nuiton.util; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; @@ -1361,10 +1362,16 @@ public class FileUtil { // FileUtil */ public static boolean isGzipFile(File file) throws IOException { - try (InputStream in = new BufferedInputStream(new FileInputStream(file))) { + InputStream in = new BufferedInputStream(new FileInputStream(file)); + + try { boolean gzip = GZUtil.isGzipStream(in); + in.close(); return gzip; + } finally { + IOUtils.closeQuietly(in); } + } } // FileUtil diff --git a/src/main/java/org/nuiton/util/beans/Binder.java b/src/main/java/org/nuiton/util/beans/Binder.java index b94131a..f8c6cc6 100644 --- a/src/main/java/org/nuiton/util/beans/Binder.java +++ b/src/main/java/org/nuiton/util/beans/Binder.java @@ -853,7 +853,7 @@ public class Binder<I, O> implements Serializable { propertiesMapping = new TreeMap<String, String>(); collectionStrategies = new TreeMap<String, CollectionStrategy>(); binders = new TreeMap<String, Binder<?, ?>>(); - functions = new LinkedHashMap<>(); + functions = new LinkedHashMap<Class<?>, Function<?, ?>>(); } /** diff --git a/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java b/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java index e0b068a..e98e531 100644 --- a/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java +++ b/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java @@ -472,7 +472,7 @@ public class BinderModelBuilder<S, T> { */ public BinderModelBuilder<T, S> buildInverseModelBuilder() { - BinderModelBuilder<T, S> builder = new BinderModelBuilder<>(model.getTargetType(), model.getSourceType()) + BinderModelBuilder<T, S> builder = new BinderModelBuilder<T, S>(model.getTargetType(), model.getSourceType()) .canTypeMismatch(canTypeMismatch); for (Map.Entry<String, String> entry : model.getPropertiesMapping().entrySet()) { diff --git a/src/main/java/org/nuiton/util/version/VersionComparator.java b/src/main/java/org/nuiton/util/version/VersionComparator.java index 34b48b2..8b19d01 100644 --- a/src/main/java/org/nuiton/util/version/VersionComparator.java +++ b/src/main/java/org/nuiton/util/version/VersionComparator.java @@ -208,7 +208,7 @@ public class VersionComparator implements Comparator<Version>, Serializable { */ public static void main(String... args) { - List<Version> versions = new ArrayList<>(); + List<Version> versions = new ArrayList<Version>(); for (String arg : args) { Version version = Versions.valueOf(arg); versions.add(version); diff --git a/src/test/java/org/nuiton/util/ResourceTest.java b/src/test/java/org/nuiton/util/ResourceTest.java index 14cfed4..67276ae 100644 --- a/src/test/java/org/nuiton/util/ResourceTest.java +++ b/src/test/java/org/nuiton/util/ResourceTest.java @@ -71,7 +71,7 @@ public class ResourceTest { // ResourceTest String javaExecFilename = getJavaExecName(); - url = Resource.getURL("README.txt"); + url = Resource.getURL("README.md"); Assert.assertNotNull(url); try { diff --git a/src/test/java/org/nuiton/util/beans/BinderTest.java b/src/test/java/org/nuiton/util/beans/BinderTest.java index b2daae4..038848c 100644 --- a/src/test/java/org/nuiton/util/beans/BinderTest.java +++ b/src/test/java/org/nuiton/util/beans/BinderTest.java @@ -230,7 +230,7 @@ public class BinderTest { @Test public void testInjectProperties() { - ImmutableMap.Builder<String, Object> builder = new ImmutableMap.Builder<>(); + ImmutableMap.Builder<String, Object> builder = new ImmutableMap.Builder<String, Object>(); builder.put(BeanA.PROPERTY_A, "a"); Assert.assertNull(a.getA()); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm