Skip to content

Commit 53a5dff

Browse files
committed
Update for seed 3.10+
1 parent 65eface commit 53a5dff

File tree

102 files changed

+435
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+435
-188
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ sudo: false
22

33
language: java
44

5-
jdk: oraclejdk9
5+
jdk: openjdk11
66

77
cache:
88
directories:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Version 3.1.2 (2020-08-13)
2+
3+
* [chg] Update for Seed 3.10+
4+
15
# Version 3.1.1 (2017-07-30)
26

37
* [fix] Fields annotation with Guice `@Inject` annotation were not detected by Spring JPA override.

batch/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
3+
Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
44
55
This Source Code Form is subject to the terms of the Mozilla Public
66
License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.seedstack.addons.spring</groupId>
1616
<artifactId>spring-bridge</artifactId>
17-
<version>3.1.1-SNAPSHOT</version>
17+
<version>3.1.2-SNAPSHOT</version>
1818
</parent>
1919

2020
<artifactId>spring-bridge-batch</artifactId>
@@ -90,12 +90,6 @@
9090
<version>${hibernate.version}</version>
9191
<scope>test</scope>
9292
</dependency>
93-
<dependency>
94-
<groupId>javax.xml.bind</groupId>
95-
<artifactId>jaxb-api</artifactId>
96-
<version>${jaxb-api.version}</version>
97-
<scope>test</scope>
98-
</dependency>
9993
<dependency>
10094
<groupId>org.hsqldb</groupId>
10195
<artifactId>hsqldb</artifactId>

batch/src/main/java/org/seedstack/spring/batch/internal/SpringBatchCommandLineHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
88
package org.seedstack.spring.batch.internal;
99

10+
import com.google.common.base.Strings;
1011
import com.google.inject.Injector;
1112
import com.google.inject.Key;
1213
import com.google.inject.name.Names;
13-
import org.apache.commons.lang.StringUtils;
1414
import org.seedstack.seed.cli.CliCommand;
1515
import org.seedstack.seed.cli.CliOption;
1616
import org.seedstack.seed.cli.CommandLineHandler;
@@ -111,7 +111,7 @@ private JobLauncher getJobLauncher() {
111111
private String option(String option, String defaultName) {
112112
String ret = defaultName;
113113

114-
if (!StringUtils.isBlank(option)) {
114+
if (!Strings.isNullOrEmpty(option)) {
115115
ret = option;
116116
}
117117

batch/src/test/java/org/seedstack/spring/batch/SpringBatchCommandHandlerIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

batch/src/test/java/org/seedstack/spring/batch/fixtures/DemoFlatFileItemReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

batch/src/test/java/org/seedstack/spring/batch/fixtures/Employee.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

batch/src/test/java/org/seedstack/spring/batch/fixtures/EmployeeMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

batch/src/test/java/org/seedstack/spring/batch/fixtures/FlatFileBatchDemo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

batch/src/test/java/org/seedstack/spring/batch/fixtures/SystemOutItemWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

0 commit comments

Comments
 (0)