branch develop updated (fe36b47 -> 476e230)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-csv. See https://gitlab.nuiton.org/nuiton/nuiton-csv.git from fe36b47 update site configuration new 476e230 Fix build The 1 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 476e230306c20dcd8828727284833592fb82435e Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Aug 4 18:15:13 2016 +0200 Fix build Summary of changes: README.txt => README.md | 0 pom.xml | 14 ++++++-------- src/main/java/org/nuiton/csv/Exporter.java | 22 ++++++++++++++++++++++ src/main/java/org/nuiton/csv/ExporterBuilder.java | 22 ++++++++++++++++++++++ .../java/org/nuiton/csv/ExporterConfiguration.java | 22 ++++++++++++++++++++++ src/main/java/org/nuiton/csv/Import.java | 6 +++--- src/main/java/org/nuiton/csv/Import2.java | 2 +- src/main/java/org/nuiton/csv/ImportConf.java | 10 +++++----- src/main/java/org/nuiton/csv/ImportRow.java | 2 +- src/main/java/org/nuiton/csv/ImportToMap.java | 2 +- src/test/java/org/nuiton/csv/ExporterTest.java | 22 ++++++++++++++++++++++ 11 files changed, 105 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-csv. See https://gitlab.nuiton.org/nuiton/nuiton-csv.git commit 476e230306c20dcd8828727284833592fb82435e Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Aug 4 18:15:13 2016 +0200 Fix build --- README.txt => README.md | 0 pom.xml | 14 ++++++-------- src/main/java/org/nuiton/csv/Exporter.java | 22 ++++++++++++++++++++++ src/main/java/org/nuiton/csv/ExporterBuilder.java | 22 ++++++++++++++++++++++ .../java/org/nuiton/csv/ExporterConfiguration.java | 22 ++++++++++++++++++++++ src/main/java/org/nuiton/csv/Import.java | 6 +++--- src/main/java/org/nuiton/csv/Import2.java | 2 +- src/main/java/org/nuiton/csv/ImportConf.java | 10 +++++----- src/main/java/org/nuiton/csv/ImportRow.java | 2 +- src/main/java/org/nuiton/csv/ImportToMap.java | 2 +- src/test/java/org/nuiton/csv/ExporterTest.java | 22 ++++++++++++++++++++++ 11 files changed, 105 insertions(+), 19 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 7681938..9ee954d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>5</version> + <version>10.2</version> </parent> <groupId>org.nuiton</groupId> @@ -51,17 +51,15 @@ <url>https://gitlab.nuiton.org/nuiton/nuiton-csv</url> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> - <properties> <projectId>nuiton-csv</projectId> + <ciViewId>nuiton-csv</ciViewId> + <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> <!-- i18n configuration --> diff --git a/src/main/java/org/nuiton/csv/Exporter.java b/src/main/java/org/nuiton/csv/Exporter.java index 0080fa7..90ed686 100644 --- a/src/main/java/org/nuiton/csv/Exporter.java +++ b/src/main/java/org/nuiton/csv/Exporter.java @@ -1,5 +1,27 @@ package org.nuiton.csv; +/*- + * #%L + * Nuiton CSV + * %% + * Copyright (C) 2013 - 2016 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import org.nuiton.util.StringUtil; diff --git a/src/main/java/org/nuiton/csv/ExporterBuilder.java b/src/main/java/org/nuiton/csv/ExporterBuilder.java index b02546c..35b4660 100644 --- a/src/main/java/org/nuiton/csv/ExporterBuilder.java +++ b/src/main/java/org/nuiton/csv/ExporterBuilder.java @@ -1,5 +1,27 @@ package org.nuiton.csv; +/*- + * #%L + * Nuiton CSV + * %% + * Copyright (C) 2013 - 2016 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/org/nuiton/csv/ExporterConfiguration.java b/src/main/java/org/nuiton/csv/ExporterConfiguration.java index 6d53a21..14c71df 100644 --- a/src/main/java/org/nuiton/csv/ExporterConfiguration.java +++ b/src/main/java/org/nuiton/csv/ExporterConfiguration.java @@ -1,5 +1,27 @@ package org.nuiton.csv; +/*- + * #%L + * Nuiton CSV + * %% + * Copyright (C) 2013 - 2016 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableSet; import java.nio.charset.Charset; diff --git a/src/main/java/org/nuiton/csv/Import.java b/src/main/java/org/nuiton/csv/Import.java index c4bfbca..31a0d63 100644 --- a/src/main/java/org/nuiton/csv/Import.java +++ b/src/main/java/org/nuiton/csv/Import.java @@ -46,9 +46,9 @@ import static org.nuiton.i18n.I18n.t; /** * Import engine for a given import model. - * <p/> + * <p> * It acts as an {@link Iterable}, you can use directly inside a foreach. - * <p/> + * <p> * The method {@link #prepareAndValidate()} will be invoked before all and * only once. It mainly obtain header from the csv input, pass it to the model * and then validate the model. @@ -71,7 +71,7 @@ public class Import<E> implements Iterable<E>, Closeable { /** * A flag to know if model was already validated. - * <p/> + * <p> * Save once done to prevent multiple headers read leading to consider * first lines as headers. */ diff --git a/src/main/java/org/nuiton/csv/Import2.java b/src/main/java/org/nuiton/csv/Import2.java index be02796..cd60321 100644 --- a/src/main/java/org/nuiton/csv/Import2.java +++ b/src/main/java/org/nuiton/csv/Import2.java @@ -67,7 +67,7 @@ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { /** * A flag to know if model was already validated. - * <p/> + * <p> * Save once done to prevent multiple headers read leading to consider * first lines as headers. */ diff --git a/src/main/java/org/nuiton/csv/ImportConf.java b/src/main/java/org/nuiton/csv/ImportConf.java index d77182e..8887cbe 100644 --- a/src/main/java/org/nuiton/csv/ImportConf.java +++ b/src/main/java/org/nuiton/csv/ImportConf.java @@ -26,7 +26,7 @@ import com.csvreader.CsvReader; /** * To configure an import using the {@link Import2}. - * <p/> + * <p> * If you do not give this object to the {@link Import2}, then it will * instanciate a new one using all default values. * @@ -37,16 +37,16 @@ public class ImportConf { /** * Flag to turn or not the safetySwitch (see {@link CsvReader#getSafetySwitch()}). - * <p/> + * <p> * By default, not used. */ protected boolean safetySwitch = false; /** * Flag to use a strict mode (says import will failed at the first error), - * if setted to {@link false}, then errors for each rows will be stored in + * if setted to {@code false}, then errors for each rows will be stored in * the current row and import will continue to the end. - * <p/> + * <p> * By default, used (strict mode). */ protected boolean strictMode = true; @@ -54,7 +54,7 @@ public class ImportConf { /** * Flag to ignore header found in a import file and not declared in the * import model. - * <p/> + * <p> * By default, not used (strict mode). */ protected boolean ignoreUnknownHeader = false; diff --git a/src/main/java/org/nuiton/csv/ImportRow.java b/src/main/java/org/nuiton/csv/ImportRow.java index 34c0fd0..42282c4 100644 --- a/src/main/java/org/nuiton/csv/ImportRow.java +++ b/src/main/java/org/nuiton/csv/ImportRow.java @@ -29,7 +29,7 @@ import java.util.Set; /** * Object to box a row to import. - * <p/> + * <p> * It contains all the context for the current row to import. * * @author Tony Chemit - chemit@codelutin.com diff --git a/src/main/java/org/nuiton/csv/ImportToMap.java b/src/main/java/org/nuiton/csv/ImportToMap.java index a780d17..dae2719 100644 --- a/src/main/java/org/nuiton/csv/ImportToMap.java +++ b/src/main/java/org/nuiton/csv/ImportToMap.java @@ -31,7 +31,7 @@ import java.util.NoSuchElementException; /** * A extended {@link Import} to read csv lines into a single map. - * <p/> + * <p> * <strong>Warning:</strong> The map used to push values for a csv line is the * same for all lines, it means you have to copy to your own object. * diff --git a/src/test/java/org/nuiton/csv/ExporterTest.java b/src/test/java/org/nuiton/csv/ExporterTest.java index 44c52f6..281a540 100644 --- a/src/test/java/org/nuiton/csv/ExporterTest.java +++ b/src/test/java/org/nuiton/csv/ExporterTest.java @@ -1,5 +1,27 @@ package org.nuiton.csv; +/*- + * #%L + * Nuiton CSV + * %% + * Copyright (C) 2013 - 2016 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm