Skip to content

Commit 2e28ebd

Browse files
committed
Merge branch '7.x'
2 parents 2c19962 + 782cc1b commit 2e28ebd

24 files changed

Lines changed: 132 additions & 446 deletions
File renamed without changes.

‎build.gradle‎

Lines changed: 9 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -1,156 +1,17 @@
1-
// Establish version and status
2-
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
3-
4-
buildscript {
5-
repositories {
6-
mavenLocal()
7-
mavenCentral()
8-
}
9-
apply from: file('gradle/buildscript.gradle'), to: buildscript
10-
}
11-
12-
allprojects {
13-
if (JavaVersion.current().isJava8Compatible()) {
14-
tasks.withType(Javadoc) {
15-
options.addStringOption('Xdoclint:none', '-quiet') // Doclint is onerous in Java 8.
16-
}
17-
}
18-
repositories {
19-
mavenLocal()
20-
mavenCentral()
21-
maven { url 'https://oss.sonatype.org/content/repositories/releases/' }
22-
}
1+
plugins {
2+
id 'nebula.netflixoss' version '2.2.2'
233
}
244

25-
apply from: file('gradle/convention.gradle')
26-
apply from: file('gradle/maven.gradle')
27-
if (!JavaVersion.current().isJava8Compatible()) {
28-
apply from: file('gradle/check.gradle') // FindBugs is incompatible with Java 8.
5+
ext {
6+
githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
297
}
30-
apply from: file('gradle/license.gradle')
31-
apply from: file('gradle/release.gradle')
32-
apply plugin: 'idea'
338

349
subprojects {
35-
apply from: rootProject.file('dagger.gradle')
36-
group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
37-
}
38-
39-
project(':feign-core') {
40-
apply plugin: 'java'
41-
42-
test {
43-
useTestNG()
44-
}
45-
46-
dependencies {
47-
testCompile 'com.google.guava:guava:14.0.1'
48-
testCompile 'com.google.code.gson:gson:2.2.4'
49-
testCompile 'com.fasterxml.jackson.core:jackson-databind:2.2.2'
50-
testCompile 'org.testng:testng:6.8.5'
51-
testCompile 'com.google.mockwebserver:mockwebserver:20130706'
52-
}
53-
}
54-
55-
project(':feign-sax') {
56-
apply plugin: 'java'
57-
58-
test {
59-
useTestNG()
60-
}
61-
62-
dependencies {
63-
compile project(':feign-core')
64-
testCompile 'com.google.guava:guava:14.0.1'
65-
testCompile 'org.testng:testng:6.8.5'
66-
}
67-
}
68-
69-
project(':feign-gson') {
70-
apply plugin: 'java'
71-
72-
test {
73-
useTestNG()
74-
}
75-
76-
dependencies {
77-
compile project(':feign-core')
78-
compile 'com.google.code.gson:gson:2.2.4'
79-
testCompile 'org.testng:testng:6.8.5'
80-
}
81-
}
82-
83-
project(':feign-jackson') {
84-
apply plugin: 'java'
10+
apply plugin: 'nebula.netflixoss'
8511

86-
test {
87-
useTestNG()
88-
}
89-
90-
dependencies {
91-
compile project(':feign-core')
92-
compile 'com.fasterxml.jackson.core:jackson-databind:2.2.2'
93-
testCompile 'org.testng:testng:6.8.5'
94-
testCompile 'com.google.guava:guava:14.0.1'
95-
}
96-
}
97-
98-
project(':feign-jaxb') {
99-
apply plugin: 'java'
100-
101-
test {
102-
useTestNG()
103-
}
104-
105-
dependencies {
106-
compile project(':feign-core')
107-
testCompile 'org.testng:testng:6.8.5'
108-
testCompile 'com.google.guava:guava:14.0.1'
109-
}
110-
}
111-
112-
project(':feign-jaxrs') {
113-
apply plugin: 'java'
114-
115-
test {
116-
useTestNG()
117-
}
118-
119-
dependencies {
120-
compile project(':feign-core')
121-
compile 'javax.ws.rs:jsr311-api:1.1.1'
122-
testCompile project(':feign-gson')
123-
testCompile 'com.google.guava:guava:14.0.1'
124-
testCompile 'org.testng:testng:6.8.5'
125-
}
126-
}
127-
128-
project(':feign-ribbon') {
129-
apply plugin: 'java'
130-
131-
test {
132-
useTestNG()
133-
}
134-
135-
dependencies {
136-
compile project(':feign-core')
137-
compile 'com.netflix.ribbon:ribbon-loadbalancer:2.0-RC5'
138-
testCompile 'org.testng:testng:6.8.5'
139-
testCompile 'com.google.mockwebserver:mockwebserver:20130706'
140-
}
141-
}
142-
143-
project(':feign-slf4j') {
144-
apply plugin: 'java'
145-
146-
test {
147-
useTestNG()
148-
}
149-
150-
dependencies {
151-
compile project(':feign-core')
152-
compile 'org.slf4j:slf4j-api:1.7.5'
153-
testCompile 'org.testng:testng:6.8.5'
154-
testCompile 'org.slf4j:slf4j-simple:1.7.5'
12+
repositories {
13+
jcenter()
15514
}
15+
apply from: rootProject.file('dagger.gradle')
16+
group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
15617
}

‎codequality/HEADER‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎core/build.gradle‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apply plugin: 'java'
2+
3+
sourceCompatibility = 1.6
4+
5+
test {
6+
useTestNG()
7+
}
8+
9+
dependencies {
10+
testCompile 'com.google.guava:guava:14.0.1'
11+
testCompile 'com.google.code.gson:gson:2.2.4'
12+
testCompile 'com.fasterxml.jackson.core:jackson-databind:2.2.2'
13+
testCompile 'org.testng:testng:6.8.5'
14+
testCompile 'com.google.mockwebserver:mockwebserver:20130706'
15+
}

‎dagger.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ rootProject.idea.project.ipr.withXml { projectXml ->
9292
tasks.ideaModule.dependsOn(prepareAnnotationGeneratedSourceDirs)
9393

9494
idea.module {
95-
scopes.PROVIDED.plus += project.configurations.daggerCompiler
95+
scopes.PROVIDED.plus += [project.configurations.daggerCompiler]
9696
iml.withXml { xml->
9797
def moduleSource = xml.asNode().component.find { it.@name = 'NewModuleRootManager' }.content[0]
9898
moduleSource.appendNode('sourceFolder', [url: "file://\$MODULE_DIR\$/${relativePath(annotationGeneratedSources)}", isTestSource: false])
@@ -103,7 +103,7 @@ idea.module {
103103
tasks.eclipseClasspath.dependsOn(prepareAnnotationGeneratedSourceDirs)
104104

105105
eclipse.classpath {
106-
plusConfigurations += project.configurations.daggerCompiler
106+
plusConfigurations += [project.configurations.daggerCompiler]
107107
}
108108

109109
tasks.eclipseClasspath {

‎example-github/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
plugins {
2+
id 'nebula.provided-base' version '2.0.1'
3+
}
4+
15
apply plugin: 'java'
26

7+
sourceCompatibility = 1.6
8+
39
dependencies {
410
compile 'com.netflix.feign:feign-core:5.3.0'
511
compile 'com.netflix.feign:feign-gson:5.3.0'

‎example-wikipedia/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
plugins {
2+
id 'nebula.provided-base' version '2.0.1'
3+
}
4+
15
apply plugin: 'java'
26

7+
sourceCompatibility = 1.6
8+
39
dependencies {
410
compile 'com.netflix.feign:feign-core:5.3.0'
511
compile 'com.netflix.feign:feign-gson:5.3.0'

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
version=8.0.0-SNAPSHOT

‎gradle/buildscript.gradle‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎gradle/check.gradle‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)