Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build changes to nebula.netflixoss #469

Merged
merged 7 commits into from
Jan 22, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
50 changes: 30 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,35 +1,45 @@
ext.githubProjectName = rootProject.name

buildscript {
repositories {
mavenLocal()
mavenCentral() // maven { url 'http://jcenter.bintray.com' }
jcenter()
}
dependencies {
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:2.0.1'
}
apply from: file('gradle/buildscript.gradle'), to: buildscript
}

allprojects {
repositories {
mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
}
plugins {
id 'nebula.netflixoss' version '2.2.3'
}

apply from: file('gradle/convention.gradle')
apply from: file('gradle/maven.gradle')
//apply from: file('gradle/check.gradle')
apply from: file('gradle/license.gradle')
apply from: file('gradle/release.gradle')
ext {
githubProjectName = rootProject.name
}

subprojects {
apply plugin: 'nebula.netflixoss'
apply plugin: 'java'
apply plugin: 'nebula.provided-base'

repositories {
jcenter()
}

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

sourceSets.test.java.srcDir 'src/main/java'
eclipse {
classpath {
// include 'provided' dependencies on the classpath
plusConfigurations += [configurations.provided]
downloadSources = true
downloadJavadoc = true
}
}

tasks.withType(Javadoc).each {
it.classpath = sourceSets.main.compileClasspath

idea {
module {
// include 'provided' dependencies on the classpath
scopes.COMPILE.plus += [configurations.provided]
}
}
}

// Prevent contrib project from being published
project('hystrix-contrib').task('uploadMavenCentral', overwrite:true) { }
13 changes: 0 additions & 13 deletions codequality/HEADER

This file was deleted.

1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
version=1.4.0-RC6-SNAPSHOT
11 changes: 0 additions & 11 deletions gradle/buildscript.gradle

This file was deleted.

26 changes: 0 additions & 26 deletions gradle/check.gradle

This file was deleted.

101 changes: 0 additions & 101 deletions gradle/convention.gradle

This file was deleted.

10 changes: 0 additions & 10 deletions gradle/license.gradle

This file was deleted.

70 changes: 0 additions & 70 deletions gradle/maven.gradle

This file was deleted.

1 change: 0 additions & 1 deletion gradle/netflix-oss.gradle

This file was deleted.

61 changes: 0 additions & 61 deletions gradle/release.gradle

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Nov 19 11:13:37 PST 2014
#Thu Jan 08 16:14:23 PST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
Loading