Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to you 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.
name: "Validate Gradle Wrapper"
on: [push, pull_request]

jobs:
validation:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v5
18 changes: 17 additions & 1 deletion .github/workflows/pxf-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,23 @@ jobs:
path: /tmp/singlecluster-image.tar
retention-days: 1

java-compatibility-test:
name: build-and-test with java v${{ matrix.java }}
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '8', '11', '17' ]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{ matrix.Java } I see the task is already running, which means both uppercase and lowercase are fine. However, it seems like the inconsistency in capitalization might look better if unified. Of course, this is just a suggestion.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for thoughtful review!

fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'corretto'
- name: Assemble and test with Gradle
working-directory: ./server
run: ./gradlew build test --no-daemon

# Stage 2: Parallel test jobs using matrix strategy
pxf-test:
name: Test PXF - ${{ matrix.test_group }}
Expand All @@ -125,7 +142,6 @@ jobs:
- cli
- external-table
- fdw
- server
- sanity
- smoke
- hdfs
Expand Down
10 changes: 5 additions & 5 deletions ci/docker/pxf-cbdb-dev/ubuntu/script/build_pxf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ export PXF_HOME=/usr/local/pxf
sudo mkdir -p "$PXF_HOME"
sudo chown -R gpadmin:gpadmin "$PXF_HOME"

# Build all PXF components
make all

# Install PXF
make install
# Build and Install PXF
make -C external-table install
make -C fdw install
make -C cli install
make -C server install-server

# Set up PXF environment

Expand Down
12 changes: 9 additions & 3 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ buildscript {
}

plugins {
id "io.franzbecker.gradle-lombok" version "3.3.0"
id "io.freefair.lombok" version "6.6.3"
id "org.springframework.boot" version "${springBootVersion}" apply false
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
}

// override Spring Framework version to pick the Spring MVC 5.3.33 with the async race condition fix
Expand Down Expand Up @@ -59,7 +59,7 @@ idea {
configure(javaProjects) {
apply plugin: 'java'
apply plugin: 'io.spring.dependency-management'
apply plugin: "io.franzbecker.gradle-lombok"
apply plugin: "io.freefair.lombok"

group = 'org.apache.cloudberry.pxf'
version = "${version}"
Expand Down Expand Up @@ -258,6 +258,9 @@ configure(javaProjects) {
"-Xlint:empty", "-Xlint:finally", "-Xlint:overrides", "-Xlint:path", "-Xlint:-processing", "-Xlint:static",
"-Xlint:try", "-Xlint:fallthrough", "-Xlint:unchecked", "-Xlint:-options", "-Werror"
]
// JEP 411 (Java 17) - java.security.AccessController is deprecated.
// Note, in JEP 486 (Java 24) Security Manager is completely disabled, however Java-API is not broken.
options.compilerArgs += JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) ? ["-Xlint:-removal"] : []
}

compileTestJava {
Expand All @@ -266,6 +269,9 @@ configure(javaProjects) {
"-Xlint:empty", "-Xlint:finally", "-Xlint:overrides", "-Xlint:path", "-Xlint:-processing", "-Xlint:static",
"-Xlint:try", "-Xlint:fallthrough", "-Xlint:unchecked", "-Xlint:-options", "-Werror"
]
// JEP 411 (Java 17) - java.security.AccessController is deprecated.
// Note, in JEP 486 (Java 24) Security Manager is completely disabled, however Java-API is not broken.
options.compilerArgs += JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) ? ["-Xlint:-removal"] : []
}

configurations {
Expand Down
Binary file modified server/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion server/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading