Merge branch 'release-1.3.1'

Author: charphi

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>be.nbb.rd</groupId>
     <artifactId>java-console-properties</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <packaging>jar</packaging>
 
@@ -47,12 +47,16 @@
             <artifactId>java-design-processor</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli-codegen</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- compile and runtime -->
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>4.6.1</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -64,7 +68,7 @@
         <dependency>
             <groupId>be.nbb.rd</groupId>
             <artifactId>java-io-win</artifactId>
-            <version>0.0.10</version>
+            <version>0.0.11</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -84,7 +88,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.18.1</version>
+            <version>3.19.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -143,6 +147,7 @@
                 <lombok.version>1.18.16</lombok.version>
                 <java-service.version>1.3.0</java-service.version>
                 <java-design.version>1.1.2</java-design.version>
+                <picocli.version>4.6.1</picocli.version>
             </properties>
             <dependencyManagement>
                 <dependencies>
@@ -171,6 +176,16 @@
                         <artifactId>java-design-processor</artifactId>
                         <version>${java-design.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>info.picocli</groupId>
+                        <artifactId>picocli</artifactId>
+                        <version>${picocli.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>info.picocli</groupId>
+                        <artifactId>picocli-codegen</artifactId>
+                        <version>${picocli.version}</version>
+                    </dependency>
                 </dependencies>
             </dependencyManagement>
             <build>
@@ -195,7 +210,16 @@
                                     <artifactId>java-design-processor</artifactId>
                                     <version>${java-design.version}</version>
                                 </path>
+                                <path>
+                                    <groupId>info.picocli</groupId>
+                                    <artifactId>picocli-codegen</artifactId>
+                                    <version>${picocli.version}</version>
+                                </path>
                             </annotationProcessorPaths>
+                            <compilerArgs>
+                                <!-- picocli-codegen option -->
+                                <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
+                            </compilerArgs>
                         </configuration>
                     </plugin>
                 </plugins>

src/main/java/nbbrd/console/picocli/GenerateLauncher.java

@@ -18,9 +18,7 @@
 
 @CommandLine.Command(
         name = "generate-launcher",
-        mixinStandardHelpOptions = true,
         description = {"Generate launcher script for ${ROOT-COMMAND-NAME:-the root command of this command}."},
-        optionListHeading = "Options:%n",
         helpCommand = true
 )
 public class GenerateLauncher implements Callable<Void>, TextOutput {

src/main/java/nbbrd/console/picocli/MultiFileInputOptions.java

@@ -1,17 +1,17 @@
 /*
  * Copyright 2020 National Bank of Belgium
- * 
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved 
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved
  * by the European Commission - subsequent versions of the EUPL (the "Licence");
  * You may not use this work except in compliance with the Licence.
  * You may obtain a copy of the Licence at:
- * 
+ *
  * http://ec.europa.eu/idabc/eupl
- * 
- * Unless required by applicable law or agreed to in writing, software 
+ *
+ * Unless required by applicable law or agreed to in writing, software
  * distributed under the Licence is distributed on an "AS IS" basis,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and 
+ * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
 package nbbrd.console.picocli;
@@ -22,10 +22,10 @@
 import java.util.List;
 
 /**
- *
  * @author Philippe Charles
  */
-@lombok.Data
+@lombok.Getter
+@lombok.Setter
 public class MultiFileInputOptions implements MultiFileInput, Profilable {
 
     @CommandLine.Parameters(

src/main/java/nbbrd/console/picocli/PrintContext.java

@@ -30,9 +30,7 @@
  */
 @CommandLine.Command(
         name = "print-context",
-        mixinStandardHelpOptions = true,
         description = {"Print system and environment context."},
-        optionListHeading = "Options:%n",
         helpCommand = true
 )
 public class PrintContext implements Callable<Void> {

src/main/java/nbbrd/console/picocli/ProfileOptions.java

@@ -2,7 +2,8 @@
 
 import picocli.CommandLine;
 
-@lombok.Data
+@lombok.Getter
+@lombok.Setter
 public class ProfileOptions implements Profile {
 
     @CommandLine.Option(

src/main/java/nbbrd/console/picocli/csv/CsvInputOptions.java

@@ -5,7 +5,8 @@
 import nbbrd.picocsv.Csv;
 import picocli.CommandLine;
 
-@lombok.Data
+@lombok.Getter
+@lombok.Setter
 public class CsvInputOptions extends TextInputOptions implements CsvInput, Profilable {
 
     @CommandLine.Option(

src/main/java/nbbrd/console/picocli/csv/CsvOutputOptions.java

@@ -5,7 +5,8 @@
 import nbbrd.picocsv.Csv;
 import picocli.CommandLine;
 
-@lombok.Data
+@lombok.Getter
+@lombok.Setter
 public class CsvOutputOptions extends TextOutputOptions implements CsvOutput, Profilable {
 
     @CommandLine.Option(

src/main/java/nbbrd/console/picocli/text/ObsFormatOptions.java

@@ -25,7 +25,8 @@
 /**
  * @author Philippe Charles
  */
-@lombok.Data
+@lombok.Getter
+@lombok.Setter
 public class ObsFormatOptions implements ObsFormat, Profilable {
 
     @CommandLine.Option(
@@ -48,7 +49,7 @@ public class ObsFormatOptions implements ObsFormat, Profilable {
     @CommandLine.Option(
             names = {"-S", "--datetime"},
             paramLabel = "<pattern>",
-            defaultValue = "yyyy-MM-ddTHH:mm:ss",
+            defaultValue = "yyyy-MM-dd'T'HH:mm:ss",
             description = "Pattern used to format dates and times."
     )
     private String datetimePattern;

src/main/java/nbbrd/console/picocli/text/TextInputOptions.java

@@ -11,7 +11,8 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-@lombok.Data
+@lombok.Getter
+@lombok.Setter
 public class TextInputOptions implements TextInput, Profilable {
 
     @CommandLine.Option(

src/main/java/nbbrd/console/picocli/text/TextOutputOptions.java

@@ -11,7 +11,8 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-@lombok.Data
+@lombok.Getter
+@lombok.Setter
 public class TextOutputOptions implements TextOutput, Profilable {
 
     @CommandLine.Option(