Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update gradle and nebula #478

Merged
merged 1 commit into from Mar 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 14 additions & 22 deletions build.gradle
Expand Up @@ -14,29 +14,21 @@
* limitations under the License.
*/

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.netflix.nebula:nebula-dependency-recommender:9.1.1'
classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:9.1.0'
}
}

plugins {
id 'me.champeau.gradle.jmh' version '0.5.2'
id "com.github.spotbugs" version "4.6.0" apply false
id 'me.champeau.jmh' version '0.6.8'
id "com.github.spotbugs" version "5.0.13" apply false
id 'com.netflix.nebula.dependency-recommender' version '12.0.0'
id 'com.netflix.nebula.netflixoss' version '11.1.1'
}

ext {
githubProjectName = 'servo'
}

allprojects {
apply plugin: 'nebula.dependency-recommender'
apply plugin: 'nebula.netflixoss'
apply plugin: 'me.champeau.gradle.jmh'
apply plugin: 'com.netflix.nebula.dependency-recommender'
apply plugin: 'com.netflix.nebula.netflixoss'
apply plugin: 'me.champeau.jmh'
}

subprojects {
Expand Down Expand Up @@ -75,12 +67,12 @@ subprojects {
}

dependencies {
compile 'org.slf4j:slf4j-api'
compile 'com.google.guava:guava'
compile 'com.netflix.spectator:spectator-api'
testCompile 'org.testng:testng:6.1.1'
testRuntime 'org.slf4j:slf4j-log4j12'
testRuntime 'log4j:log4j:1.2.17'
api 'org.slf4j:slf4j-api'
api 'com.google.guava:guava'
api 'com.netflix.spectator:spectator-api'
testImplementation 'org.testng:testng:6.1.1'
testImplementation 'org.slf4j:slf4j-log4j12'
testImplementation 'log4j:log4j:1.2.17'
jmh 'org.slf4j:slf4j-simple'
}

Expand All @@ -89,7 +81,7 @@ subprojects {
iterations = 10
fork = 5
profilers = ['STACK']
include = ['.*']
includes = ['.*']
}

checkstyle {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Expand Up @@ -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.8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
2 changes: 1 addition & 1 deletion servo-apache/build.gradle
@@ -1,5 +1,5 @@
dependencies {
compile project(':servo-core')
api project(':servo-core')
}

jar {
Expand Down
18 changes: 9 additions & 9 deletions servo-atlas/build.gradle
@@ -1,13 +1,13 @@
dependencies {
compile project(':servo-core')
compile 'com.netflix.archaius:archaius2-core'
compile 'com.netflix.iep-shadow:iepshadow-rxnetty'
compile 'com.netflix.iep-shadow:iepshadow-iep-rxhttp'
compile "com.fasterxml.jackson.core:jackson-databind"
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-smile"
compile 'io.netty:netty-buffer'
compile 'io.netty:netty-codec-http'
compile 'io.reactivex:rxjava'
api project(':servo-core')
api 'com.netflix.archaius:archaius2-core'
api 'com.netflix.iep-shadow:iepshadow-rxnetty'
api 'com.netflix.iep-shadow:iepshadow-iep-rxhttp'
api "com.fasterxml.jackson.core:jackson-databind"
api "com.fasterxml.jackson.dataformat:jackson-dataformat-smile"
api 'io.netty:netty-buffer'
api 'io.netty:netty-codec-http'
api 'io.reactivex:rxjava'
jmh project(':servo-core')
}

Expand Down
6 changes: 3 additions & 3 deletions servo-aws/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compile project(':servo-core')
compile('com.amazonaws:aws-java-sdk-autoscaling')
compile('com.amazonaws:aws-java-sdk-cloudwatch')
api project(':servo-core')
api('com.amazonaws:aws-java-sdk-autoscaling')
api('com.amazonaws:aws-java-sdk-cloudwatch')
}

checkstyle {
Expand Down
6 changes: 3 additions & 3 deletions servo-example/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compile project(':servo-core')
compile project(':servo-atlas')
compile project(':servo-graphite')
api project(':servo-core')
api project(':servo-atlas')
api project(':servo-graphite')
}

task(run, dependsOn: 'classes', type: JavaExec) {
Expand Down
2 changes: 1 addition & 1 deletion servo-graphite/build.gradle
@@ -1,5 +1,5 @@
dependencies {
compile project(':servo-core')
api project(':servo-core')
}

pmd {
Expand Down
2 changes: 1 addition & 1 deletion servo-tomcat/build.gradle
@@ -1,5 +1,5 @@
dependencies {
compile project(':servo-core')
api project(':servo-core')
}

pmd {
Expand Down