Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge latest changes from gradle-template

  • Loading branch information...
commit bf85e39cf8239a1fa3f0437e5f8da4f06e133b72 2 parents 2397ebc + 53ba702
@dmuino dmuino authored
View
6 .gitignore
@@ -34,18 +34,20 @@ Thumbs.db
# Editor Files #
################
*~
+*.swp
# Gradle Files #
################
.gradle
+.m2
# Build output directies
/target
*/target
/build
*/build
-#
-# # IntelliJ specific files/directories
+
+# IntelliJ specific files/directories
out
.idea
*.ipr
View
34 build.gradle
@@ -33,40 +33,6 @@ apply from: file('gradle/license.gradle')
apply from: file('gradle/release.gradle')
subprojects {
- // Closure to configure all the POM with extra info, common to all projects
- pom {
- project {
- 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"
- }
- }
- }
-
- group = 'com.netflix.servo' // TEMPLATE: Set to organization of project
-
- tasks.withType(Compile) {
- options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
- }
-
- test {
- useTestNG()
- options.excludeGroups = ['aws']
- testLogging.showStandardStreams = true
- }
-
- task(testWithCloud, type: Test) {
- useTestNG()
- group = 'verification'
- options.excludeGroups = [] as Set
- }
-
dependencies {
compile 'org.slf4j:slf4j-api:1.6.3'
compile 'com.google.guava:guava:11.0.1'
View
9 gradle/maven.gradle
@@ -29,6 +29,15 @@ subprojects {
// 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'
View
25 gradle/release.gradle
@@ -17,23 +17,22 @@ unSnapshotVersion.dependsOn checkUpdateNeeded
checkUpdateNeeded.dependsOn checkCommitNeeded
checkCommitNeeded.dependsOn initScmPlugin
-// Call out to compile against internal repository
-task uploadArtifactory(type: GradleBuild) {
- startParameter = project.gradle.startParameter.newInstance()
- startParameter.addInitScript( file('gradle/netflix-oss.gradle') )
- startParameter.getExcludedTaskNames().add('check')
- tasks = [ 'build', 'artifactoryPublish' ]
+[
+ uploadIvyLocal: 'uploadLocal',
+ uploadArtifactory: 'artifactoryPublish', // Call out to compile against internal repository
+ buildWithArtifactory: 'build' // Build against internal repository
+].each { key, value ->
+ // Call out to compile against internal repository
+ task "${key}"(type: GradleBuild) {
+ startParameter = project.gradle.startParameter.newInstance()
+ startParameter.addInitScript( file('gradle/netflix-oss.gradle') )
+ startParameter.getExcludedTaskNames().add('check')
+ tasks = [ 'build', value ]
+ }
}
task releaseArtifactory(dependsOn: [checkSnapshotDependencies, uploadArtifactory])
-task buildWithArtifactory(type: GradleBuild) {
- startParameter = project.gradle.startParameter.newInstance()
- startParameter.addInitScript( file('gradle/netflix-oss.gradle') )
- startParameter.getExcludedTaskNames().add('check')
- tasks = [ 'build' ]
-}
-
// Ensure upload happens before taggging but after all pre-checks
//releaseArtifactory.dependsOn checkSnapshotDependencies
createReleaseTag.dependsOn releaseArtifactory
View
2  settings.gradle
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-include 'servo-core','servo-aws','servo-graphite'
+include 'servo-core','servo-aws','servo-graphite'
Please sign in to comment.
Something went wrong with that request. Please try again.