From c0fe76818675123713049573f039e60136bb22fa Mon Sep 17 00:00:00 2001 From: Katsute <58778985+Katsute@users.noreply.github.com> Date: Fri, 29 Sep 2023 21:15:59 -0400 Subject: [PATCH 1/4] upgrade to java 21 --- .devcontainer/devcontainer.json | 2 +- .../java/dev/katsute/simplehttpserver/server/ServerTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 891787a..75be257 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "image": "maven:3-eclipse-temurin-17", + "image": "maven:3-eclipse-temurin-21", "postAttachCommand": "mvn compile", "shutdownAction": "stopContainer", "forwardPorts": [ diff --git a/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java b/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java index d3a6e82..b688207 100644 --- a/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java +++ b/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java @@ -107,7 +107,7 @@ final void testCreateSlashContext() throws IOException{ server.removeContext("/"); } - @Test @EnabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17) + @Test @EnabledForJreRange(min=JRE.JAVA_8) final void testDuplicateContext8() throws IOException{ final SimpleHttpServer server = SimpleHttpServer.create(); @@ -116,7 +116,7 @@ final void testDuplicateContext8() throws IOException{ assertDoesNotThrow(() -> server.createContext("", HttpExchange::close)); } - @Test @DisabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17) + @Test @DisabledForJreRange(min=JRE.JAVA_8) final void testDuplicateContext18() throws IOException{ final SimpleHttpServer server = SimpleHttpServer.create(); From 05b5e79358bd89fa71b1383ef898b19d2103ea11 Mon Sep 17 00:00:00 2001 From: Katsute <58778985+Katsute@users.noreply.github.com> Date: Fri, 29 Sep 2023 21:50:52 -0400 Subject: [PATCH 2/4] fix tests --- .../java/dev/katsute/simplehttpserver/server/ServerTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java b/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java index b688207..8427f23 100644 --- a/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java +++ b/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java @@ -107,7 +107,7 @@ final void testCreateSlashContext() throws IOException{ server.removeContext("/"); } - @Test @EnabledForJreRange(min=JRE.JAVA_8) + @Test @EnabledForJre(value={JRE.JAVA_8}) final void testDuplicateContext8() throws IOException{ final SimpleHttpServer server = SimpleHttpServer.create(); @@ -116,7 +116,7 @@ final void testDuplicateContext8() throws IOException{ assertDoesNotThrow(() -> server.createContext("", HttpExchange::close)); } - @Test @DisabledForJreRange(min=JRE.JAVA_8) + @Test @DisabledForJre(value={JRE.JAVA_8}) final void testDuplicateContext18() throws IOException{ final SimpleHttpServer server = SimpleHttpServer.create(); From 1932a6b7c5655987150c60b5c32e25e561bb7a64 Mon Sep 17 00:00:00 2001 From: Katsute <58778985+Katsute@users.noreply.github.com> Date: Sat, 30 Sep 2023 01:58:32 +0000 Subject: [PATCH 3/4] fix tests --- .../java/dev/katsute/simplehttpserver/server/ServerTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java b/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java index 8427f23..eac3050 100644 --- a/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java +++ b/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java @@ -107,7 +107,7 @@ final void testCreateSlashContext() throws IOException{ server.removeContext("/"); } - @Test @EnabledForJre(value={JRE.JAVA_8}) + @Test @EnabledOnJre(value={JRE.JAVA_8}) final void testDuplicateContext8() throws IOException{ final SimpleHttpServer server = SimpleHttpServer.create(); @@ -116,7 +116,7 @@ final void testDuplicateContext8() throws IOException{ assertDoesNotThrow(() -> server.createContext("", HttpExchange::close)); } - @Test @DisabledForJre(value={JRE.JAVA_8}) + @Test @DisabledOnJre(value={JRE.JAVA_8}) final void testDuplicateContext18() throws IOException{ final SimpleHttpServer server = SimpleHttpServer.create(); From 5688b61f476fe7817e0a3d0ebeaf4c3fc5b1e3a6 Mon Sep 17 00:00:00 2001 From: Katsute <58778985+Katsute@users.noreply.github.com> Date: Sat, 30 Sep 2023 12:14:04 -0400 Subject: [PATCH 4/4] revert range --- .../java/dev/katsute/simplehttpserver/server/ServerTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java b/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java index eac3050..d3a6e82 100644 --- a/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java +++ b/src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java @@ -107,7 +107,7 @@ final void testCreateSlashContext() throws IOException{ server.removeContext("/"); } - @Test @EnabledOnJre(value={JRE.JAVA_8}) + @Test @EnabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17) final void testDuplicateContext8() throws IOException{ final SimpleHttpServer server = SimpleHttpServer.create(); @@ -116,7 +116,7 @@ final void testDuplicateContext8() throws IOException{ assertDoesNotThrow(() -> server.createContext("", HttpExchange::close)); } - @Test @DisabledOnJre(value={JRE.JAVA_8}) + @Test @DisabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17) final void testDuplicateContext18() throws IOException{ final SimpleHttpServer server = SimpleHttpServer.create();