Correct artifacts, moved pom to more visible area

Justin Ryan · Justin Ryan · commit b5b2f5ef9e90 · 2012-04-09T10:52:02.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -2,18 +2,39 @@
 ext.releaseVersion = '1.1.3' // TEMPLATE: Set to latest release
 ext.githubProjectName = rootProject.name // TEMPLATE: change to match github project, if it doesn't match project name
 
+buildscript {
+    repositories { mavenCentral() }
+}
+
+allprojects {
+    repositories { mavenCentral() }
+}
+
+//apply from: file('gradle/release.gradle') // Not fully tested
 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/license.gradle') // Waiting for re-release
 
 subprojects {
-    group = 'com.netflix.osstemplate' // TEMPLATE: Set to organization of project
-
-    repositories {
-        mavenCentral()
+    // 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.osstemplate' // TEMPLATE: Set to organization of project
+
     dependencies {
         compile     'javax.ws.rs:jsr311-api:1.1.1'
         compile     'com.sun.jersey:jersey-core:1.11'
diff --git a/gradle/convention.gradle b/gradle/convention.gradle
@@ -26,7 +26,6 @@ subprojects
     }
 
     artifacts {
-        archives jar
         archives sourcesJar
         archives javadocJar
     }
diff --git a/gradle/license.gradle b/gradle/license.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    dependencies { classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.4' }
+    dependencies { classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.5' }
 }
 
-apply plugin: 'license'
+apply plugin: nl.javadude.gradle.plugins.license.LicensePlugin
diff --git a/gradle/maven.gradle b/gradle/maven.gradle
@@ -4,14 +4,14 @@ subprojects {
     apply plugin: 'signing'
 
     signing {
-        required { performingRelease && gradle.taskGraph.hasTask("uploadMavenCentral")}
+        required { performingRelease && gradle.taskGraph.hasTask("uploadArchives")}
         sign configurations.archives
     }
 
     /**
      * Publishing to Maven Central example provided from http://jedicoder.blogspot.com/2011/11/automated-gradle-project-deployment-to.html
      */
-    task uploadMavenCentral(type:Upload) {
+    task uploadArchives(type:Upload) {
         configuration = configurations.archives
         dependsOn signArchives
         doFirst {
@@ -35,23 +35,13 @@ subprojects {
                         artifactId 'oss-parent'
                         version '7'
                     }
-                    url "https://github.com/Netflix/${rootProject.ext.githubProjectName}"
                     licenses {
                         license {
                             name 'The Apache Software License, Version 2.0'
                             url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                             distribution 'repo'
                         }
                     }
-                    scm {
-                        connection "scm:git:git@github.com:Netflix/${rootProject.ext.githubProjectName}.git"
-                        url "scm:git:git@github.com:Netflix/${rootProject.ext.githubProjectName}.git"
-                        developerConnection "scm:git:git@github.com:Netflix/${rootProject.ext.githubProjectName}.git"
-                    }
-                    issueManagement {
-                        system 'github'
-                        url 'https://github.com/Netflix/${rootProject.ext.githubProjectName}/issues'
-                    }
                 }
             }
         }
diff --git a/gradle/release.gradle b/gradle/release.gradle
@@ -0,0 +1,6 @@
+buildscript {
+    dependencies { classpath group: 'no.entitas.gradle', name: 'gradle-release-plugin', version: '1.11' }
+}
+
+apply plugin: no.entitas.gradle.git.GitReleasePlugin // 'gitrelease'
+

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ subprojects`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`artifacts {`
`29`		`- archives jar`
`30`	`29`	`archives sourcesJar`
`31`	`30`	`archives javadocJar`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`buildscript {`
`2`		`- dependencies { classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.4' }`
	`2`	`+ dependencies { classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.5' }`
`3`	`3`	`}`
`4`	`4`
`5`		`-apply plugin: 'license'`
	`5`	`+apply plugin: nl.javadude.gradle.plugins.license.LicensePlugin`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ subprojects {`
`4`	`4`	`apply plugin: 'signing'`
`5`	`5`
`6`	`6`	`signing {`
`7`		`- required { performingRelease && gradle.taskGraph.hasTask("uploadMavenCentral")}`
	`7`	`+ required { performingRelease && gradle.taskGraph.hasTask("uploadArchives")}`
`8`	`8`	`sign configurations.archives`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Publishing to Maven Central example provided from http://jedicoder.blogspot.com/2011/11/automated-gradle-project-deployment-to.html`
`13`	`13`	`*/`
`14`		`- task uploadMavenCentral(type:Upload) {`
	`14`	`+ task uploadArchives(type:Upload) {`
`15`	`15`	`configuration = configurations.archives`
`16`	`16`	`dependsOn signArchives`
`17`	`17`	`doFirst {`
`@@ -35,23 +35,13 @@ subprojects {`
`35`	`35`	`artifactId 'oss-parent'`
`36`	`36`	`version '7'`
`37`	`37`	`}`
`38`		`- url "https://github.com/Netflix/${rootProject.ext.githubProjectName}"`
`39`	`38`	`licenses {`
`40`	`39`	`license {`
`41`	`40`	`name 'The Apache Software License, Version 2.0'`
`42`	`41`	`url 'http://www.apache.org/licenses/LICENSE-2.0.txt'`
`43`	`42`	`distribution 'repo'`
`44`	`43`	`}`
`45`	`44`	`}`
`46`		`- scm {`
`47`		`- connection "scm:git:git@github.com:Netflix/${rootProject.ext.githubProjectName}.git"`
`48`		`- url "scm:git:git@github.com:Netflix/${rootProject.ext.githubProjectName}.git"`
`49`		`- developerConnection "scm:git:git@github.com:Netflix/${rootProject.ext.githubProjectName}.git"`
`50`		`- }`
`51`		`- issueManagement {`
`52`		`- system 'github'`
`53`		`- url 'https://github.com/Netflix/${rootProject.ext.githubProjectName}/issues'`
`54`		`- }`
`55`	`45`	`}`
`56`	`46`	`}`
`57`	`47`	`}`