Backport #1605 (#1617)

* Backport #1605

* Update .github/workflows/nebula-ci.yml

* Update .github/workflows/nebula-ci.yml

Author: fvallenilla

.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

.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

.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 }}

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}"
 

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