From c12d11988a2572ff45160a3ebc4be3decbb0fca7 Mon Sep 17 00:00:00 2001 From: fvallenilla Date: Thu, 22 Jan 2026 16:32:29 -0700 Subject: [PATCH 1/3] Backport #1605 --- .github/workflows/nebula-ci.yml | 9 +++++---- .github/workflows/nebula-publish.yml | 9 +++++---- .github/workflows/nebula-snapshot.yml | 11 ++++++----- build.gradle | 15 +-------------- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/.github/workflows/nebula-ci.yml b/.github/workflows/nebula-ci.yml index da0c05887c..77f160accf 100644 --- a/.github/workflows/nebula-ci.yml +++ b/.github/workflows/nebula-ci.yml @@ -16,19 +16,20 @@ jobs: java: [ 11 ] name: CI with Java ${{ matrix.java }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup jdk - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} - - uses: actions/cache@v4 + distribution: 'zulu' + - uses: actions/cache@v5 id: gradle-cache with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }} restore-keys: | - ${{ runner.os }}-gradle- - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-wrapper-cache with: path: ~/.gradle/wrapper diff --git a/.github/workflows/nebula-publish.yml b/.github/workflows/nebula-publish.yml index 76e96ca190..b7d6cc0a3f 100644 --- a/.github/workflows/nebula-publish.yml +++ b/.github/workflows/nebula-publish.yml @@ -11,20 +11,21 @@ on: jobs: build: runs-on: ubuntu-latest + environment: Publish steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup jdk 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: java-version: 11 - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }} restore-keys: | - ${{ runner.os }}-gradle- - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-wrapper-cache with: path: ~/.gradle/wrapper diff --git a/.github/workflows/nebula-snapshot.yml b/.github/workflows/nebula-snapshot.yml index 3989690d75..8f4cc8ac9f 100644 --- a/.github/workflows/nebula-snapshot.yml +++ b/.github/workflows/nebula-snapshot.yml @@ -9,28 +9,29 @@ on: jobs: build: runs-on: ubuntu-latest + environment: Publish steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: java-version: 11 - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-wrapper-cache with: path: | ~/.gradle/wrapper key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }} - name: Build - run: ./gradlew build snapshot -Prelease.version=2.0.1-SNAPSHOT + run: ./gradlew build snapshot -Prelease.version=2.0.5-SNAPSHOT env: NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }} NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }} diff --git a/build.gradle b/build.gradle index 8c9dc2c226..b4ef4ad1ab 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,3 @@ -buildscript { - repositories { - mavenCentral() - maven { - url "https://plugins.gradle.org/m2" - } - } - - dependencies { - classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:8.+' - } -} - plugins { id 'com.netflix.nebula.netflixoss' version '11.6.0' id 'org.gretty' version '4.0.3' @@ -58,7 +45,7 @@ allprojects { subprojects { apply plugin: 'com.netflix.nebula.netflixoss' - apply plugin: 'java' + apply plugin: 'java-library' group = "com.netflix.${githubProjectName}" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 93e53f2723..aa4468b7fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip From 87ac14f1d386cb244a66ae796b77d7fd3799c3bb Mon Sep 17 00:00:00 2001 From: fvallenilla <168041581+fvallenilla@users.noreply.github.com> Date: Thu, 22 Jan 2026 16:43:06 -0700 Subject: [PATCH 2/3] Update .github/workflows/nebula-ci.yml --- .github/workflows/nebula-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nebula-ci.yml b/.github/workflows/nebula-ci.yml index 77f160accf..d0308de938 100644 --- a/.github/workflows/nebula-ci.yml +++ b/.github/workflows/nebula-ci.yml @@ -21,7 +21,6 @@ jobs: uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} - distribution: 'zulu' - uses: actions/cache@v5 id: gradle-cache with: From 07f1dd0fc261687b2eee33ce396bded9ba353f13 Mon Sep 17 00:00:00 2001 From: fvallenilla <168041581+fvallenilla@users.noreply.github.com> Date: Thu, 22 Jan 2026 16:45:49 -0700 Subject: [PATCH 3/3] Update .github/workflows/nebula-ci.yml --- .github/workflows/nebula-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nebula-ci.yml b/.github/workflows/nebula-ci.yml index d0308de938..77f160accf 100644 --- a/.github/workflows/nebula-ci.yml +++ b/.github/workflows/nebula-ci.yml @@ -21,6 +21,7 @@ jobs: uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} + distribution: 'zulu' - uses: actions/cache@v5 id: gradle-cache with: