Skip to content

Commit 1d80b30

Browse files
authored
Merge pull request #14 from makeOurCity/feature/java-17
using 17
2 parents 77647cb + d5d7540 commit 1d80b30

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- name: Set up JDK 21
16+
- name: Set up JDK 17
1717
uses: actions/setup-java@v3
1818
with:
19-
java-version: "21"
19+
java-version: "17"
2020
distribution: "temurin"
2121
cache: maven
2222

@@ -27,10 +27,10 @@ jobs:
2727
TEST_COGNITO_USERNAME: ${{ secrets.TEST_COGNITO_USERNAME }}
2828
TEST_COGNITO_PASSWORD: ${{ secrets.TEST_COGNITO_PASSWORD }}
2929
run: >
30-
mvn -B test --file pom.xml
30+
mvn -B -Dfile.encoding=UTF-8 test --file pom.xml
3131
3232
- name: Generate test report
3333
run: >
34-
mvn -B
34+
mvn -B -Dfile.encoding=UTF-8
3535
site -DgenerateReports=false
3636
surefire-report:report-only

.java-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
17

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
"bouncycastle",
1616
"cognitoidentityprovider",
1717
"Dfile",
18+
"Dgenerate",
1819
"fiware",
20+
"jenv",
1921
"jitpack",
2022
"libexec",
2123
"makeour",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Set `xxxx.code-workspace` env and use it.
1717
```json
1818
{
1919
"settings": {
20-
"java.jdt.ls.java.home": "/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home",
20+
"java.jdt.ls.java.home": "/Users/xxxx/.jenv/versions/17",
2121
"java.test.config": {
2222
"env": {
2323
"TEST_COGNITO_USER_POOL_ID": "",

default.code-workspace

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"settings": {
88
"files.autoGuessEncoding": true,
99
"files.encoding": "utf8",
10-
"java.jdt.ls.java.home": "/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home",
10+
"java.jdt.ls.java.home": "/Users/xxxx/.jenv/versions/17",
1111
"java.jdt.ls.vmargs": "-Dfile.encoding=UTF-8",
1212
"java.configuration.updateBuildConfiguration": "interactive",
1313
"java.test.config": {

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
<maven.compiler.source>21</maven.compiler.source>
20-
<maven.compiler.target>21</maven.compiler.target>
19+
<maven.compiler.source>17</maven.compiler.source>
20+
<maven.compiler.target>17</maven.compiler.target>
2121
</properties>
2222

2323
<repositories>

0 commit comments

Comments
 (0)