From a15af6e014aa75d8674d798ce44d7e2c4725fc1e Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 17 Sep 2025 02:27:38 +0300 Subject: [PATCH 1/7] Added Java 25 --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b690a308..ae0e37ce 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - java: [11, 17, 21, 23, 24, 25-ea] + java: [11, 17, 21, 23, 24, 25] steps: - uses: actions/checkout@v4 From cfedde0df6ce023ffad04d46a177fd09f765b8da Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 17 Sep 2025 02:29:31 +0300 Subject: [PATCH 2/7] Update maven.yml --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ae0e37ce..970bf813 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,7 +21,7 @@ jobs: - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: 'corretto' java-version: ${{ matrix.java }} cache: 'maven' - name: Build with Maven From b9e4284a8877ee2fa9b33a30514af8db304c6556 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 17 Sep 2025 07:02:42 +0300 Subject: [PATCH 3/7] Update maven.yml --- .github/workflows/maven.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 970bf813..411222bb 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -34,14 +34,14 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'corretto' - java-version: 17 + java-version: 21 cache: 'maven' - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar From e93eaf2cab93cf775a334727ba1deea27077743d Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 17 Sep 2025 10:08:40 +0300 Subject: [PATCH 4/7] Fixed test --- src/test/java/com/github/underscore/LodashTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java index 46921b78..cb2abe6d 100644 --- a/src/test/java/com/github/underscore/LodashTest.java +++ b/src/test/java/com/github/underscore/LodashTest.java @@ -724,8 +724,7 @@ void fetchPut() { assertEquals(403, result.getStatus()); U.FetchResponse result2 = U.fetch( - "https://raw.githubusercontent.com/javadev/underscore-java/refs/heads/" - + "main/src/test/resources/example.json", + "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json", "PUT", "{" + " \"dragon\": {" @@ -738,7 +737,7 @@ void fetchPut() { null, null, null); - assertEquals(403, result2.getStatus()); + assertEquals(200, result2.getStatus()); U.Chain resultChain = U.chain( "http://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json") From deaf60eb165339ea76b19b2e34202ff4521c1197 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 17 Sep 2025 10:10:25 +0300 Subject: [PATCH 5/7] Fixed test --- src/test/java/com/github/underscore/FunctionsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/underscore/FunctionsTest.java b/src/test/java/com/github/underscore/FunctionsTest.java index ec77b760..7ce229dd 100644 --- a/src/test/java/com/github/underscore/FunctionsTest.java +++ b/src/test/java/com/github/underscore/FunctionsTest.java @@ -201,7 +201,7 @@ void defer() { return null; }); assertEquals(0, counter[0].intValue(), "incr was debounced"); - await().atMost(600, TimeUnit.MILLISECONDS) + await().atMost(800, TimeUnit.MILLISECONDS) .until( () -> { assertEquals(1, counter[0].intValue(), "incr was debounced"); From 8fce007522d7166c5a20bf974e0bde10be45cc04 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 17 Sep 2025 10:13:32 +0300 Subject: [PATCH 6/7] Fixed test --- src/test/java/com/github/underscore/LodashTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java index cb2abe6d..43449dfc 100644 --- a/src/test/java/com/github/underscore/LodashTest.java +++ b/src/test/java/com/github/underscore/LodashTest.java @@ -710,8 +710,7 @@ void fetchGetHttps() { void fetchPut() { U.FetchResponse result = U.fetch( - "https://raw.githubusercontent.com/javadev/underscore-java/refs/heads/" - + "main/src/test/resources/example.json", + "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json", "PUT", "{" + " \"dragon\": {" @@ -721,7 +720,7 @@ void fetchPut() { + " \"fireBreath\": 10" + " }" + "}"); - assertEquals(403, result.getStatus()); + assertEquals(200, result.getStatus()); U.FetchResponse result2 = U.fetch( "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json", From 18c5e36781eb726d566b9234fcbcc36efcaf680f Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Wed, 17 Sep 2025 11:34:05 +0300 Subject: [PATCH 7/7] Restored test --- src/test/java/com/github/underscore/LodashTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/github/underscore/LodashTest.java b/src/test/java/com/github/underscore/LodashTest.java index 43449dfc..46921b78 100644 --- a/src/test/java/com/github/underscore/LodashTest.java +++ b/src/test/java/com/github/underscore/LodashTest.java @@ -710,7 +710,8 @@ void fetchGetHttps() { void fetchPut() { U.FetchResponse result = U.fetch( - "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json", + "https://raw.githubusercontent.com/javadev/underscore-java/refs/heads/" + + "main/src/test/resources/example.json", "PUT", "{" + " \"dragon\": {" @@ -720,10 +721,11 @@ void fetchPut() { + " \"fireBreath\": 10" + " }" + "}"); - assertEquals(200, result.getStatus()); + assertEquals(403, result.getStatus()); U.FetchResponse result2 = U.fetch( - "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json", + "https://raw.githubusercontent.com/javadev/underscore-java/refs/heads/" + + "main/src/test/resources/example.json", "PUT", "{" + " \"dragon\": {" @@ -736,7 +738,7 @@ void fetchPut() { null, null, null); - assertEquals(200, result2.getStatus()); + assertEquals(403, result2.getStatus()); U.Chain resultChain = U.chain( "http://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json")