diff --git a/build.gradle b/build.gradle index 20bccbd..c68dff4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ plugins { id "java" - id "org.springframework.boot" version "2.1.7.RELEASE" + id "org.springframework.boot" version "2.2.0.RELEASE" id "io.spring.dependency-management" version "1.0.8.RELEASE" - id 'com.google.cloud.tools.jib' version '1.0.0' + id 'com.google.cloud.tools.jib' version '1.6.1' } -ext['lombok.version'] = "1.18.8" +ext['lombok.version'] = "1.18.10" -version = "2.1.7" +version = "2.2.0" sourceCompatibility = '1.8' targetCompatibility = '1.8' @@ -52,16 +52,17 @@ dependencies { implementation "org.eclipse.collections:eclipse-collections-api:10.0.0" implementation "commons-io:commons-io:2.6" implementation "org.apache.commons:commons-lang3" - implementation "com.ibm.icu:icu4j:64.2" + implementation "com.ibm.icu:icu4j:65.1" implementation fileTree(dir: 'libs', includes: ['*.jar']) runtimeOnly "com.h2database:h2" + runtimeOnly "mysql:mysql-connector-java" testAnnotationProcessor "org.projectlombok:lombok" testCompileOnly "org.projectlombok:lombok" testImplementation "org.springframework.boot:spring-boot-starter-test" } wrapper { - gradleVersion = "5.5.1" + gradleVersion = "5.6.3" } jib { @@ -69,10 +70,10 @@ jib { image = 'openjdk:8-jdk-alpine' } container { - jvmFlags = ['-Djava.security.egd=file:/dev/./urandom', '-Xdebug'] + jvmFlags = ['-Djava.security.egd=file:/dev/./urandom', '-Xdebug', '-Xmx128m'] mainClass = 'sample.Application' ports = ['8080'] - useCurrentTimestamp = true + creationTime = 'USE_CURRENT_TIMESTAMP' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b7e1f3..f04d6a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0a..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index 15e1ee3..24467a1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/main/java/sample/context/security/SecurityConfigurer.java b/src/main/java/sample/context/security/SecurityConfigurer.java index 286038a..887ba4d 100644 --- a/src/main/java/sample/context/security/SecurityConfigurer.java +++ b/src/main/java/sample/context/security/SecurityConfigurer.java @@ -66,7 +66,7 @@ public class SecurityConfigurer extends WebSecurityConfigurerAdapter { private DispatcherServletRegistrationBean dispatcherServletRegistration; @Override - public void configure(WebSecurity web) throws Exception { + public void configure(WebSecurity web) { web.ignoring().mvcMatchers( ArrayAdapter.adapt(props.auth().getIgnorePath()) .collect(dispatcherServletRegistration::getRelativePath) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 08a54db..f602b0b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -32,16 +32,16 @@ extension: admin: false datasource: default: - url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE - username: - password: + url: ${DB_DEFAULT_JDBC_URL:jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE} + username: ${DB_DEFAULT_JDBC_USERNAME:} + password: ${DB_DEFAULT_JDBC_PASSWORD:} jpa: package-to-scan: sample.model hibernate.ddl-auto: create-drop system: - url: jdbc:h2:mem:system;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE - username: - password: + url: ${DB_SYSTEM_JDBC_URL:jdbc:h2:mem:system;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE} + username: ${DB_SYSTEM_JDBC_USERNAME:} + password: ${DB_SYSTEM_JDBC_PASSWORD:} jpa: package-to-scan: sample.context hibernate.ddl-auto: create-drop @@ -55,16 +55,10 @@ spring: extension: datasource: default: - url: jdbc:oracle:thin:@xxx.xxx.xxx.xxx:1521:xx - username: XXXXXX - password: XXXXXX jpa: show-sql: false hibernate.ddl-auto: none system: - url: jdbc:oracle:thin:@xxx.xxx.xxx.xxx:1521:xx - username: XXXXXX - password: XXXXXX jpa: show-sql: false hibernate.ddl-auto: none diff --git a/src/test/java/sample/model/asset/CashInOutTest.java b/src/test/java/sample/model/asset/CashInOutTest.java index f44def9..03b83ab 100644 --- a/src/test/java/sample/model/asset/CashInOutTest.java +++ b/src/test/java/sample/model/asset/CashInOutTest.java @@ -68,7 +68,6 @@ private FindCashInOut findParam(LocalDate fromDay, LocalDate toDay, ActionStatus } @Test - @SuppressWarnings("unchecked") public void 振込出金依頼をする() { LocalDate baseDay = businessDay.day(); LocalDate basePlus3Day = businessDay.day(3); @@ -157,7 +156,6 @@ private FindCashInOut findParam(LocalDate fromDay, LocalDate toDay, ActionStatus } @Test - @SuppressWarnings("unchecked") public void 発生日を迎えた振込入出金をキャッシュフロー登録する() { LocalDate baseDay = businessDay.day(); LocalDate basePlus3Day = businessDay.day(3);