Skip to content

Commit a764853

Browse files
committed
New nebula.netflixoss build
1 parent 9224295 commit a764853

File tree

10 files changed

+28
-65
lines changed

10 files changed

+28
-65
lines changed

CHANGELOG.md

Whitespace-only changes.

build.gradle

+20-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1-
ext.githubProjectName = rootProject.name
2-
31
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+
}
66
}
77

8-
allprojects {
9-
repositories { mavenCentral() }
8+
plugins {
9+
id 'nebula.netflixoss' version '2.2.9'
1010
}
1111

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+
}
1719

1820
subprojects {
21+
apply plugin: 'nebula.netflixoss'
22+
apply plugin: 'java'
23+
apply plugin: 'nebula.provided-base'
24+
25+
repositories {
26+
jcenter()
27+
}
1928

2029
group = "com.netflix.${githubProjectName}"
2130

gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
version=1.0.28

gradle/wrapper/gradle-wrapper.jar

4.18 KB
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Aug 14 16:28:54 PDT 2012
1+
#Thu Apr 02 16:32:40 PDT 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
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

gradlew

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
##############################################################################
44
##
@@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
6161
fi
6262
done
6363
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/"
64+
cd "`dirname \"$PRG\"`/" >&-
6565
APP_HOME="`pwd -P`"
66-
cd "$SAVED"
66+
cd "$SAVED" >&-
6767

6868
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6969

zuul-core/build.gradle

-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
apply plugin: 'java'
21
apply plugin: 'groovy'
3-
apply plugin: 'eclipse'
4-
apply plugin: 'idea'
52

63
dependencies {
74
compile 'commons-io:commons-io:2.4'
@@ -11,7 +8,6 @@ dependencies {
118

129
provided 'junit:junit-dep:4.10'
1310
provided 'javax.servlet:servlet-api:2.5'
14-
groovy "org.codehaus.groovy:groovy-all:2.3.1"
1511

1612
compile 'com.netflix.archaius:archaius-core:0.6.0'
1713
compile 'com.netflix.servo:servo-core:0.7.2'
@@ -30,15 +26,7 @@ javadoc {
3026

3127
eclipse {
3228
classpath {
33-
plusConfigurations += configurations.provided
3429
downloadSources = true
3530
downloadJavadoc = true
3631
}
3732
}
38-
39-
40-
idea {
41-
module {
42-
scopes.PROVIDED.plus += configurations.provided
43-
}
44-
}

zuul-netflix-webapp/build.gradle

+2-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
apply plugin: 'java'
21
apply plugin: 'groovy'
3-
apply plugin: 'eclipse'
4-
apply plugin: 'idea'
52
apply plugin: 'war'
63
apply plugin: 'jetty'
74

@@ -20,8 +17,8 @@ dependencies {
2017
compile 'com.sun.jersey:jersey-client:1.17.1'
2118
compile 'com.sun.jersey:jersey-servlet:1.17.1'
2219

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'
2522
}
2623

2724
javadoc {
@@ -35,20 +32,11 @@ javadoc {
3532

3633
eclipse {
3734
classpath {
38-
plusConfigurations += configurations.provided
3935
downloadSources = true
4036
downloadJavadoc = true
4137
}
4238
}
4339

44-
45-
idea {
46-
module {
47-
languageLevel = '1.7'
48-
scopes.PROVIDED.plus += configurations.provided
49-
}
50-
}
51-
5240
war {
5341
webXml = file('src/main/webapp/WEB-INF/web.xml')
5442
webInf{

zuul-netflix/build.gradle

-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
apply plugin: 'java'
21
apply plugin: 'groovy'
3-
apply plugin: 'eclipse'
4-
apply plugin: 'idea'
52

63
dependencies {
74
compile project(':zuul-core')
@@ -37,15 +34,7 @@ javadoc {
3734

3835
eclipse {
3936
classpath {
40-
plusConfigurations += configurations.provided
4137
downloadSources = true
4238
downloadJavadoc = true
4339
}
4440
}
45-
46-
47-
idea {
48-
module {
49-
scopes.PROVIDED.plus += configurations.provided
50-
}
51-
}

zuul-simple-webapp/build.gradle

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
apply plugin: 'java'
21
apply plugin: 'war'
3-
apply plugin: 'eclipse'
4-
apply plugin: 'idea'
52
apply plugin: 'jetty'
63

74

85
dependencies {
96
compile project(":zuul-core")
107

118
compile 'org.apache.httpcomponents:httpclient:4.3.2'
12-
provided 'javax.servlet:servlet-api:2.5'
9+
providedCompile 'javax.servlet:servlet-api:2.5'
1310
}
1411

1512
eclipse {
1613
classpath {
17-
plusConfigurations += configurations.provided
1814
downloadSources = true
1915
downloadJavadoc = true
2016
}
@@ -29,12 +25,6 @@ war {
2925
}
3026
}
3127

32-
idea {
33-
module {
34-
scopes.PROVIDED.plus += configurations.provided
35-
}
36-
}
37-
3828
jettyRun.contextPath = '/'
3929

4030
jettyRun.doFirst {

0 commit comments

Comments
 (0)