diff --git a/CHANGES.md b/CHANGELOG.md similarity index 100% rename from CHANGES.md rename to CHANGELOG.md diff --git a/build.gradle b/build.gradle index 3583c47a..95a5c84f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,127 +1,20 @@ -// Establish version and status -ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name - -buildscript { - repositories { - mavenLocal() - mavenCentral() - } - apply from: file('gradle/buildscript.gradle'), to: buildscript -} - -allprojects { - if (JavaVersion.current().isJava8Compatible()) { - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') // Doclint is onerous in Java 8. - } - } - repositories { - mavenLocal() - mavenCentral() - maven { url 'https://oss.sonatype.org/content/repositories/releases/' } - } +plugins { + id 'nebula.netflixoss' version '2.2.2' } -apply from: file('gradle/convention.gradle') -apply from: file('gradle/maven.gradle') -if (!JavaVersion.current().isJava8Compatible()) { - apply from: file('gradle/check.gradle') // FindBugs is incompatible with Java 8. +ext { + githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name } -apply from: file('gradle/license.gradle') -apply from: file('gradle/release.gradle') -apply plugin: 'idea' subprojects { - apply from: rootProject.file('dagger.gradle') - group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project -} - -project(':feign-core') { - apply plugin: 'java' - - test { - useTestNG() - } - - dependencies { - testCompile 'com.google.guava:guava:14.0.1' - testCompile 'com.google.code.gson:gson:2.2.4' - testCompile 'com.fasterxml.jackson.core:jackson-databind:2.2.2' - testCompile 'org.testng:testng:6.8.5' - testCompile 'com.google.mockwebserver:mockwebserver:20130706' - } -} - -project(':feign-sax') { - apply plugin: 'java' - - test { - useTestNG() - } - - dependencies { - compile project(':feign-core') - testCompile 'com.google.guava:guava:14.0.1' - testCompile 'org.testng:testng:6.8.5' - } -} - -project(':feign-gson') { - apply plugin: 'java' + apply plugin: 'nebula.netflixoss' - test { - useTestNG() - } - - dependencies { - compile project(':feign-core') - compile 'com.google.code.gson:gson:2.2.4' - testCompile 'org.testng:testng:6.8.5' - } -} - -project(':feign-jackson') { - apply plugin: 'java' - - test { - useTestNG() - } - - dependencies { - compile project(':feign-core') - compile 'com.fasterxml.jackson.core:jackson-databind:2.2.2' - testCompile 'org.testng:testng:6.8.5' - testCompile 'com.google.guava:guava:14.0.1' - } -} - -project(':feign-jaxrs') { - apply plugin: 'java' - - test { - useTestNG() - } - - dependencies { - compile project(':feign-core') - compile 'javax.ws.rs:jsr311-api:1.1.1' - testCompile project(':feign-gson') - testCompile 'com.google.guava:guava:14.0.1' - testCompile 'org.testng:testng:6.8.5' - } -} - -project(':feign-ribbon') { - apply plugin: 'java' - - test { - useTestNG() - } - - dependencies { - compile project(':feign-core') - compile 'com.netflix.ribbon:ribbon-loadbalancer:2.0-RC5' - testCompile 'org.testng:testng:6.8.5' - testCompile 'com.google.mockwebserver:mockwebserver:20130706' + repositories { + jcenter() + //mavenLocal() + //mavenCentral() + //maven { url 'https://oss.sonatype.org/content/repositories/releases/' } } + apply from: rootProject.file('dagger.gradle') + group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project } diff --git a/codequality/HEADER b/codequality/HEADER deleted file mode 100644 index 3102e4b4..00000000 --- a/codequality/HEADER +++ /dev/null @@ -1,13 +0,0 @@ -Copyright ${year} Netflix, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 00000000..2600e5fd --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,15 @@ +apply plugin: 'java' + +sourceCompatibility = 1.6 + +test { + useTestNG() +} + +dependencies { + testCompile 'com.google.guava:guava:14.0.1' + testCompile 'com.google.code.gson:gson:2.2.4' + testCompile 'com.fasterxml.jackson.core:jackson-databind:2.2.2' + testCompile 'org.testng:testng:6.8.5' + testCompile 'com.google.mockwebserver:mockwebserver:20130706' +} diff --git a/dagger.gradle b/dagger.gradle index 59996026..98c2c074 100644 --- a/dagger.gradle +++ b/dagger.gradle @@ -92,7 +92,7 @@ rootProject.idea.project.ipr.withXml { projectXml -> tasks.ideaModule.dependsOn(prepareAnnotationGeneratedSourceDirs) idea.module { - scopes.PROVIDED.plus += project.configurations.daggerCompiler + scopes.PROVIDED.plus += [project.configurations.daggerCompiler] iml.withXml { xml-> def moduleSource = xml.asNode().component.find { it.@name = 'NewModuleRootManager' }.content[0] moduleSource.appendNode('sourceFolder', [url: "file://\$MODULE_DIR\$/${relativePath(annotationGeneratedSources)}", isTestSource: false]) @@ -103,7 +103,7 @@ idea.module { tasks.eclipseClasspath.dependsOn(prepareAnnotationGeneratedSourceDirs) eclipse.classpath { - plusConfigurations += project.configurations.daggerCompiler + plusConfigurations += [project.configurations.daggerCompiler] } tasks.eclipseClasspath { diff --git a/example-github/build.gradle b/example-github/build.gradle index 5203be2b..21d34549 100644 --- a/example-github/build.gradle +++ b/example-github/build.gradle @@ -1,5 +1,11 @@ +plugins { + id 'nebula.provided-base' version '2.0.1' +} + apply plugin: 'java' +sourceCompatibility = 1.6 + dependencies { compile project(':feign-core') compile project(':feign-gson') diff --git a/example-wikipedia/build.gradle b/example-wikipedia/build.gradle index 2aa0efd9..4b2accf1 100644 --- a/example-wikipedia/build.gradle +++ b/example-wikipedia/build.gradle @@ -1,5 +1,11 @@ +plugins { + id 'nebula.provided-base' version '2.0.1' +} + apply plugin: 'java' +sourceCompatibility = 1.6 + dependencies { compile project(':feign-core') compile project(':feign-gson') diff --git a/gradle.properties b/gradle.properties index 324d26cf..e69de29b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +0,0 @@ -version=6.2.0-SNAPSHOT diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle deleted file mode 100644 index 0b6da7ce..00000000 --- a/gradle/buildscript.gradle +++ /dev/null @@ -1,11 +0,0 @@ -// Executed in context of buildscript -repositories { - // Repo in addition to maven central - repositories { maven { url 'http://dl.bintray.com/content/netflixoss/external-gradle-plugins/' } } // For gradle-release -} -dependencies { - classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.6.1' - classpath 'com.mapvine:gradle-cobertura-plugin:0.1' - classpath 'gradle-release:gradle-release:1.1.5' - classpath 'org.ajoberstar:gradle-git:0.5.0' -} diff --git a/gradle/check.gradle b/gradle/check.gradle deleted file mode 100644 index a3e4b4e7..00000000 --- a/gradle/check.gradle +++ /dev/null @@ -1,26 +0,0 @@ -subprojects { -// Checkstyle -apply plugin: 'checkstyle' -checkstyle { - ignoreFailures = true - configFile = rootProject.file('codequality/checkstyle.xml') -} - -// FindBugs -apply plugin: 'findbugs' -findbugs { - ignoreFailures = true -} - -// PMD -apply plugin: 'pmd' -//tasks.withType(Pmd) { reports.html.enabled true } - -apply plugin: 'cobertura' -cobertura { - sourceDirs = sourceSets.main.java.srcDirs - format = 'html' - includes = ['**/*.java', '**/*.groovy'] - excludes = [] -} -} diff --git a/gradle/convention.gradle b/gradle/convention.gradle deleted file mode 100644 index c4658fc3..00000000 --- a/gradle/convention.gradle +++ /dev/null @@ -1,101 +0,0 @@ -// GRADLE-2087 workaround, perform after java plugin -status = project.hasProperty('preferredStatus')?project.preferredStatus:(version.contains('SNAPSHOT')?'snapshot':'release') - -subprojects { project -> - apply plugin: 'java' // Plugin as major conventions - - sourceCompatibility = 1.6 - - // Restore status after Java plugin - status = rootProject.status - - task sourcesJar(type: Jar, dependsOn:classes) { - from sourceSets.main.allSource - classifier 'sources' - extension 'jar' - } - - task javadocJar(type: Jar, dependsOn:javadoc) { - from javadoc.destinationDir - classifier 'javadoc' - extension 'jar' - } - - configurations.add('sources') - configurations.add('javadoc') - configurations.archives { - extendsFrom configurations.sources - extendsFrom configurations.javadoc - } - - // When outputing to an Ivy repo, we want to use the proper type field - gradle.taskGraph.whenReady { - def isNotMaven = !it.hasTask(project.uploadMavenCentral) - if (isNotMaven) { - def artifacts = project.configurations.sources.artifacts - def sourceArtifact = artifacts.iterator().next() - sourceArtifact.type = 'sources' - } - } - - artifacts { - sources(sourcesJar) { - // Weird Gradle quirk where type will be used for the extension, but only for sources - type 'jar' - } - javadoc(javadocJar) { - type 'javadoc' - } - } - - configurations { - provided { - description = 'much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive.' - transitive = true - visible = true - } - } - - project.sourceSets { - main.compileClasspath += project.configurations.provided - main.runtimeClasspath -= project.configurations.provided - test.compileClasspath += project.configurations.provided - test.runtimeClasspath += project.configurations.provided - } -} - -apply plugin: 'github-pages' // Used to create publishGhPages task - -def docTasks = [:] -[Javadoc,ScalaDoc,Groovydoc].each{ Class docClass -> - def allSources = allprojects.tasks*.withType(docClass).flatten()*.source - if (allSources) { - def shortName = docClass.simpleName.toLowerCase() - def docTask = task "aggregate${shortName.capitalize()}"(type: docClass, description: "Aggregate subproject ${shortName}s") { - source = allSources - destinationDir = file("${project.buildDir}/docs/${shortName}") - doFirst { - def classpaths = allprojects.findAll { it.plugins.hasPlugin(JavaPlugin) }.collect { it.sourceSets.main.compileClasspath } - classpath = files(classpaths) - } - } - docTasks[shortName] = docTask - processGhPages.dependsOn(docTask) - } -} - -githubPages { - repoUri = "git@github.com:Netflix/${rootProject.githubProjectName}.git" - pages { - docTasks.each { shortName, docTask -> - from(docTask.outputs.files) { - into "docs/${shortName}" - } - } - } -} - -// Generate wrapper, which is distributed as part of source to alleviate the need of installing gradle -task createWrapper(type: Wrapper) { - gradleVersion = '1.5' -} diff --git a/gradle/license.gradle b/gradle/license.gradle deleted file mode 100644 index abd2e2c0..00000000 --- a/gradle/license.gradle +++ /dev/null @@ -1,10 +0,0 @@ -// Dependency for plugin was set in buildscript.gradle - -subprojects { -apply plugin: 'license' //nl.javadude.gradle.plugins.license.LicensePlugin -license { - header rootProject.file('codequality/HEADER') - ext.year = Calendar.getInstance().get(Calendar.YEAR) - skipExistingHeaders true -} -} diff --git a/gradle/maven.gradle b/gradle/maven.gradle deleted file mode 100644 index 817846d7..00000000 --- a/gradle/maven.gradle +++ /dev/null @@ -1,70 +0,0 @@ -// Maven side of things -subprojects { - apply plugin: 'maven' // Java plugin has to have been already applied for the conf2scope mappings to work - apply plugin: 'signing' - - signing { - required { gradle.taskGraph.hasTask(uploadMavenCentral) } - sign configurations.archives - } - -/** - * Publishing to Maven Central example provided from http://jedicoder.blogspot.com/2011/11/automated-gradle-project-deployment-to.html - * artifactory will execute uploadArchives to force generation of ivy.xml, and we don't want that to trigger an upload to maven - * central, so using custom upload task. - */ -task uploadMavenCentral(type:Upload, dependsOn: signArchives) { - configuration = configurations.archives - onlyIf { ['release', 'snapshot'].contains(project.status) } - repositories.mavenDeployer { - beforeDeployment { signing.signPom(it) } - - // To test deployment locally, use the following instead of oss.sonatype.org - //repository(url: "file://localhost/${rootProject.rootDir}/repo") - - def sonatypeUsername = rootProject.hasProperty('sonatypeUsername')?rootProject.sonatypeUsername:'' - def sonatypePassword = rootProject.hasProperty('sonatypePassword')?rootProject.sonatypePassword:'' - - repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2') { - authentication(userName: sonatypeUsername, password: sonatypePassword) - } - - snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots/') { - authentication(userName: sonatypeUsername, password: sonatypePassword) - } - - // Prevent datastamp from being appending to artifacts during deployment - uniqueVersion = false - - // Closure to configure all the POM with extra info, common to all projects - pom.project { - name "${project.name}" - description "${project.name} developed by Netflix" - developers { - developer { - id 'netflixgithub' - name 'Netflix Open Source Development' - email 'talent@netflix.com' - } - } - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - url "https://github.com/Netflix/${rootProject.githubProjectName}" - scm { - connection "scm:git:git@github.com:Netflix/${rootProject.githubProjectName}.git" - url "scm:git:git@github.com:Netflix/${rootProject.githubProjectName}.git" - developerConnection "scm:git:git@github.com:Netflix/${rootProject.githubProjectName}.git" - } - issueManagement { - system 'github' - url "https://github.com/Netflix/${rootProject.githubProjectName}/issues" - } - } - } - } -} diff --git a/gradle/netflix-oss.gradle b/gradle/netflix-oss.gradle deleted file mode 100644 index a87bc54e..00000000 --- a/gradle/netflix-oss.gradle +++ /dev/null @@ -1 +0,0 @@ -apply from: 'http://artifacts.netflix.com/gradle-netflix-local/artifactory.gradle' diff --git a/gradle/release.gradle b/gradle/release.gradle deleted file mode 100644 index 7979dc3a..00000000 --- a/gradle/release.gradle +++ /dev/null @@ -1,61 +0,0 @@ -apply plugin: 'release' - -[ uploadIvyLocal: 'uploadLocal', uploadArtifactory: 'artifactoryPublish', buildWithArtifactory: 'build' ].each { key, value -> - // Call out to compile against internal repository - task "${key}"(type: GradleBuild) { - startParameter = project.gradle.startParameter.newInstance() - doFirst { - startParameter.projectProperties = [status: project.status, preferredStatus: project.status] - } - startParameter.addInitScript( file('gradle/netflix-oss.gradle') ) - startParameter.getExcludedTaskNames().add('check') - tasks = [ 'build', value ] - } -} - -// Marker task for following code to key in on -task releaseCandidate(dependsOn: release) -task forceCandidate { - onlyIf { gradle.taskGraph.hasTask(releaseCandidate) } - doFirst { project.status = 'candidate' } -} -task forceRelease { - onlyIf { !gradle.taskGraph.hasTask(releaseCandidate) } - doFirst { project.status = 'release' } -} -release.dependsOn([forceCandidate, forceRelease]) - -task uploadMavenCentral(dependsOn: subprojects.tasks.uploadMavenCentral) -task releaseSnapshot(dependsOn: [uploadArtifactory, uploadMavenCentral]) - -// Ensure our versions look like the project status before publishing -task verifyStatus << { - def hasSnapshot = version.contains('-SNAPSHOT') - if (project.status == 'snapshot' && !hasSnapshot) { - throw new GradleException("Version (${version}) needs -SNAPSHOT if publishing snapshot") - } -} -uploadArtifactory.dependsOn(verifyStatus) -uploadMavenCentral.dependsOn(verifyStatus) - -// Ensure upload happens before taggging, hence upload failures will leave repo in a revertable state -preTagCommit.dependsOn([uploadArtifactory, uploadMavenCentral]) - - -gradle.taskGraph.whenReady { taskGraph -> - def hasRelease = taskGraph.hasTask('commitNewVersion') - def indexOf = { return taskGraph.allTasks.indexOf(it) } - - if (hasRelease) { - assert indexOf(build) < indexOf(unSnapshotVersion), 'build target has to be after unSnapshotVersion' - assert indexOf(uploadMavenCentral) < indexOf(preTagCommit), 'preTagCommit has to be after uploadMavenCentral' - assert indexOf(uploadArtifactory) < indexOf(preTagCommit), 'preTagCommit has to be after uploadArtifactory' - } -} - -// Prevent plugin from asking for a version number interactively -ext.'gradle.release.useAutomaticVersion' = "true" - -release { - git.requireBranch = null -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index faa569a9..c97a8bdb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 061b536b..5344be27 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Apr 02 11:45:56 PDT 2013 +#Fri Jan 02 13:14:58 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 diff --git a/gson/build.gradle b/gson/build.gradle new file mode 100644 index 00000000..6e6252cb --- /dev/null +++ b/gson/build.gradle @@ -0,0 +1,13 @@ +apply plugin: 'java' + +sourceCompatibility = 1.6 + +test { + useTestNG() +} + +dependencies { + compile project(':feign-core') + compile 'com.google.code.gson:gson:2.2.4' + testCompile 'org.testng:testng:6.8.5' +} diff --git a/jackson/build.gradle b/jackson/build.gradle new file mode 100644 index 00000000..edd2e0d4 --- /dev/null +++ b/jackson/build.gradle @@ -0,0 +1,14 @@ +apply plugin: 'java' + +sourceCompatibility = 1.6 + +test { + useTestNG() +} + +dependencies { + compile project(':feign-core') + compile 'com.fasterxml.jackson.core:jackson-databind:2.2.2' + testCompile 'org.testng:testng:6.8.5' + testCompile 'com.google.guava:guava:14.0.1' +} diff --git a/jaxrs/build.gradle b/jaxrs/build.gradle new file mode 100644 index 00000000..a3f6b1ac --- /dev/null +++ b/jaxrs/build.gradle @@ -0,0 +1,15 @@ +apply plugin: 'java' + +sourceCompatibility = 1.6 + +test { + useTestNG() +} + +dependencies { + compile project(':feign-core') + compile 'javax.ws.rs:jsr311-api:1.1.1' + testCompile project(':feign-gson') + testCompile 'com.google.guava:guava:14.0.1' + testCompile 'org.testng:testng:6.8.5' +} diff --git a/ribbon/build.gradle b/ribbon/build.gradle new file mode 100644 index 00000000..a01cfe09 --- /dev/null +++ b/ribbon/build.gradle @@ -0,0 +1,14 @@ +apply plugin: 'java' + +sourceCompatibility = 1.6 + +test { + useTestNG() +} + +dependencies { + compile project(':feign-core') + compile 'com.netflix.ribbon:ribbon-loadbalancer:2.0-RC5' + testCompile 'org.testng:testng:6.8.5' + testCompile 'com.google.mockwebserver:mockwebserver:20130706' +} diff --git a/sax/build.gradle b/sax/build.gradle new file mode 100644 index 00000000..dbb9b9a6 --- /dev/null +++ b/sax/build.gradle @@ -0,0 +1,13 @@ +apply plugin: 'java' + +sourceCompatibility = 1.6 + +test { + useTestNG() +} + +dependencies { + compile project(':feign-core') + testCompile 'com.google.guava:guava:14.0.1' + testCompile 'org.testng:testng:6.8.5' +}