Skip to content

Commit

Permalink
Spring Boot 2.1.7 to 2.2.0
Browse files Browse the repository at this point in the history
Gradle 5.5.1 to 5.6.3
JIB 1.0.0 to 1.6.1
  • Loading branch information
jkazama committed Oct 18, 2019
1 parent f367a7f commit f6e7e15
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 28 deletions.
17 changes: 9 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -52,27 +52,28 @@ 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 {
from {
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'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 6 additions & 12 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/sample/model/asset/CashInOutTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit f6e7e15

Please sign in to comment.