Skip to content

Commit

Permalink
Spring Boot 3.1 to 3.3
Browse files Browse the repository at this point in the history
Java 17 to 21
Gradle 8.1 to 8.7
  • Loading branch information
jkazama committed May 29, 2024
1 parent 8fbed4c commit da58616
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
workspace-backend:
image: mcr.microsoft.com/vscode/devcontainers/java:17-jdk-bullseye
image: mcr.microsoft.com/vscode/devcontainers/java:21-jdk-bullseye
init: true
command: /bin/sh -c "while sleep 1000; do :; done"
extra_hosts:
Expand Down
3 changes: 0 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
// IntelliSense を使用して利用可能な属性を学べます。
// 既存の属性の説明をホバーして表示します。
// 詳細情報は次を確認してください: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2023 jkazama
Copyright (c) 2014-2024 jkazama

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.1.1'
id 'io.spring.dependency-management' version '1.1.0'
id 'org.springframework.boot' version '3.3.0'
id 'io.spring.dependency-management' version '1.1.5'
}

version = "3.1.1"
version = "3.3.0"

javadoc {
options.addBooleanOption('Xdoclint:none', true)
Expand Down Expand Up @@ -38,5 +38,5 @@ dependencies {
}

wrapper {
gradleVersion = "8.1.1"
gradleVersion = "8.7"
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 13 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -198,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
6 changes: 0 additions & 6 deletions src/main/java/sample/model/asset/Remarks.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
*/
public interface Remarks {

/** 振込入金 */
String CASH_IN = "cashIn";
/** 振込入金(調整) */
String CASH_IN_ADJUST = "cashInAdjust";
/** 振込入金(取消) */
String CASH_IN_CANCEL = "cashInCancel";
/** 振込出金 */
String CASH_OUT = "cashOut";
/** 振込出金(調整) */
String CASH_OUT_ADJUST = "cashOutAdjust";
/** 振込出金(取消) */
String CASH_OUT_CANCEL = "cashOutCancel";

}
17 changes: 9 additions & 8 deletions src/main/resources/messages.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# サービスで利用されるラベルメッセージファイルです。
# This is the i18n message file used by application.

# -- 定数 [Remarks]
Remarks.cashIn=CashIn
Remarks.cashInAdjust=CashInAdjust
Remarks.cashInCancel=CashInCancel
Remarks.cashOut=CashOut
Remarks.cashOutAdjust=CashOutAdjust
Remarks.cashOutCancel=CashOutCancel
# -- Label [Remarks]

label.Remarks.CashIn=CashIn
label.Remarks.CashInAdjust=CashInAdjust
label.Remarks.CashInCancel=CashInCancel
label.Remarks.CashOut=CashOut
label.Remarks.CashOutAdjust=CashOutAdjust
label.Remarks.CashOutCancel=CashOutCancel

0 comments on commit da58616

Please sign in to comment.