Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #451 from Netflix/responseTimeOutFix_and_gradle_cl…
Browse files Browse the repository at this point in the history 
…eanup

Removed the ResponseTimeout check during ack time and enabled during sweep
  • Loading branch information
@pctreddy
pctreddy authored Mar 12, 2018
2 parents c38a666 + 122a326 commit 0dd471f
Show file tree
Hide file tree
Showing 27 changed files with 9,480 additions and 146 deletions.
5 changes: 3 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ plugins {
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name

apply plugin: 'project-report'
apply from: "$rootDir/versionsOfDependencies.gradle"


subprojects {
Expand All @@ -36,8 +37,8 @@ subprojects {
}

dependencies {
testCompile 'junit:junit-dep:4.10'
testCompile 'org.mockito:mockito-all:1.10.0'
testCompile "junit:junit-dep:${revJUnit}"
testCompile "org.mockito:mockito-all:${revMockito}"
}

group = "com.netflix.${githubProjectName}"
Expand Down
12 changes: 6 additions & 6 deletions client/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies {

compile project (':conductor-common')
compile 'com.sun.jersey:jersey-client:1.19.+'
compile 'org.slf4j:slf4j-api:1.7.+'
compile 'com.netflix.spectator:spectator-api:0.40.0'
compile "com.sun.jersey:jersey-client:${revJerseyClient}"
compile "org.slf4j:slf4j-api:${revSlf4j}"
compile "com.netflix.spectator:spectator-api:${revSpectator}"
compile 'com.netflix.eureka:eureka-client:latest.release'
compile 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.7.5'
compile 'com.netflix.archaius:archaius-core:0.7.5'
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${revJaxrsJackson}"
compile "com.netflix.archaius:archaius-core:${revArchaius}"

testCompile 'org.slf4j:slf4j-log4j12:1.8.0-alpha1'
testCompile "org.slf4j:slf4j-log4j12:${revSlf4jlog4j}"
}
311 changes: 311 additions & 0 deletions client/dependencies.lock
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,311 @@
{
"compile": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"org.slf4j:slf4j-api": {
"locked": "1.7.25",
"requested": "1.7.25"
}
},
"compileClasspath": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"org.slf4j:slf4j-api": {
"locked": "1.7.25",
"requested": "1.7.25"
}
},
"default": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"org.slf4j:slf4j-api": {
"locked": "1.7.25",
"requested": "1.7.25"
}
},
"runtime": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"org.slf4j:slf4j-api": {
"locked": "1.7.25",
"requested": "1.7.25"
}
},
"runtimeClasspath": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"org.slf4j:slf4j-api": {
"locked": "1.7.25",
"requested": "1.7.25"
}
},
"testCompile": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"junit:junit-dep": {
"locked": "4.10",
"requested": "4.10"
},
"org.mockito:mockito-all": {
"locked": "1.10.0",
"requested": "1.10.0"
},
"org.slf4j:slf4j-api": {
"locked": "1.8.0-alpha1",
"requested": "1.7.25"
},
"org.slf4j:slf4j-log4j12": {
"locked": "1.8.0-alpha1",
"requested": "1.8.0-alpha1"
}
},
"testCompileClasspath": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"junit:junit-dep": {
"locked": "4.10",
"requested": "4.10"
},
"org.mockito:mockito-all": {
"locked": "1.10.0",
"requested": "1.10.0"
},
"org.slf4j:slf4j-api": {
"locked": "1.8.0-alpha1",
"requested": "1.7.25"
},
"org.slf4j:slf4j-log4j12": {
"locked": "1.8.0-alpha1",
"requested": "1.8.0-alpha1"
}
},
"testRuntime": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"junit:junit-dep": {
"locked": "4.10",
"requested": "4.10"
},
"org.mockito:mockito-all": {
"locked": "1.10.0",
"requested": "1.10.0"
},
"org.slf4j:slf4j-api": {
"locked": "1.8.0-alpha1",
"requested": "1.7.25"
},
"org.slf4j:slf4j-log4j12": {
"locked": "1.8.0-alpha1",
"requested": "1.8.0-alpha1"
}
},
"testRuntimeClasspath": {
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider": {
"locked": "2.7.5",
"requested": "2.7.5"
},
"com.netflix.archaius:archaius-core": {
"locked": "0.7.5",
"requested": "0.7.5"
},
"com.netflix.conductor:conductor-common": {
"project": true
},
"com.netflix.eureka:eureka-client": {
"locked": "1.8.7",
"requested": "latest.release"
},
"com.netflix.spectator:spectator-api": {
"locked": "0.40.0",
"requested": "0.40.0"
},
"com.sun.jersey:jersey-client": {
"locked": "1.19.4",
"requested": "1.19.4"
},
"junit:junit-dep": {
"locked": "4.10",
"requested": "4.10"
},
"org.mockito:mockito-all": {
"locked": "1.10.0",
"requested": "1.10.0"
},
"org.slf4j:slf4j-api": {
"locked": "1.8.0-alpha1",
"requested": "1.7.25"
},
"org.slf4j:slf4j-log4j12": {
"locked": "1.8.0-alpha1",
"requested": "1.8.0-alpha1"
}
}
}
42 changes: 42 additions & 0 deletions common/dependencies.lock
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"testCompile": {
"junit:junit-dep": {
"locked": "4.10",
"requested": "4.10"
},
"org.mockito:mockito-all": {
"locked": "1.10.0",
"requested": "1.10.0"
}
},
"testCompileClasspath": {
"junit:junit-dep": {
"locked": "4.10",
"requested": "4.10"
},
"org.mockito:mockito-all": {
"locked": "1.10.0",
"requested": "1.10.0"
}
},
"testRuntime": {
"junit:junit-dep": {
"locked": "4.10",
"requested": "4.10"
},
"org.mockito:mockito-all": {
"locked": "1.10.0",
"requested": "1.10.0"
}
},
"testRuntimeClasspath": {
"junit:junit-dep": {
"locked": "4.10",
"requested": "4.10"
},
"org.mockito:mockito-all": {
"locked": "1.10.0",
"requested": "1.10.0"
}
}
}
Loading

0 comments on commit 0dd471f

Please sign in to comment.