Update for seed 3.10+

seedstack · Aug 13, 2020 · 53a5dff · 53a5dff
1 parent 65eface
commit 53a5dff
Show file tree

Hide file tree

Showing 102 changed files with 435 additions and 188 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: false
 
 language: java
 
-jdk: oraclejdk9
+jdk: openjdk11
 
 cache:
   directories:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 3.1.2 (2020-08-13)
+
+* [chg] Update for Seed 3.10+
+
 # Version 3.1.1 (2017-07-30)
 
 * [fix] Fields annotation with Guice `@Inject` annotation were not detected by Spring JPA override.

diff --git a/batch/pom.xml b/batch/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.spring</groupId>
         <artifactId>spring-bridge</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-bridge-batch</artifactId>
@@ -90,12 +90,6 @@
             <version>${hibernate.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb-api.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>

diff --git a/batch/src/main/java/org/seedstack/spring/batch/internal/SpringBatchCommandLineHandler.java b/batch/src/main/java/org/seedstack/spring/batch/internal/SpringBatchCommandLineHandler.java
@@ -1,16 +1,16 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 package org.seedstack.spring.batch.internal;
 
+import com.google.common.base.Strings;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.name.Names;
-import org.apache.commons.lang.StringUtils;
 import org.seedstack.seed.cli.CliCommand;
 import org.seedstack.seed.cli.CliOption;
 import org.seedstack.seed.cli.CommandLineHandler;
@@ -111,7 +111,7 @@ private JobLauncher getJobLauncher() {
     private String option(String option, String defaultName) {
         String ret = defaultName;
 
-        if (!StringUtils.isBlank(option)) {
+        if (!Strings.isNullOrEmpty(option)) {
             ret = option;
         }
 

diff --git a/batch/src/test/java/org/seedstack/spring/batch/SpringBatchCommandHandlerIT.java b/batch/src/test/java/org/seedstack/spring/batch/SpringBatchCommandHandlerIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/fixtures/DemoFlatFileItemReader.java b/batch/src/test/java/org/seedstack/spring/batch/fixtures/DemoFlatFileItemReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/fixtures/Employee.java b/batch/src/test/java/org/seedstack/spring/batch/fixtures/Employee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/fixtures/EmployeeMapper.java b/batch/src/test/java/org/seedstack/spring/batch/fixtures/EmployeeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/fixtures/FlatFileBatchDemo.java b/batch/src/test/java/org/seedstack/spring/batch/fixtures/FlatFileBatchDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/fixtures/SystemOutItemWriter.java b/batch/src/test/java/org/seedstack/spring/batch/fixtures/SystemOutItemWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/domain/Contact.java b/batch/src/test/java/org/seedstack/spring/batch/sample/domain/Contact.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/domain/User.java b/batch/src/test/java/org/seedstack/spring/batch/sample/domain/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/listeners/AppJobExecutionListener.java b/batch/src/test/java/org/seedstack/spring/batch/sample/listeners/AppJobExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/...c/test/java/org/seedstack/spring/batch/sample/listeners/ContactFailureLoggerListener.java b/...c/test/java/org/seedstack/spring/batch/sample/listeners/ContactFailureLoggerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/mapper/ContactFieldSetMapper.java b/batch/src/test/java/org/seedstack/spring/batch/sample/mapper/ContactFieldSetMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/mapper/UserFieldSetMapper.java b/batch/src/test/java/org/seedstack/spring/batch/sample/mapper/UserFieldSetMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/service/ContactService.java b/batch/src/test/java/org/seedstack/spring/batch/sample/service/ContactService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/service/ContactServiceImpl.java b/batch/src/test/java/org/seedstack/spring/batch/sample/service/ContactServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/service/UserService.java b/batch/src/test/java/org/seedstack/spring/batch/sample/service/UserService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/service/UserServiceImpl.java b/batch/src/test/java/org/seedstack/spring/batch/sample/service/UserServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/writer/ContactWriter.java b/batch/src/test/java/org/seedstack/spring/batch/sample/writer/ContactWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/java/org/seedstack/spring/batch/sample/writer/UserWriter.java b/batch/src/test/java/org/seedstack/spring/batch/sample/writer/UserWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/config/jdbc.properties b/batch/src/test/resources/META-INF/config/jdbc.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/persistence1.xml b/batch/src/test/resources/META-INF/persistence1.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/persistence2.xml b/batch/src/test/resources/META-INF/persistence2.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/spring/flatFileJob-context.xml b/batch/src/test/resources/META-INF/spring/flatFileJob-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/spring/optional-context.xml b/batch/src/test/resources/META-INF/spring/optional-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/spring/simple-job-launcher-context.xml b/batch/src/test/resources/META-INF/spring/simple-job-launcher-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/spring/spring-context-batch.xml b/batch/src/test/resources/META-INF/spring/spring-context-batch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/spring/spring-context-orm.xml b/batch/src/test/resources/META-INF/spring/spring-context-orm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/META-INF/spring/spring-context.xml b/batch/src/test/resources/META-INF/spring/spring-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/batch/src/test/resources/application.yaml b/batch/src/test/resources/application.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this