HTHou commented on code in PR #17859:
URL: https://github.com/apache/iotdb/pull/17859#discussion_r3393020674
##########
scripts/sbin/windows/start-datanode.bat:
##########
@@ -48,15 +48,11 @@ for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java
-fullversion 2^>^&1') do (
set JAVA_VERSION=%MAJOR_VERSION%
-@REM we do not check jdk that version less than 1.8 because they are too
stale...
-IF "%JAVA_VERSION%" == "6" (
- echo IoTDB only supports jdk >= 8, please check your java version.
- goto finally
-)
-IF "%JAVA_VERSION%" == "7" (
- echo IoTDB only supports jdk >= 8, please check your java version.
- goto finally
-)
+ @REM IoTDB requires JDK 17 or later.
+ IF %JAVA_VERSION% LSS 17 (
+ echo IoTDB only supports jdk >= 17, please check your java
version.
+ goto finally
+ )
Review Comment:
Addressed in be178c3bc9. The DataNode Windows startup script now checks
whether `JAVA_VERSION` is empty before the numeric `LSS` comparison and exits
through `finally` with a clearer error message.
##########
scripts/sbin/windows/start-confignode.bat:
##########
@@ -46,15 +46,11 @@ for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java
-fullversion 2^>^&1') do (
set JAVA_VERSION=%MAJOR_VERSION%
-@REM we do not check jdk that version less than 1.8 because they are too
stale...
-IF "%JAVA_VERSION%" == "6" (
- echo IoTDB only supports jdk >= 8, please check your java version.
- goto finally
-)
-IF "%JAVA_VERSION%" == "7" (
- echo IoTDB only supports jdk >= 8, please check your java version.
- goto finally
-)
+ @REM IoTDB requires JDK 17 or later.
+ IF %JAVA_VERSION% LSS 17 (
+ echo IoTDB only supports jdk >= 17, please check your java
version.
+ goto finally
+ )
Review Comment:
Addressed in be178c3bc9. The ConfigNode Windows startup script now has the
same empty `JAVA_VERSION` guard before the `LSS` comparison, so it fails
gracefully if the Java version cannot be parsed.
##########
LICENSE-binary:
##########
@@ -224,12 +224,12 @@ com.fasterxml.jackson.core:jackson-databind:2.16.2
jakarta.inject:jakarta.inject:2.6.1
at.yawk.lz4:lz4-java:1.10.0
com.github.ben-manes.caffeine:caffeine:2.9.3
-org.eclipse.jetty:jetty-http:9.4.58.v20250814
-org.eclipse.jetty:jetty-io:9.4.58.v20250814
-org.eclipse.jetty:jetty-security:9.4.58.v20250814
-org.eclipse.jetty:jetty-server:9.4.58.v20250814
-org.eclipse.jetty:jetty-servlet:9.4.58.v20250814
-org.eclipse.jetty:jetty-util:9.4.58.v20250814
+org.eclipse.jetty:jetty-http:12.0.36
+org.eclipse.jetty:jetty-io:12.0.36
+org.eclipse.jetty:jetty-security:12.0.36
+org.eclipse.jetty:jetty-server:12.0.36
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.36
+org.eclipse.jetty:jetty-util:12.0.36
Review Comment:
Addressed in be178c3bc9. `org.eclipse.jetty:jetty-session:12.0.36` has been
added to `LICENSE-binary` alongside the other Jetty 12 artifacts.
##########
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/RestService.java:
##########
@@ -96,7 +96,7 @@ private ServletContextHandler
constructServletContextHandler() {
holder.setInitOrder(1);
holder.setInitParameter(
"jersey.config.server.provider.packages",
- "io.swagger.jaxrs.listing, io.swagger.sample.resource,
org.apache.iotdb.rest.protocol");
+ "io.swagger.v3.jaxrs2.integration.resources,
org.apache.iotdb.rest.protocol");
Review Comment:
Addressed in be178c3bc9. I updated `AuthorizationFilter` to control the
Swagger Core 2.x OpenAPI resources (`/openapi`, `/openapi.json`, and
`/openapi.yaml`) with `enable_swagger`, and updated the config comments/docs to
point to `/openapi.json` instead of the old `/swagger.json` path.
##########
LICENSE-binary:
##########
@@ -224,12 +224,12 @@ com.fasterxml.jackson.core:jackson-databind:2.16.2
jakarta.inject:jakarta.inject:2.6.1
at.yawk.lz4:lz4-java:1.10.0
com.github.ben-manes.caffeine:caffeine:2.9.3
-org.eclipse.jetty:jetty-http:9.4.58.v20250814
-org.eclipse.jetty:jetty-io:9.4.58.v20250814
-org.eclipse.jetty:jetty-security:9.4.58.v20250814
-org.eclipse.jetty:jetty-server:9.4.58.v20250814
-org.eclipse.jetty:jetty-servlet:9.4.58.v20250814
-org.eclipse.jetty:jetty-util:9.4.58.v20250814
+org.eclipse.jetty:jetty-http:12.0.36
+org.eclipse.jetty:jetty-io:12.0.36
+org.eclipse.jetty:jetty-security:12.0.36
+org.eclipse.jetty:jetty-server:12.0.36
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.36
Review Comment:
Addressed in be178c3bc9. `LICENSE-binary` now includes the REST fat-jar
additions: `jetty-session`, the Swagger Jakarta artifacts, Jackson Jakarta
RS/XMLBind modules, `classgraph`, `jakarta.inject-api`,
`jakarta.activation-api`, and `jakarta.xml.bind-api`; it also replaces the
stale `jakarta.inject:jakarta.inject:2.6.1` coordinate with
`jakarta.inject:jakarta.inject-api:2.0.1`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
