Skip to content

Commit 0758146

Browse files
benjchristensenbenjchristensen
committed
Make 'provided' dependencies part of eclipse project classpath
Also reformatted all build files to be consistent.
1 parent 94651a0 commit 0758146

File tree

8 files changed

+92
-64
lines changed

8 files changed

+92
-64
lines changed

‎hystrix-contrib/hystrix-metrics-event-stream/build.gradle‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1-
apply plugin: 'java'
2-
dependencies {
3-
compile project(':hystrix-core')
4-
compile 'org.codehaus.jackson:jackson-core-asl:1.9.2'
5-
provided 'javax.servlet:servlet-api:2.5'
6-
provided 'junit:junit-dep:4.10'
7-
}
1+
apply plugin: 'java'
2+
apply plugin: 'eclipse'
3+
4+
dependencies {
5+
compile project(':hystrix-core')
6+
compile 'org.codehaus.jackson:jackson-core-asl:1.9.2'
7+
provided 'javax.servlet:servlet-api:2.5'
8+
provided 'junit:junit-dep:4.10'
9+
}
10+
11+
eclipse {
12+
classpath {
13+
plusConfigurations += configurations.provided
14+
downloadSources = true
15+
downloadJavadoc = true
16+
}
17+
}

‎hystrix-contrib/hystrix-request-servlet/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
apply plugin: 'java'
2-
dependencies {
3-
compile project(':hystrix-core')
4-
provided 'javax.servlet:servlet-api:2.5'
5-
}
1+
apply plugin: 'java'
2+
dependencies {
3+
compile project(':hystrix-core')
4+
provided 'javax.servlet:servlet-api:2.5'
5+
}

‎hystrix-contrib/hystrix-servo-metrics-publisher/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
apply plugin: 'java'
2-
dependencies {
3-
compile project(':hystrix-core')
4-
compile 'com.netflix.servo:servo-core:0.4.27'
5-
}
1+
apply plugin: 'java'
2+
dependencies {
3+
compile project(':hystrix-core')
4+
compile 'com.netflix.servo:servo-core:0.4.27'
5+
}

‎hystrix-contrib/hystrix-yammer-metrics-publisher/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
apply plugin: 'java'
2-
dependencies {
3-
compile project(':hystrix-core')
4-
compile 'com.yammer.metrics:metrics-core:2.2.0'
5-
}
1+
apply plugin: 'java'
2+
dependencies {
3+
compile project(':hystrix-core')
4+
compile 'com.yammer.metrics:metrics-core:2.2.0'
5+
}

‎hystrix-core/build.gradle‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
1-
apply plugin: 'java'
2-
dependencies {
3-
compile 'com.netflix.archaius:archaius-core:0.4.1'
4-
compile 'org.slf4j:slf4j-api:1.7.0'
5-
compile 'com.google.code.findbugs:jsr305:2.0.0'
6-
provided 'junit:junit-dep:4.10'
7-
}
1+
apply plugin: 'java'
2+
apply plugin: 'eclipse'
3+
4+
dependencies {
5+
compile 'com.netflix.archaius:archaius-core:0.4.1'
6+
compile 'org.slf4j:slf4j-api:1.7.0'
7+
compile 'com.google.code.findbugs:jsr305:2.0.0'
8+
provided 'junit:junit-dep:4.10'
9+
}
810

9-
javadoc {
10-
// the exclude isn't working, nor is there a subPackages options as docs suggest there should be
11-
// we do not want the com.netflix.hystrix.util package include
12-
exclude '**/util/**'
13-
14-
options {
15-
doclet = "org.benjchristensen.doclet.DocletExclude"
16-
docletpath = [rootProject.file('./gradle/doclet-exclude.jar')]
17-
stylesheetFile = rootProject.file('./gradle/javadocStyleSheet.css')
18-
windowTitle = "Hystrix Javadoc ${project.version}"
19-
}
20-
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>'
11+
javadoc {
12+
// the exclude isn't working, nor is there a subPackages options as docs suggest there should be
13+
// we do not want the com.netflix.hystrix.util package include
14+
exclude '**/util/**'
15+
16+
options {
17+
doclet = "org.benjchristensen.doclet.DocletExclude"
18+
docletpath = [rootProject.file('./gradle/doclet-exclude.jar')]
19+
stylesheetFile = rootProject.file('./gradle/javadocStyleSheet.css')
20+
windowTitle = "Hystrix Javadoc ${project.version}"
2121
}
22-
22+
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>'
23+
}
24+
25+
eclipse {
26+
classpath {
27+
plusConfigurations += configurations.provided
28+
downloadSources = true
29+
downloadJavadoc = true
30+
}
31+
}

‎hystrix-dashboard/build.gradle‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
apply plugin: 'java'
22
apply plugin: 'war'
33
apply plugin: 'jetty'
4+
apply plugin: 'eclipse'
45

5-
dependencies {
6-
provided 'javax.servlet:servlet-api:2.5'
7-
compile 'org.apache.httpcomponents:httpclient:4.2.1'
8-
compile 'log4j:log4j:1.2.17'
9-
compile 'org.slf4j:slf4j-api:1.7.0'
10-
}
6+
dependencies {
7+
provided 'javax.servlet:servlet-api:2.5'
8+
compile 'org.apache.httpcomponents:httpclient:4.2.1'
9+
compile 'log4j:log4j:1.2.17'
10+
compile 'org.slf4j:slf4j-api:1.7.0'
11+
}
1112

1213
jettyRun {
1314
httpPort = 7979
1415
}
16+
17+
eclipse {
18+
classpath {
19+
plusConfigurations += configurations.provided
20+
downloadSources = true
21+
downloadJavadoc = true
22+
}
23+
}

‎hystrix-examples-webapp/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apply plugin: 'java'
22
apply plugin: 'war'
33
apply plugin: 'jetty'
44

5-
dependencies {
6-
compile project(':hystrix-core')
7-
compile project(':hystrix-examples')
8-
compile project(':hystrix-contrib:hystrix-request-servlet')
9-
compile project(':hystrix-contrib:hystrix-metrics-event-stream')
10-
}
5+
dependencies {
6+
compile project(':hystrix-core')
7+
compile project(':hystrix-examples')
8+
compile project(':hystrix-contrib:hystrix-request-servlet')
9+
compile project(':hystrix-contrib:hystrix-metrics-event-stream')
10+
}
1111

1212
jettyRun {
1313
httpPort = 8989

‎hystrix-examples/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
apply plugin: 'java'
2-
dependencies {
3-
compile project(':hystrix-core')
4-
provided 'junit:junit-dep:4.10'
5-
}
6-
7-
task(runDemo, dependsOn: 'classes', type: JavaExec) {
8-
main = 'com.netflix.hystrix.examples.demo.HystrixCommandDemo'
9-
classpath = sourceSets.main.runtimeClasspath
10-
}
1+
apply plugin: 'java'
2+
dependencies {
3+
compile project(':hystrix-core')
4+
provided 'junit:junit-dep:4.10'
5+
}
6+
7+
task(runDemo, dependsOn: 'classes', type: JavaExec) {
8+
main = 'com.netflix.hystrix.examples.demo.HystrixCommandDemo'
9+
classpath = sourceSets.main.runtimeClasspath
10+
}
1111

0 commit comments

Comments
 (0)