diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57d8c1cf44cd..e6e48005543c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,7 +155,7 @@ jobs: if: needs.build-info.outputs.needs-compile == 'true' strategy: matrix: - java: [ 8, 11, 17 ] + java: [ 17 ] include: - os: ubuntu-24.04 - java: 21 @@ -182,7 +182,6 @@ jobs: uses: ./.github/workflows/check.yml with: checkout-fetch-depth: ${{ matrix.check != 'bats' && 1 || 0 }} - java-version: 8 # HDDS-10150 needs-maven-cache: ${{ !contains('author,bats', matrix.check) }} ratis-args: ${{ inputs.ratis_args }} script: ${{ matrix.check }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index adcc0b76d2f8..8682a1f9a6df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,8 +40,8 @@ If you have any questions, please don't hesitate to contact Requirements to compile the code: * Unix System -* JDK 1.8 or higher -* Maven 3.6 or later +* JDK 17 or later; client modules can be built with JDK 8 +* Maven 3.6.3 or later * Internet connection for first build (to fetch all Maven and Ozone dependencies) (Standard development tools such as make, gcc, etc. are required.) diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index dca25492fffa..cdf52e2cb033 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/pom.xml @@ -25,6 +25,10 @@ Apache Ozone HDDS Config Apache Ozone Distributed Data Store Config Tools + + ${ozone.java.version.client} + + org.slf4j diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index d594a4f486ad..4e54c1ed766f 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -27,6 +27,8 @@ false + + ${ozone.java.version.client} diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index e3801003e692..76395491e18b 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -25,6 +25,10 @@ Apache Ozone HDDS Hadoop Client dependencies Apache Ozone Distributed Data Store Hadoop client dependencies + + ${ozone.java.version.client} + + diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml index 694ef8e328a8..f3a7a4a8bccf 100644 --- a/hadoop-hdds/interface-admin/pom.xml +++ b/hadoop-hdds/interface-admin/pom.xml @@ -26,6 +26,7 @@ Apache Ozone Distributed Data Store Admin interface + ${ozone.java.version.client} true diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml index ca9a6aa95bcd..8a6493481896 100644 --- a/hadoop-hdds/interface-client/pom.xml +++ b/hadoop-hdds/interface-client/pom.xml @@ -26,6 +26,7 @@ Apache Ozone Distributed Data Store Client interface + ${ozone.java.version.client} true diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml index b914a3d4ab4c..52546353e362 100644 --- a/hadoop-hdds/interface-server/pom.xml +++ b/hadoop-hdds/interface-server/pom.xml @@ -26,6 +26,7 @@ Apache Ozone Distributed Data Store Server interface + ${ozone.java.version.client} true diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml index 51800af0963c..ef705ee4993e 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -25,6 +25,10 @@ Apache Ozone HDDS Test Utils Apache Ozone Distributed Data Store Test Utils + + ${ozone.java.version.client} + + ch.qos.reload4j diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh b/hadoop-ozone/dev-support/checks/findbugs.sh index 2286815ef332..f924815ee3d3 100755 --- a/hadoop-ozone/dev-support/checks/findbugs.sh +++ b/hadoop-ozone/dev-support/checks/findbugs.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -#checks:basic +#checks:skipped set -u -o pipefail diff --git a/hadoop-ozone/freon/pom.xml b/hadoop-ozone/freon/pom.xml index a4dca0ab8d66..b81c39199869 100644 --- a/hadoop-ozone/freon/pom.xml +++ b/hadoop-ozone/freon/pom.xml @@ -27,6 +27,7 @@ false + ${ozone.java.version.client} diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index 92bdc1f869a8..7b5d02686db4 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -16,9 +16,8 @@ 4.0.0 org.apache.ozone - hdds-hadoop-dependency-client + ozone 2.2.0-SNAPSHOT - ../../hadoop-hdds/hadoop-dependency-client ozone-insight 2.2.0-SNAPSHOT diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml index 60ddefa7cee4..d6a6d0e5198f 100644 --- a/hadoop-ozone/interface-client/pom.xml +++ b/hadoop-ozone/interface-client/pom.xml @@ -26,6 +26,7 @@ Apache Ozone Client interface + ${ozone.java.version.client} true diff --git a/hadoop-ozone/ozonefs-common/pom.xml b/hadoop-ozone/ozonefs-common/pom.xml index aecaa66cd4c0..3dadb521b549 100644 --- a/hadoop-ozone/ozonefs-common/pom.xml +++ b/hadoop-ozone/ozonefs-common/pom.xml @@ -26,6 +26,7 @@ Apache Ozone FileSystem Common UTF-8 + ${ozone.java.version.client} diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index fc8a5c6cd8e6..455777597697 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -23,6 +23,9 @@ 2.2.0-SNAPSHOT jar Apache Ozone FS Hadoop 2.x compatibility + + ${ozone.java.version.client} + org.apache.hadoop diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml index 5a751541481d..c04c99456249 100644 --- a/hadoop-ozone/ozonefs-hadoop3/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml @@ -24,6 +24,7 @@ jar Apache Ozone FS Hadoop 3.x compatibility + ${ozone.java.version.client} true diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml index a3f95f655cfb..d81859e1274c 100644 --- a/hadoop-ozone/ozonefs-shaded/pom.xml +++ b/hadoop-ozone/ozonefs-shaded/pom.xml @@ -25,6 +25,7 @@ Apache Ozone FileSystem Shaded + ${ozone.java.version.client} true true diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 95e9779c7893..74adc9762a25 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -27,6 +27,7 @@ false + ${ozone.java.version.client} diff --git a/pom.xml b/pom.xml index 0d3b6eacc43f..44d36fb26ea0 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ 3.5.2 ${maven-surefire-plugin.version} false - 8 + ${ozone.java.version.server} 3.9.12 true 1.11 @@ -173,6 +173,8 @@ 4.12.0 1.58.0 1.7.1 + 8 + 17 Katmai org_apache_ozone_shaded org.apache.ozone.shaded