From 22e1c8d78329e923913f5c6092462a6a30bc8983 Mon Sep 17 00:00:00 2001 From: Mechite Date: Fri, 21 Jul 2023 17:05:15 +0100 Subject: [PATCH 1/4] Update to Java 11 & support JPMS --- adminapi/src/main/java/module-info.java | 30 +++++++++++++++++++++++ api/src/main/java/module-info.java | 32 +++++++++++++++++++++++++ build.gradle | 4 ++-- 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 adminapi/src/main/java/module-info.java create mode 100644 api/src/main/java/module-info.java diff --git a/adminapi/src/main/java/module-info.java b/adminapi/src/main/java/module-info.java new file mode 100644 index 000000000..a021e9f00 --- /dev/null +++ b/adminapi/src/main/java/module-info.java @@ -0,0 +1,30 @@ +/* + * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2020 MinIO, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +module io.minio.api.admin { + requires org.bouncycastle.provider; + requires com.google.common; + requires com.fasterxml.jackson.annotation; + requires jsr305; + requires okhttp3; + requires com.fasterxml.jackson.databind; + requires com.fasterxml.jackson.datatype.jsr310; + requires com.github.spotbugs.annotations; + + requires io.minio.api; + + exports io.minio.admin; + exports io.minio.admin.messages; +} \ No newline at end of file diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java new file mode 100644 index 000000000..d46d1522a --- /dev/null +++ b/api/src/main/java/module-info.java @@ -0,0 +1,32 @@ +/* + * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2020 MinIO, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +open module io.minio.api { + requires okhttp3; + requires com.google.common; + requires simple.xml.safe; + requires jsr305; + requires com.fasterxml.jackson.databind; + requires com.github.spotbugs.annotations; + + exports io.minio; + exports io.minio.credentials; + exports io.minio.errors; + exports io.minio.http; + exports io.minio.messages; + + // TODO - Should this be exported (is this a public facing API)? + // exports io.minio.org.apache.commons.validator.routines; +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index cc8058379..50637accd 100644 --- a/build.gradle +++ b/build.gradle @@ -108,8 +108,8 @@ subprojects { check.dependsOn localeTest - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 spotless { java { From 84e5841fa4802dafc5c80929bebe56615b5eba49 Mon Sep 17 00:00:00 2001 From: Mechite <50027352+Mechite@users.noreply.github.com> Date: Fri, 21 Jul 2023 18:36:04 +0100 Subject: [PATCH 2/4] Update module-info.java --- adminapi/src/main/java/module-info.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adminapi/src/main/java/module-info.java b/adminapi/src/main/java/module-info.java index a021e9f00..6c4eccc07 100644 --- a/adminapi/src/main/java/module-info.java +++ b/adminapi/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2020 MinIO, Inc. + * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2023 MinIO, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,4 +27,4 @@ exports io.minio.admin; exports io.minio.admin.messages; -} \ No newline at end of file +} From 04f31d33efaccff55446468c534e352d667924a1 Mon Sep 17 00:00:00 2001 From: Mechite <50027352+Mechite@users.noreply.github.com> Date: Fri, 21 Jul 2023 18:36:14 +0100 Subject: [PATCH 3/4] Update module-info.java --- api/src/main/java/module-info.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java index d46d1522a..d6c0985aa 100644 --- a/api/src/main/java/module-info.java +++ b/api/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2020 MinIO, Inc. + * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2023 MinIO, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,4 +29,4 @@ // TODO - Should this be exported (is this a public facing API)? // exports io.minio.org.apache.commons.validator.routines; -} \ No newline at end of file +} From 0abd31ab92fa6891d1fcbe898cd00a7a695e2ccf Mon Sep 17 00:00:00 2001 From: Mechite <50027352+Mechite@users.noreply.github.com> Date: Sat, 22 Jul 2023 02:22:25 +0100 Subject: [PATCH 4/4] Update module-info.java --- adminapi/src/main/java/module-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminapi/src/main/java/module-info.java b/adminapi/src/main/java/module-info.java index 6c4eccc07..20e641f3d 100644 --- a/adminapi/src/main/java/module-info.java +++ b/adminapi/src/main/java/module-info.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -module io.minio.api.admin { +open module io.minio.api.admin { requires org.bouncycastle.provider; requires com.google.common; requires com.fasterxml.jackson.annotation;