Skip to content

Commit 6b8ab41

Browse files
committed
Moving to new netflixoss build
1 parent d968b8d commit 6b8ab41

14 files changed

+20
-328
lines changed

CHANGELOG.md

Whitespace-only changes.

build.gradle

+15-40
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
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-
41
buildscript {
52
repositories {
6-
mavenCentral()
3+
jcenter()
74
maven { url 'http://clojars.org/repo' }
85
}
96
dependencies {
10-
classpath 'clojuresque:clojuresque:1.7.0'
11-
}
12-
apply from: file('gradle/buildscript.gradle'), to: buildscript
7+
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:2.2.0'
8+
classpath 'com.netflix.nebula:nebula-clojure-plugin:2.2.0'
9+
}
1310
}
1411

15-
allprojects {
16-
repositories {
17-
mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
18-
maven { url 'http://clojars.org/repo' }
19-
}
12+
plugins {
13+
id 'nebula.netflixoss' version '2.2.9'
2014
}
2115

22-
apply from: file('gradle/convention.gradle')
23-
apply from: file('gradle/maven.gradle')
24-
apply from: file('gradle/check.gradle')
25-
apply from: file('gradle/license.gradle')
26-
apply from: file('gradle/release.gradle')
16+
// Establish version and status
17+
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
2718

2819
subprojects {
29-
20+
apply plugin: 'nebula.provided-base'
21+
apply plugin: 'clojure'
3022
group = 'com.netflix.pigpen'
3123

24+
repositories {
25+
jcenter()
26+
maven { url 'http://clojars.org/repo' }
27+
}
28+
3229
license {
3330
mapping('clj', 'SEMICOLON_STYLE')
3431
}
@@ -37,7 +34,6 @@ subprojects {
3734
from 'src/main/clojure'
3835
}
3936

40-
apply plugin: 'clojure'
4137
tasks.uberjar.enabled=true
4238
clojure.aotCompile = true
4339

@@ -51,12 +47,6 @@ subprojects {
5147
)
5248
}
5349

54-
clojureTest {
55-
// this is here because pig and hadoop are provided dependencies
56-
// without this, clojureTest doesn't work
57-
classpath = sourceSets.test.runtimeClasspath
58-
}
59-
6050
clojuredoc {
6151
includeNamespace 'pigpen.core'
6252
includeNamespace 'pigpen.fold'
@@ -66,21 +56,6 @@ subprojects {
6656
]
6757
}
6858

69-
javadoc {
70-
// this is here because pig and hadoop are provided dependencies
71-
// without this, javadoc doesn't work
72-
classpath = sourceSets.test.runtimeClasspath
73-
}
74-
75-
apply plugin: 'eclipse'
76-
eclipse {
77-
// this is here because pig and hadoop are provided dependencies
78-
// without this, counterclockwise doesn't work
79-
classpath {
80-
plusConfigurations += configurations.provided
81-
}
82-
}
83-
8459
////////////////////////////////////////////////////////////////////////////////
8560
// Define a task that runs an nrepl server. The port is given with the nreplPort
8661
// property:

codequality/HEADER

-13
This file was deleted.

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=0.2.16-SNAPSHOT
1+
release.scope=patch
22
nreplPort=9999

gradle/buildscript.gradle

-11
This file was deleted.

gradle/check.gradle

-20
This file was deleted.

gradle/convention.gradle

-101
This file was deleted.

gradle/license.gradle

-8
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.

gradle/wrapper/gradle-wrapper.jar

461 Bytes
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jan 03 15:04:07 PST 2014
1+
#Mon Feb 16 17:48:55 PST 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.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip

0 commit comments

Comments
 (0)