forked from Netflix/Hystrix
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make 'provided' dependencies part of eclipse project classpath
Also reformatted all build files to be consistent.
1 parent
94651a0
commit 0758146
Showing
8 changed files
with
92 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,17 @@ | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
compile 'org.codehaus.jackson:jackson-core-asl:1.9.2' | ||
provided 'javax.servlet:servlet-api:2.5' | ||
provided 'junit:junit-dep:4.10' | ||
} | ||
apply plugin: 'java' | ||
apply plugin: 'eclipse' | ||
|
||
dependencies { | ||
compile project(':hystrix-core') | ||
compile 'org.codehaus.jackson:jackson-core-asl:1.9.2' | ||
provided 'javax.servlet:servlet-api:2.5' | ||
provided 'junit:junit-dep:4.10' | ||
} | ||
|
||
eclipse { | ||
classpath { | ||
plusConfigurations += configurations.provided | ||
downloadSources = true | ||
downloadJavadoc = true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
provided 'javax.servlet:servlet-api:2.5' | ||
} | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
provided 'javax.servlet:servlet-api:2.5' | ||
} |
10 changes: 5 additions & 5 deletions
10
hystrix-contrib/hystrix-servo-metrics-publisher/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
compile 'com.netflix.servo:servo-core:0.4.27' | ||
} | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
compile 'com.netflix.servo:servo-core:0.4.27' | ||
} |
10 changes: 5 additions & 5 deletions
10
hystrix-contrib/hystrix-yammer-metrics-publisher/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
compile 'com.yammer.metrics:metrics-core:2.2.0' | ||
} | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
compile 'com.yammer.metrics:metrics-core:2.2.0' | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,31 @@ | ||
apply plugin: 'java' | ||
dependencies { | ||
compile 'com.netflix.archaius:archaius-core:0.4.1' | ||
compile 'org.slf4j:slf4j-api:1.7.0' | ||
compile 'com.google.code.findbugs:jsr305:2.0.0' | ||
provided 'junit:junit-dep:4.10' | ||
} | ||
apply plugin: 'java' | ||
apply plugin: 'eclipse' | ||
|
||
dependencies { | ||
compile 'com.netflix.archaius:archaius-core:0.4.1' | ||
compile 'org.slf4j:slf4j-api:1.7.0' | ||
compile 'com.google.code.findbugs:jsr305:2.0.0' | ||
provided 'junit:junit-dep:4.10' | ||
} | ||
|
||
javadoc { | ||
// the exclude isn't working, nor is there a subPackages options as docs suggest there should be | ||
// we do not want the com.netflix.hystrix.util package include | ||
exclude '**/util/**' | ||
|
||
options { | ||
doclet = "org.benjchristensen.doclet.DocletExclude" | ||
docletpath = [rootProject.file('./gradle/doclet-exclude.jar')] | ||
stylesheetFile = rootProject.file('./gradle/javadocStyleSheet.css') | ||
windowTitle = "Hystrix Javadoc ${project.version}" | ||
} | ||
options.addStringOption('top').value = '<a href="https://github.com/Netflix/Hystrix"><img width="92" height="79" border="0" align="left" src="http://netflix.github.com/Hystrix/images/hystrix-logo-small.png"></a><h2 class="title" style="padding-top:40px">Hystrix: Latency and Fault Tolerance for Distributed Systems</h2>' | ||
javadoc { | ||
// the exclude isn't working, nor is there a subPackages options as docs suggest there should be | ||
// we do not want the com.netflix.hystrix.util package include | ||
exclude '**/util/**' | ||
|
||
options { | ||
doclet = "org.benjchristensen.doclet.DocletExclude" | ||
docletpath = [rootProject.file('./gradle/doclet-exclude.jar')] | ||
stylesheetFile = rootProject.file('./gradle/javadocStyleSheet.css') | ||
windowTitle = "Hystrix Javadoc ${project.version}" | ||
} | ||
|
||
options.addStringOption('top').value = '<a href="https://github.com/Netflix/Hystrix"><img width="92" height="79" border="0" align="left" src="http://netflix.github.com/Hystrix/images/hystrix-logo-small.png"></a><h2 class="title" style="padding-top:40px">Hystrix: Latency and Fault Tolerance for Distributed Systems</h2>' | ||
} | ||
|
||
eclipse { | ||
classpath { | ||
plusConfigurations += configurations.provided | ||
downloadSources = true | ||
downloadJavadoc = true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,23 @@ | ||
apply plugin: 'java' | ||
apply plugin: 'war' | ||
apply plugin: 'jetty' | ||
apply plugin: 'eclipse' | ||
|
||
dependencies { | ||
provided 'javax.servlet:servlet-api:2.5' | ||
compile 'org.apache.httpcomponents:httpclient:4.2.1' | ||
compile 'log4j:log4j:1.2.17' | ||
compile 'org.slf4j:slf4j-api:1.7.0' | ||
} | ||
dependencies { | ||
provided 'javax.servlet:servlet-api:2.5' | ||
compile 'org.apache.httpcomponents:httpclient:4.2.1' | ||
compile 'log4j:log4j:1.2.17' | ||
compile 'org.slf4j:slf4j-api:1.7.0' | ||
} | ||
|
||
jettyRun { | ||
httpPort = 7979 | ||
} | ||
|
||
eclipse { | ||
classpath { | ||
plusConfigurations += configurations.provided | ||
downloadSources = true | ||
downloadJavadoc = true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
provided 'junit:junit-dep:4.10' | ||
} | ||
task(runDemo, dependsOn: 'classes', type: JavaExec) { | ||
main = 'com.netflix.hystrix.examples.demo.HystrixCommandDemo' | ||
classpath = sourceSets.main.runtimeClasspath | ||
} | ||
apply plugin: 'java' | ||
dependencies { | ||
compile project(':hystrix-core') | ||
provided 'junit:junit-dep:4.10' | ||
} | ||
|
||
task(runDemo, dependsOn: 'classes', type: JavaExec) { | ||
main = 'com.netflix.hystrix.examples.demo.HystrixCommandDemo' | ||
classpath = sourceSets.main.runtimeClasspath | ||
} | ||
|