Merge pull request #167 from Netflix/update-nebula.netflixoss-use-sonatype-central-portal2

OdysseusLives · web-flow · commit a1965284c9b4 · 2025-06-23T10:42:11.000-07:00
Update nebula.netflixoss use sonatype central portal
diff --git a/.github/workflows/nebula-ci.yml b/.github/workflows/nebula-ci.yml
@@ -16,7 +16,7 @@ jobs:
         java: [ 8 ]
     name: CI with Java ${{ matrix.java }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Setup jdk
         uses: actions/setup-java@v1
         with:
diff --git a/.github/workflows/nebula-publish.yml b/.github/workflows/nebula-publish.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Setup jdk 8
         uses: actions/setup-java@v1
         with:
diff --git a/.github/workflows/nebula-snapshot.yml b/.github/workflows/nebula-snapshot.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.netflixoss' version '9.2.2'
+    id 'nebula.netflixoss' version '11.6.0'
 }
 
 subprojects {
@@ -29,5 +29,12 @@ subprojects {
     configurations.all {
         exclude group: 'com.netflix.rxjava'
     }
+
+    tasks.withType(ProcessResources).configureEach {
+        duplicatesStrategy = 'exclude'
+    }
+    tasks.withType(Jar).configureEach {
+        duplicatesStrategy = 'exclude'
+    }
 }
 
diff --git a/evcache-client-sample/build.gradle b/evcache-client-sample/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 repositories {
     mavenCentral()
@@ -12,9 +12,9 @@ configurations.all {
 }
 
 dependencies {
-    compile project(':evcache-core')
-    compile project(':evcache-client')
-    compile project(':evcache-zipkin-tracing')
+    api project(':evcache-core')
+    api project(':evcache-client')
+    api project(':evcache-zipkin-tracing')
 }
 
 task (runSample , dependsOn: 'classes' , type:JavaExec) {
diff --git a/evcache-client/build.gradle b/evcache-client/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'eclipse'
 
 sourceSets.main.java.srcDir 'src/main/java'
@@ -15,28 +15,28 @@ configurations {
 }
 
 dependencies {
-        compile project(':evcache-core')
-        compile group:"net.spy",                      name:"spymemcached",                     version:"2.11.4"
-
-        compile group:"com.google.code.findbugs",     name:"annotations",                      version:"latest.release"
-        compile group:"com.netflix.archaius",         name:"archaius2-api",                    version:"1.10.18"
-        compile group:"com.netflix.archaius",         name:"archaius2-core",                   version:"1.10.18"
-        compile group:"com.netflix.governator",       name:"governator",                       version:"latest.release"
-        compile group:"com.netflix.eureka",           name:"eureka-client",                    version:"1.10.18"
-        compile group:"com.netflix.eureka",           name:"eureka-client-archaius2",          version:"1.10.18"
-        compile group:"com.netflix.spectator",        name:"spectator-api",                    version:"latest.release"
-        compile group:"com.netflix.spectator",        name:"spectator-nflx-plugin",            version:"latest.release"
-        compile group:"io.reactivex",                 name:"rxjava",                           version:"latest.release"
-        compile group:"org.slf4j",                    name:"slf4j-log4j12",                    version:"1.7.+"
-        compile group:"org.slf4j",                    name:"slf4j-api",                        version:"1.7.+"
-        compile group:"org.json",                     name:"json",                             version:"20180813"
+        api project(':evcache-core')
+        api group:"net.spy",                      name:"spymemcached",                     version:"2.11.4"
+
+        api group:"com.google.code.findbugs",     name:"annotations",                      version:"latest.release"
+        api group:"com.netflix.archaius",         name:"archaius2-api",                    version:"1.10.18"
+        api group:"com.netflix.archaius",         name:"archaius2-core",                   version:"1.10.18"
+        api group:"com.netflix.governator",       name:"governator",                       version:"latest.release"
+        api group:"com.netflix.eureka",           name:"eureka-client",                    version:"1.10.18"
+        api group:"com.netflix.eureka",           name:"eureka-client-archaius2",          version:"1.10.18"
+        api group:"com.netflix.spectator",        name:"spectator-api",                    version:"latest.release"
+        api group:"com.netflix.spectator",        name:"spectator-nflx-plugin",            version:"latest.release"
+        api group:"io.reactivex",                 name:"rxjava",                           version:"latest.release"
+        api group:"org.slf4j",                    name:"slf4j-log4j12",                    version:"1.7.+"
+        api group:"org.slf4j",                    name:"slf4j-api",                        version:"1.7.+"
+        api group:"org.json",                     name:"json",                             version:"20180813"
         
 
-        testCompile group:"org.testng",               name:"testng",                           version:"7.5"
-        testCompile group:"com.netflix.archaius",     name:"archaius2-guice",                  version:"latest.release"
-        testCompile group:"com.beust",                name:"jcommander",                       version:"1.72"
-        testCompile group:"org.mockito",              name:"mockito-all",                      version:"latest.release"
-        testCompile group:'org.assertj',              name:'assertj-core',                     version:'latest.release'
+        testImplementation group:"org.testng",               name:"testng",                           version:"7.5"
+        testImplementation group:"com.netflix.archaius",     name:"archaius2-guice",                  version:"latest.release"
+        testImplementation group:"com.beust",                name:"jcommander",                       version:"1.72"
+        testImplementation group:"org.mockito",              name:"mockito-all",                      version:"latest.release"
+        testImplementation group:'org.assertj',              name:'assertj-core',                     version:'latest.release'
 }
 
 javadoc {
diff --git a/evcache-core/build.gradle b/evcache-core/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'eclipse'
 
 sourceSets.main.java.srcDir 'src/main/java'
@@ -24,30 +24,30 @@ test {
 }
 
 dependencies {
-        compile group:"org.apache.commons",                      name:"commons-lang3",                     version:"3.12.0"
-        compile group:"net.spy",                      name:"spymemcached",                     version:"2.11.4"
-        compile group:"com.google.inject",            name:"guice",                            version:"4.1.0"
-        compile group:"org.json",                     name:"json",                             version:"latest.release"
-        compile group:"com.google.code.findbugs",     name:"annotations",                      version:"latest.release"
-        compile group:"com.netflix.archaius",         name:"archaius2-core",                   version:"latest.release"
-        compile(group:"com.netflix.eureka",           name:"eureka-client-archaius2",          version:"1.9.8") {
+        api group:"org.apache.commons",                      name:"commons-lang3",                     version:"3.12.0"
+        api group:"net.spy",                      name:"spymemcached",                     version:"2.11.4"
+        api group:"com.google.inject",            name:"guice",                            version:"4.1.0"
+        api group:"org.json",                     name:"json",                             version:"latest.release"
+        api group:"com.google.code.findbugs",     name:"annotations",                      version:"latest.release"
+        api group:"com.netflix.archaius",         name:"archaius2-core",                   version:"latest.release"
+        api(group:"com.netflix.eureka",           name:"eureka-client-archaius2",          version:"1.9.8") {
                 exclude module:"archaius-core"
         }
-        compile group:"com.netflix.archaius",         name:"archaius2-persisted2",             version:"latest.release"
-        compile group:"com.netflix.spectator",        name:"spectator-api",                    version:"latest.release"
-        compile group:"com.netflix.spectator",        name:"spectator-ext-ipc",                version:"latest.release"
-        compile group:"io.reactivex",                 name:"rxjava",                           version:"latest.release"
-        compile group:"org.slf4j",                    name:"slf4j-log4j12",                    version:"1.7.+"
-        compile group:"org.slf4j",                    name:"slf4j-api",                        version:"1.7.+"
-        compile group:"org.apache.httpcomponents",    name:"httpclient",                       version:"latest.release"
-        compile group:"joda-time",                    name:"joda-time",                        version:"latest.release"
-        compile group:"javax.annotation",             name:"javax.annotation-api",             version:"latest.release"
-        compile group:"com.github.fzakaria",          name:"ascii85",                          version:"latest.release"
+        api group:"com.netflix.archaius",         name:"archaius2-persisted2",             version:"latest.release"
+        api group:"com.netflix.spectator",        name:"spectator-api",                    version:"latest.release"
+        api group:"com.netflix.spectator",        name:"spectator-ext-ipc",                version:"latest.release"
+        api group:"io.reactivex",                 name:"rxjava",                           version:"latest.release"
+        api group:"org.slf4j",                    name:"slf4j-log4j12",                    version:"1.7.+"
+        api group:"org.slf4j",                    name:"slf4j-api",                        version:"1.7.+"
+        api group:"org.apache.httpcomponents",    name:"httpclient",                       version:"latest.release"
+        api group:"joda-time",                    name:"joda-time",                        version:"latest.release"
+        api group:"javax.annotation",             name:"javax.annotation-api",             version:"latest.release"
+        api group:"com.github.fzakaria",          name:"ascii85",                          version:"latest.release"
 
-        testCompile group:"org.testng",               name:"testng",                           version:"7.5"
-        testCompile group:"com.beust",                name:"jcommander",                       version:"1.72"
-        testCompile group:"org.mockito",              name:"mockito-all",                      version:"latest.release"	
-        testCompile group:'org.assertj',              name:'assertj-core',                     version:'latest.release'
+        testImplementation group:"org.testng",               name:"testng",                           version:"7.5"
+        testImplementation group:"com.beust",                name:"jcommander",                       version:"1.72"
+        testImplementation group:"org.mockito",              name:"mockito-all",                      version:"latest.release"	
+        testImplementation group:'org.assertj',              name:'assertj-core',                     version:'latest.release'
 }
 
 javadoc {
diff --git a/evcache-zipkin-tracing/build.gradle b/evcache-zipkin-tracing/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 sourceSets.main.java.srcDir 'src/main/java'
 sourceSets.test.java.srcDir 'src/test/java'
@@ -9,10 +9,10 @@ repositories {
 }
 
 dependencies {
-    compile project(':evcache-core')
-    compile group:"io.zipkin.brave", name:"brave", version:"5.12.7"
-    testCompile group:"org.testng", name:"testng", version:"7.5"
-    testCompile group:"org.mockito", name:"mockito-all", version:"latest.release"
+    api project(':evcache-core')
+    api group:"io.zipkin.brave", name:"brave", version:"5.12.7"
+    testImplementation group:"org.testng", name:"testng", version:"7.5"
+    testImplementation group:"org.mockito", name:"mockito-all", version:"latest.release"
 }
 
 javadoc {
diff --git a/evcacheproxy/build.gradle b/evcacheproxy/build.gradle
@@ -16,18 +16,18 @@ configurations.all {
 }
 
 dependencies {
-        compile group:"com.netflix.evcache",          name:"evcache-client",                  version:"latest.release"
-        compile group:"com.netflix.governator",       name:"governator",                      version:"latest.release"
-        compile group:"com.netflix.governator",       name:"governator-archaius",             version:"latest.release"
-        compile group:"com.netflix.governator",       name:"governator-servlet",              version:"latest.release"
-        compile group:"com.sun.jersey",               name:"jersey-servlet",                  version:"latest.release"
-        compile group:"com.sun.jersey.contribs",      name:"jersey-guice",                    version:"latest.release"
-        compile group:"com.netflix.karyon",           name:"karyon2-admin-web",               version:"latest.release"
+        implementation group:"com.netflix.evcache",          name:"evcache-client",                  version:"latest.release"
+        implementation group:"com.netflix.governator",       name:"governator",                      version:"latest.release"
+        implementation group:"com.netflix.governator",       name:"governator-archaius",             version:"latest.release"
+        implementation group:"com.netflix.governator",       name:"governator-servlet",              version:"latest.release"
+        implementation group:"com.sun.jersey",               name:"jersey-servlet",                  version:"latest.release"
+        implementation group:"com.sun.jersey.contribs",      name:"jersey-guice",                    version:"latest.release"
+        implementation group:"com.netflix.karyon",           name:"karyon2-admin-web",               version:"latest.release"
         
-        compile group:"netflix",                         name:"platform",               version:"latest.release"
-        compile group:"netflix",                         name:"evcache-client2",        version:"latest.candidate"
-        compile group:"netflix",                         name:"base-server",            version:"latest.release"
-        compile group:"netflix",                         name:"nflibrary",              version:"latest.release"
+        implementation group:"netflix",                         name:"platform",               version:"latest.release"
+        implementation group:"netflix",                         name:"evcache-client2",        version:"latest.candidate"
+        implementation group:"netflix",                         name:"base-server",            version:"latest.release"
+        implementation group:"netflix",                         name:"nflibrary",              version:"latest.release"
         
 }
 
diff --git 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-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ buildscript {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`plugins {`
`13`		`- id 'nebula.netflixoss' version '9.2.2'`
	`13`	`+ id 'nebula.netflixoss' version '11.6.0'`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`subprojects {`
`@@ -29,5 +29,12 @@ subprojects {`
`29`	`29`	`configurations.all {`
`30`	`30`	`exclude group: 'com.netflix.rxjava'`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ tasks.withType(ProcessResources).configureEach {`
	`34`	`+ duplicatesStrategy = 'exclude'`
	`35`	`+ }`
	`36`	`+ tasks.withType(Jar).configureEach {`
	`37`	`+ duplicatesStrategy = 'exclude'`
	`38`	`+ }`
`32`	`39`	`}`
`33`	`40`