Skip to content

Commit c9dcdc2

Browse files
committed
Build changes for nebula.netflixoss
1 parent e8791b7 commit c9dcdc2

File tree

23 files changed

+83
-600
lines changed

23 files changed

+83
-600
lines changed

build.gradle

+35-19
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,51 @@
1-
ext.githubProjectName = rootProject.name
2-
31
buildscript {
42
repositories {
5-
mavenLocal()
6-
mavenCentral() // maven { url 'http://jcenter.bintray.com' }
3+
jcenter()
4+
}
5+
dependencies {
6+
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
77
}
8-
apply from: file('gradle/buildscript.gradle'), to: buildscript
98
}
109

11-
allprojects {
12-
repositories {
13-
mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
14-
}
10+
plugins {
11+
id 'nebula.netflixoss' version '2.2.3'
1512
}
1613

17-
apply from: file('gradle/convention.gradle')
18-
apply from: file('gradle/maven.gradle')
19-
//apply from: file('gradle/check.gradle')
20-
apply from: file('gradle/license.gradle')
21-
apply from: file('gradle/release.gradle')
14+
ext {
15+
githubProjectName = rootProject.name
16+
}
2217

2318
subprojects {
19+
apply plugin: 'nebula.netflixoss'
20+
apply plugin: 'java'
21+
apply plugin: 'nebula.provided-base'
22+
23+
repositories {
24+
jcenter()
25+
}
2426

2527
group = "com.netflix.${githubProjectName}"
2628

27-
sourceSets.test.java.srcDir 'src/main/java'
29+
//sourceSets.test.java.srcDir 'src/main/java'
2830

29-
tasks.withType(Javadoc).each {
31+
/*tasks.withType(Javadoc).each {
3032
it.classpath = sourceSets.main.compileClasspath
33+
}*/
34+
35+
eclipse {
36+
classpath {
37+
// include 'provided' dependencies on the classpath
38+
plusConfigurations += [configurations.provided]
39+
downloadSources = true
40+
downloadJavadoc = true
41+
}
3142
}
32-
}
3343

34-
// Prevent contrib project from being published
35-
project('hystrix-contrib').task('uploadMavenCentral', overwrite:true) { }
44+
45+
idea {
46+
module {
47+
// include 'provided' dependencies on the classpath
48+
scopes.COMPILE.plus += [configurations.provided]
49+
}
50+
}
51+
}

codequality/HEADER

-13
This file was deleted.

gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
version=1.4.0-RC6-SNAPSHOT

gradle/buildscript.gradle

-11
This file was deleted.

gradle/check.gradle

-26
This file was deleted.

gradle/convention.gradle

-101
This file was deleted.

gradle/license.gradle

-10
This file was deleted.

gradle/maven.gradle

-70
This file was deleted.

gradle/netflix-oss.gradle

-1
This file was deleted.

gradle/release.gradle

-61
This file was deleted.

0 commit comments

Comments
 (0)