GEODE-6237: Opt into publication rather than opting out. (apache#3038)

* Remove 'disableMavenPublishing' declaration and use. * Remove unused publication block that was otherwise disabled in :extensions:geode-modules-assembly. * Flatten if/else:'if/else:"if/else:"' logic in publish.gradle * Move askpass block to rootProject build.gradle * Use relative pathing rather than ${rootDir} in Gradle apply from statements Co-authored-by: Robert Houghton <[email protected]> Co-authored-by: Patrick Rhomberg <[email protected]>
marcoman · Jan 4, 2019 · 961c75f · 961c75f
1 parent 42c7659
commit 961c75f
Show file tree

Hide file tree

Showing 41 changed files with 232 additions and 267 deletions.
diff --git a/boms/build.gradle b/boms/build.gradle
@@ -16,5 +16,4 @@
  */
 
 jar.enabled = false
-disableMavenPublishing()
 
diff --git a/boms/geode-all-bom/build.gradle b/boms/geode-all-bom/build.gradle
@@ -19,7 +19,8 @@ apply plugin: "java"
 apply plugin: "maven-publish"
 
 jar.enabled = false
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/publish.gradle"
 
 
 publishing {

diff --git a/boms/geode-client-bom/build.gradle b/boms/geode-client-bom/build.gradle
@@ -16,6 +16,7 @@
  */
 
 apply plugin: "io.spring.dependency-management"
+apply from: "${project.projectDir}/../../gradle/publish.gradle"
 
 jar.enabled = false
 

diff --git a/build.gradle b/build.gradle
@@ -76,7 +76,6 @@ apply from: "${scriptDir}/ide.gradle"
 apply from: "${scriptDir}/dependency-resolution.gradle"
 apply from: "${scriptDir}/test.gradle"
 apply from: "${scriptDir}/test-by-category.gradle"
-apply from: "${scriptDir}/publish.gradle"
 apply from: "${scriptDir}/code-analysis.gradle"
 apply from: "${scriptDir}/sonar.gradle"
 apply from: "${scriptDir}/rat.gradle"
@@ -152,3 +151,40 @@ task generate() {
   // injecting themselves as a task dependency into this task.  E.g., via
   // `afterEvaluate.rootProject.generate.dependsOn(generateProto)`
 }
+
+// Prompt the user for a publication passsword to sign archives or upload artifacts, if requested
+if (project.hasProperty('askpass')) {
+  gradle.taskGraph.whenReady { taskGraph ->
+    if(taskGraph.allTasks.any {it instanceof Sign}) {
+      if(!project.hasProperty('signing.keyId') || !project.hasProperty('signing.secretKeyRingFile')) {
+        println "You must configure your signing.keyId and signing.secretKeyRingFile"
+        println "in ~/.gradle/gradle.properties in order to sign jars\n"
+        println "See https://cwiki.apache.org/confluence/display/GEODE/Release+Steps"
+        throw new GradleException("Signing key/keyring is missing")
+      }
+
+      if(!project.hasProperty('signing.password')) {
+        def password = PasswordDialog.askPassword("Please enter your password to unlock your gpg keyring for signing artifacts")
+
+        subprojects { ext."signing.password" = password }
+      }
+    }
+
+    if(taskGraph.allTasks.any {it instanceof PublishToMavenRepository}) {
+      if(!project.hasProperty('mavenUsername')) {
+        println "You must configure your mavenUsername in ~/.gradle/gradle.properties in order to publish\n"
+        println "See https://cwiki.apache.org/confluence/display/GEODE/Release+Steps"
+        throw new GradleException("mavenUsername is missing")
+      }
+      if(!project.hasProperty('mavenPassword')) {
+        def getPassword = PasswordDialog.askPassword("Please enter your apache password to publish to Apache Maven")
+
+        taskGraph.allTasks.each {
+          if(it instanceof PublishToMavenRepository) {
+            (it as PublishToMavenRepository).repository.credentials.password = getPassword
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/extensions/build.gradle b/extensions/build.gradle
@@ -15,5 +15,4 @@
  * limitations under the License.
  */
 
-disableMavenPublishing()
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle
@@ -22,7 +22,7 @@ configurations {
   slf4jDeps
 }
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -32,7 +32,6 @@ dependencies {
 
 jar.enabled = true
 
-disableMavenPublishing()
 
 def getJarArtifact(module) {
   project(module).configurations.archives.artifacts.findAll {
@@ -242,15 +241,3 @@ task distTcServer30(type: Zip, dependsOn: [':extensions:geode-modules:assemble',
 task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 'distTomcat', 'distAppServer'])
 
 build.dependsOn dist
-
-publishing {
-  publications {
-    maven(MavenPublication) {
-      artifact distTcServer
-      artifact distTcServer30
-      artifact distAppServer
-      artifact distTomcat
-    }
-  }
-}
-
diff --git a/extensions/geode-modules-session-internal/build.gradle b/extensions/geode-modules-session-internal/build.gradle
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -32,4 +32,3 @@ jar {
   baseName = 'geode-modules-session-internal'
 }
 
-disableMavenPublishing()
diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
@@ -17,7 +17,7 @@
 
 evaluationDependsOn(":geode-core")
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -64,4 +64,3 @@ jar {
   baseName = 'geode-modules-session'
 }
 
-disableMavenPublishing()
diff --git a/extensions/geode-modules-test/build.gradle b/extensions/geode-modules-test/build.gradle
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -43,4 +43,3 @@ dependencies {
   }
 }
 
-disableMavenPublishing()
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
@@ -17,7 +17,7 @@
 
 evaluationDependsOn(":geode-core")
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -58,4 +58,3 @@ eclipse.classpath.file {
   }
 }
 
-disableMavenPublishing()
diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
@@ -17,7 +17,7 @@
 
 evaluationDependsOn(":geode-core")
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -59,4 +59,3 @@ eclipse.classpath.file {
   }
 }
 
-disableMavenPublishing()
diff --git a/extensions/geode-modules-tomcat9/build.gradle b/extensions/geode-modules-tomcat9/build.gradle
@@ -17,7 +17,7 @@
 
 evaluationDependsOn(":geode-core")
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -47,4 +47,3 @@ eclipse.classpath.file {
   }
 }
 
-disableMavenPublishing()
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
@@ -17,7 +17,7 @@
 
 evaluationDependsOn(":geode-core")
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -61,4 +61,3 @@ dependencies {
   }
 }
 
-disableMavenPublishing()
diff --git a/extensions/session-testing-war/build.gradle b/extensions/session-testing-war/build.gradle
@@ -16,7 +16,7 @@
  */
 apply plugin: 'war'
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -27,4 +27,3 @@ war {
     version = ''
 }
 
-disableMavenPublishing()
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -21,7 +21,8 @@ import java.nio.file.Paths
 evaluationDependsOn(":geode-core")
 
 apply plugin: 'distribution'
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 // disable artifact generation for this project
 jar.enabled = false
@@ -394,7 +395,6 @@ distributions {
           exclude relBuild
         }
       }
-
     }
   }
 

diff --git a/geode-assembly/geode-assembly-test/build.gradle b/geode-assembly/geode-assembly-test/build.gradle
@@ -16,7 +16,7 @@
  */
 
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -32,4 +32,3 @@ dependencies {
   compileOnly('org.codehaus.cargo:cargo-core-uberjar')
 }
 
-disableMavenPublishing()
diff --git a/geode-common/build.gradle b/geode-common/build.gradle
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {
   testCompile('junit:junit')
   testCompile('org.assertj:assertj-core')
-}
+}
diff --git a/geode-concurrency-test/build.gradle b/geode-concurrency-test/build.gradle
@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {

diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
@@ -24,7 +24,8 @@ repositories {
   }
 }
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -17,7 +17,8 @@
 
 apply plugin: 'antlr'
 apply plugin: 'me.champeau.gradle.jmh'
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 sourceSets {
   jca {

diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {

diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {

diff --git a/geode-experimental-driver/build.gradle b/geode-experimental-driver/build.gradle
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {

diff --git a/geode-json/build.gradle b/geode-json/build.gradle
@@ -15,4 +15,5 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {

diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {

diff --git a/geode-lucene/geode-lucene-test/build.gradle b/geode-lucene/geode-lucene-test/build.gradle
@@ -16,7 +16,7 @@
  */
 
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../../gradle/geode-dependency-management.gradle"
 
 
 dependencies {
@@ -29,4 +29,3 @@ dependencies {
   compile('org.mockito:mockito-core')
 }
 
-disableMavenPublishing()
diff --git a/geode-old-client-support/build.gradle b/geode-old-client-support/build.gradle
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-apply from: "${rootDir}/${scriptDir}/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/geode-dependency-management.gradle"
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 dependencies {

diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-disableMavenPublishing()
 def generatedResources = "$buildDir/generated-resources/main"
 project.ext.installs = new Properties()
 

diff --git a/geode-protobuf-messages/build.gradle b/geode-protobuf-messages/build.gradle
@@ -17,6 +17,7 @@
 
 apply plugin: 'com.google.protobuf'
 apply plugin: 'idea'
+apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 
 buildscript {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,5 +16,4 @@
		*/

		jar.enabled = false
		disableMavenPublishing()
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ @@
      */
     apply plugin: "io.spring.dependency-management"
+    apply from: "${project.projectDir}/../../gradle/publish.gradle"
     jar.enabled = false
@@ Expand Down @@