From 464c38e8b1560c2b3d0e19f3eb137ebd843ba055 Mon Sep 17 00:00:00 2001 From: Shugo Ushio Date: Sun, 8 Jun 2025 19:26:48 +0900 Subject: [PATCH 1/2] using 17 --- .github/workflows/test.yml | 4 ++-- .java-version | 1 + .vscode/settings.json | 1 + README.md | 2 +- default.code-workspace | 2 +- pom.xml | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 .java-version diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92ae846..59ecaeb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 21 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: "21" + java-version: "17" distribution: "temurin" cache: maven diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..8e2afd3 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17 \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index dd96ccb..3e018d8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,6 +16,7 @@ "cognitoidentityprovider", "Dfile", "fiware", + "jenv", "jitpack", "libexec", "makeour", diff --git a/README.md b/README.md index 3496fd1..012221e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Set `xxxx.code-workspace` env and use it. ```json { "settings": { - "java.jdt.ls.java.home": "/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home", + "java.jdt.ls.java.home": "/Users/xxxx/.jenv/versions/17", "java.test.config": { "env": { "TEST_COGNITO_USER_POOL_ID": "", diff --git a/default.code-workspace b/default.code-workspace index c43f207..f2a4bfc 100644 --- a/default.code-workspace +++ b/default.code-workspace @@ -7,7 +7,7 @@ "settings": { "files.autoGuessEncoding": true, "files.encoding": "utf8", - "java.jdt.ls.java.home": "/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home", + "java.jdt.ls.java.home": "/Users/xxxx/.jenv/versions/17", "java.jdt.ls.vmargs": "-Dfile.encoding=UTF-8", "java.configuration.updateBuildConfiguration": "interactive", "java.test.config": { diff --git a/pom.xml b/pom.xml index 7dc3838..4b42845 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 21 - 21 + 17 + 17 From d5d754010b0b4d62f94e4d2a9d5fec585af7f385 Mon Sep 17 00:00:00 2001 From: Shugo Ushio Date: Sun, 8 Jun 2025 19:41:11 +0900 Subject: [PATCH 2/2] Add encodings --- .github/workflows/test.yml | 4 ++-- .vscode/settings.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59ecaeb..8379fe1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,10 +27,10 @@ jobs: TEST_COGNITO_USERNAME: ${{ secrets.TEST_COGNITO_USERNAME }} TEST_COGNITO_PASSWORD: ${{ secrets.TEST_COGNITO_PASSWORD }} run: > - mvn -B test --file pom.xml + mvn -B -Dfile.encoding=UTF-8 test --file pom.xml - name: Generate test report run: > - mvn -B + mvn -B -Dfile.encoding=UTF-8 site -DgenerateReports=false surefire-report:report-only diff --git a/.vscode/settings.json b/.vscode/settings.json index 3e018d8..3ec8898 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,6 +15,7 @@ "bouncycastle", "cognitoidentityprovider", "Dfile", + "Dgenerate", "fiware", "jenv", "jitpack",