Commit a764853 1 parent 9224295 commit a764853 Copy full SHA for a764853
File tree 10 files changed +28
-65
lines changed
10 files changed +28
-65
lines changed Original file line number Diff line number Diff line change 1
- ext. githubProjectName = rootProject. name
2
-
3
1
buildscript {
4
- repositories { mavenCentral() }
5
- apply from : file(' gradle/buildscript.gradle' ), to : buildscript
2
+ repositories { jcenter() }
3
+ dependencies {
4
+ classpath ' com.netflix.nebula:gradle-extra-configurations-plugin:2.2.0'
5
+ }
6
6
}
7
7
8
- allprojects {
9
- repositories { mavenCentral() }
8
+ plugins {
9
+ id ' nebula.netflixoss ' version ' 2.2.9 '
10
10
}
11
11
12
- apply plugin : ' idea'
13
- apply from : file(' gradle/convention.gradle' )
14
- apply from : file(' gradle/maven.gradle' )
15
- apply from : file(' gradle/license.gradle' )
16
- apply from : file(' gradle/release.gradle' )
12
+ ext. githubProjectName = rootProject. name
13
+
14
+ idea {
15
+ project {
16
+ languageLevel = ' 1.7'
17
+ }
18
+ }
17
19
18
20
subprojects {
21
+ apply plugin : ' nebula.netflixoss'
22
+ apply plugin : ' java'
23
+ apply plugin : ' nebula.provided-base'
24
+
25
+ repositories {
26
+ jcenter()
27
+ }
19
28
20
29
group = " com.netflix.${ githubProjectName} "
21
30
Original file line number Diff line number Diff line change 1
- version =1.0.28
Original file line number Diff line number Diff line change 1
- # Tue Aug 14 16:28:54 PDT 2012
1
+ # Thu Apr 02 16:32:40 PDT 2015
2
2
distributionBase =GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
6
- distributionUrl =http \://services.gradle.org/distributions/gradle-1 .1-bin.zip
6
+ distributionUrl =https \://services.gradle.org/distributions/gradle-2.2 .1-bin.zip
Original file line number Diff line number Diff line change 1
- #! /bin/bash
1
+ #! /usr/ bin/env bash
2
2
3
3
# #############################################################################
4
4
# #
@@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
61
61
fi
62
62
done
63
63
SAVED=" ` pwd` "
64
- cd " ` dirname \" $PRG \" ` /"
64
+ cd " ` dirname \" $PRG \" ` /" >& -
65
65
APP_HOME=" ` pwd -P` "
66
- cd " $SAVED "
66
+ cd " $SAVED " >& -
67
67
68
68
CLASSPATH=$APP_HOME /gradle/wrapper/gradle-wrapper.jar
69
69
Original file line number Diff line number Diff line change 1
- apply plugin : ' java'
2
1
apply plugin : ' groovy'
3
- apply plugin : ' eclipse'
4
- apply plugin : ' idea'
5
2
6
3
dependencies {
7
4
compile ' commons-io:commons-io:2.4'
@@ -11,7 +8,6 @@ dependencies {
11
8
12
9
provided ' junit:junit-dep:4.10'
13
10
provided ' javax.servlet:servlet-api:2.5'
14
- groovy " org.codehaus.groovy:groovy-all:2.3.1"
15
11
16
12
compile ' com.netflix.archaius:archaius-core:0.6.0'
17
13
compile ' com.netflix.servo:servo-core:0.7.2'
@@ -30,15 +26,7 @@ javadoc {
30
26
31
27
eclipse {
32
28
classpath {
33
- plusConfigurations + = configurations. provided
34
29
downloadSources = true
35
30
downloadJavadoc = true
36
31
}
37
32
}
38
-
39
-
40
- idea {
41
- module {
42
- scopes. PROVIDED . plus + = configurations. provided
43
- }
44
- }
Original file line number Diff line number Diff line change 1
- apply plugin : ' java'
2
1
apply plugin : ' groovy'
3
- apply plugin : ' eclipse'
4
- apply plugin : ' idea'
5
2
apply plugin : ' war'
6
3
apply plugin : ' jetty'
7
4
@@ -20,8 +17,8 @@ dependencies {
20
17
compile ' com.sun.jersey:jersey-client:1.17.1'
21
18
compile ' com.sun.jersey:jersey-servlet:1.17.1'
22
19
23
- groovy " org.codehaus.groovy:groovy-all:2.2.2"
24
- provided ' junit:junit-dep:4.10'
20
+ compile " org.codehaus.groovy:groovy-all:2.2.2"
21
+ providedCompile ' junit:junit-dep:4.10'
25
22
}
26
23
27
24
javadoc {
@@ -35,20 +32,11 @@ javadoc {
35
32
36
33
eclipse {
37
34
classpath {
38
- plusConfigurations + = configurations. provided
39
35
downloadSources = true
40
36
downloadJavadoc = true
41
37
}
42
38
}
43
39
44
-
45
- idea {
46
- module {
47
- languageLevel = ' 1.7'
48
- scopes. PROVIDED . plus + = configurations. provided
49
- }
50
- }
51
-
52
40
war {
53
41
webXml = file(' src/main/webapp/WEB-INF/web.xml' )
54
42
webInf{
Original file line number Diff line number Diff line change 1
- apply plugin : ' java'
2
1
apply plugin : ' groovy'
3
- apply plugin : ' eclipse'
4
- apply plugin : ' idea'
5
2
6
3
dependencies {
7
4
compile project(' :zuul-core' )
@@ -37,15 +34,7 @@ javadoc {
37
34
38
35
eclipse {
39
36
classpath {
40
- plusConfigurations + = configurations. provided
41
37
downloadSources = true
42
38
downloadJavadoc = true
43
39
}
44
40
}
45
-
46
-
47
- idea {
48
- module {
49
- scopes. PROVIDED . plus + = configurations. provided
50
- }
51
- }
Original file line number Diff line number Diff line change 1
- apply plugin : ' java'
2
1
apply plugin : ' war'
3
- apply plugin : ' eclipse'
4
- apply plugin : ' idea'
5
2
apply plugin : ' jetty'
6
3
7
4
8
5
dependencies {
9
6
compile project(" :zuul-core" )
10
7
11
8
compile ' org.apache.httpcomponents:httpclient:4.3.2'
12
- provided ' javax.servlet:servlet-api:2.5'
9
+ providedCompile ' javax.servlet:servlet-api:2.5'
13
10
}
14
11
15
12
eclipse {
16
13
classpath {
17
- plusConfigurations + = configurations. provided
18
14
downloadSources = true
19
15
downloadJavadoc = true
20
16
}
29
25
}
30
26
}
31
27
32
- idea {
33
- module {
34
- scopes. PROVIDED . plus + = configurations. provided
35
- }
36
- }
37
-
38
28
jettyRun. contextPath = ' /'
39
29
40
30
jettyRun. doFirst {
You can’t perform that action at this time.
0 commit comments