Update seed and parent version to 2.0.0-SNAPSHOT

Author: adrienlauer

bom/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-spring-extensions</artifactId>
-        <version>2.0.0-M3-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-spring-extensions-bom</artifactId>

doc/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-spring-extensions</artifactId>
-        <version>2.0.0-M3-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-spring-extensions-doc</artifactId>

pom.xml

@@ -15,16 +15,16 @@
     <parent>
         <groupId>org.seedstack</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.0-M4-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.seedstack.seed</groupId>
     <artifactId>seed-spring-extensions</artifactId>
-    <version>2.0.0-M3-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <seed.version>2.0.0-M4-SNAPSHOT</seed.version>
+        <seed.version>2.0.0-SNAPSHOT</seed.version>
     </properties>
 
     <modules>
@@ -85,6 +85,7 @@
                             <licenseMerge>EPL 1.0|Eclipse Public License 1.0</licenseMerge>
                             <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
                             <licenseMerge>MIT|MIT License</licenseMerge>
+                            <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
                         </licenseMerges>
                     </configuration>
                 </plugin>

spring-support/core/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-spring-support</artifactId>
-        <version>2.0.0-M3-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-spring-support-core</artifactId>

spring-support/pom.xml

@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.seedstack.seed</groupId>
 		<artifactId>seed-spring-extensions</artifactId>
-		<version>2.0.0-M3-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
     <artifactId>seed-spring-support</artifactId>

spring-support/test/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-spring-support</artifactId>
-        <version>2.0.0-M3-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-spring-support-test</artifactId>

springbatch-support/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-spring-extensions</artifactId>
-        <version>2.0.0-M3-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-springbatch-support</artifactId>

springbatch-support/src/it/java/org/seedstack/seed/springbatch/internal/SpringBatchCommandHandlerIT.java

@@ -37,21 +37,21 @@ public void before() {
     }
 
     @Test
-    @WithCommandLine(value = {"--job", "flatFileJob", "-Pfile=fileTest.csv"}, expectedExitCode = 0)
+    @WithCommandLine(command = "run-job", value = {"--job", "flatFileJob", "-Pfile=fileTest.csv"}, expectedExitCode = 0)
     public void execute_batch_without_error() {
         assertThat(passedBefore).isTrue();
         assertThat(jobRepository).isNotNull();
     }
 
     @Test
-    @WithCommandLine(value = {"--job", "flatFileJob"}, expectedExitCode = 1)
+    @WithCommandLine(command = "run-job", value = {"--job", "flatFileJob"}, expectedExitCode = 1)
     public void execute_batch_with_error() {
         assertThat(passedBefore).isTrue();
         assertThat(jobRepository).isNotNull();
     }
 
     @Test
-    @WithCommandLine(value = {"-j", "flatFileJob", "-Pfile2=fileTest1", "--jobParameter", "file=fileTest.csv", "-P file3=fileTest2"}, expectedExitCode = 0)
+    @WithCommandLine(command = "run-job", value = {"-j", "flatFileJob", "-Pfile2=fileTest1", "--jobParameter", "file=fileTest.csv", "-P file3=fileTest2"}, expectedExitCode = 0)
     public void execute_batch_with_multiple_parameters() {
         assertThat(passedBefore).isTrue();
         assertThat(jobRepository).isNotNull();

springbatch-support/src/main/java/org/seedstack/seed/springbatch/internal/SpringBatchCommandLineHandler.java

@@ -12,9 +12,10 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.name.Names;
-import org.seedstack.seed.cli.spi.CliOption;
-import org.seedstack.seed.cli.spi.CommandLineHandler;
 import org.apache.commons.lang.StringUtils;
+import org.seedstack.seed.cli.api.CliCommand;
+import org.seedstack.seed.cli.api.CliOption;
+import org.seedstack.seed.cli.api.CommandLineHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.BatchStatus;
@@ -31,16 +32,18 @@
 import java.util.Map;
 
 /**
- * This {@link CommandLineHandler} can launch Spring Batch jobs with the following arguments:
+ * This {@link CommandLineHandler} is launched with the run-job command. It support the following arguments:
  *
  * <ul>
- *     <li>-j job-name</li>
- *     <li>-l job-launcher-name</li>
- *     <li>-P job-parameter-name=job-parameter-value</li>
+ * <li>-j job-name</li>
+ * <li>-l job-launcher-name</li>
+ * <li>-P job-parameter-name=job-parameter-value</li>
  * </ul>
  *
  * @author epo.jemba@ext.mpsa.com
+ * @author adrien.lauer@mpsa.com
  */
+@CliCommand(value = "run-job", description = "Launch Spring Batch jobs")
 public class SpringBatchCommandLineHandler implements CommandLineHandler {
 
     private static final String DEFAULT_JOB_LAUNCHER_NAME = "jobLauncher";
@@ -49,23 +52,18 @@ public class SpringBatchCommandLineHandler implements CommandLineHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SpringBatchCommandLineHandler.class);
 
-    @CliOption(opt = "l", longOpt = "jobLauncher", optionalArg = true, description = "Spring Job Launcher Name")
+    @CliOption(name = "l", longName = "jobLauncher", valueCount = 1, description = "Job launcher name to use")
     String optionJobLauncherName;
 
-    @CliOption(opt = "j", longOpt = "job", optionalArg = true, description = "Spring Job Name")
+    @CliOption(name = "j", longName = "job", valueCount = 1, description = "Job name to launch")
     String optionJobName;
 
-    @CliOption(opt = "P", longOpt = "jobParameter", args = true, valueSeparator = '=', description = "Spring Job parameter")
-    String[] optionJobParameters;
+    @CliOption(name = "P", longName = "jobParameter", valueCount = -1, description = "A job parameter")
+    Map<String, String> optionJobParameters;
 
     @Inject
     Injector injector;
 
-    @Override
-    public String name() {
-        return "spring-batch-cli-handler";
-    }
-
     @Override
     public Integer call() throws JobExecutionException {
         Integer batchExitStatus = 0;
@@ -89,25 +87,17 @@ public Integer call() throws JobExecutionException {
     }
 
     private JobParameters getJobParameters() {
-        JobParameters jobParameters;
-        Map<String, JobParameter> mapJobParameter = optionParameters(optionJobParameters);
-        if (mapJobParameter != null && !mapJobParameter.isEmpty()) {
-            jobParameters = new JobParameters(mapJobParameter);
-        } else {
-            jobParameters = new JobParameters();
-        }
-        return jobParameters;
-    }
+        if (optionJobParameters != null && !optionJobParameters.isEmpty()) {
+            Map<String, JobParameter> mapJobParameter = new HashMap<String, JobParameter>();
 
-    private Map<String, JobParameter> optionParameters(String[] optJobParameters) {
-        Map<String, JobParameter> mapJobParameter = null;
-        if (optJobParameters != null && optJobParameters.length > 0 && (optJobParameters.length % 2) == 0) {
-            mapJobParameter = new HashMap<String, JobParameter>();
-            for (int i = 0; i < optJobParameters.length; i = i + 2) {
-                mapJobParameter.put(optJobParameters[i], new JobParameter(optJobParameters[i + 1]));
+            for (Map.Entry<String, String> stringJobParameterEntry : optionJobParameters.entrySet()) {
+                mapJobParameter.put(stringJobParameterEntry.getKey(), new JobParameter(stringJobParameterEntry.getValue()));
             }
+
+            return new JobParameters(mapJobParameter);
+        } else {
+            return new JobParameters();
         }
-        return mapJobParameter;
     }
 
     private Job getJob() {