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

Upgrade build to new netflixoss plugin #35

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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.
37 changes: 18 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
plugins {
id 'nebula.netflixoss' version '2.2.5'
id 'groovy'
id 'jacoco'
id 'codenarc'
}

// Establish version and status
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
group = "com.netflix.${githubProjectName}"

buildscript {
repositories {
mavenLocal()
mavenCentral() // maven { url 'http://jcenter.bintray.com' }
}
apply from: file('gradle/buildscript.gradle'), to: buildscript
codenarcMain {
configFile = file('codequality/codenarcMain.groovy')
}

allprojects {
repositories {
mavenLocal()
mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
}
codenarcTest {
configFile = file('codequality/codenarcTest.groovy')
}
codenarc {
reportFormat = 'html'
toolVersion = '0.22'
}

apply plugin: 'groovy'

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')
repositories {
jcenter()
}

dependencies {
compile 'org.codehaus.groovy:groovy-all:2.0.8'
Expand Down
13 changes: 0 additions & 13 deletions codequality/HEADER

This file was deleted.

2 changes: 0 additions & 2 deletions codequality/codenarcMain.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import groovy.transform.EqualsAndHashCode

ruleset {

// rulesets/basic.xml
Expand Down
3 changes: 0 additions & 3 deletions codequality/codenarcTest.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import groovy.transform.EqualsAndHashCode

ruleset {

// rulesets/basic.xml
Expand Down Expand Up @@ -148,7 +146,6 @@ ruleset {
BracesForIfElse
BracesForMethod
BracesForTryCatchFinally
ClassJavadoc
LineLength
SpaceAfterCatch
//SpaceAfterClosingBrace
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
version=0.4-SNAPSHOT
11 changes: 0 additions & 11 deletions gradle/buildscript.gradle

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

60 changes: 0 additions & 60 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 @@
#Tue Apr 02 11:45:56 PDT 2013
#Sat Jan 31 22:57:22 PST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ import com.amazonaws.services.simpleworkflow.model.WorkflowType
import com.netflix.glisten.impl.WorkflowMetaAttributes
import groovy.transform.Canonical

/**
* WorkflowClientFactory
*/
@Canonical class WorkflowClientFactory {

final AmazonSimpleWorkflow simpleWorkflow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package com.netflix.glisten.example.trip

/**
* Exception for the example
*/
class NotDoneYetException extends RuntimeException {

NotDoneYetException(String message) {
Expand Down