GEODE-7241 Refactor publish.gradle into -java and -war types (apache#…

…4091) Allows publication of Jar or War artifacts via an `apply` statement. We then apply publish-war.gradle to our projects that build war artifacts (and that we want to publish) and publish-java.gradle to the jar libraries that we want to publish. * Refactor publish.gradle into -java and -war types * Use facets for test structures in geode-web-management Replaces custom configuration and source-sets with the facets plug in, like we do elsewhere int he project * geode-pulse is a WAR not a JAR. Fix its publication and expected pom. * enable jar in build for test linking
ringles · Oct 4, 2019 · 7597643 · 7597643
1 parent 0e3f884
commit 7597643
Show file tree

Hide file tree

Showing 35 changed files with 106 additions and 636 deletions.
diff --git a/boms/geode-client-bom/build.gradle b/boms/geode-client-bom/build.gradle
@@ -18,7 +18,7 @@
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
 apply plugin: "io.spring.dependency-management"
-apply from: "${project.projectDir}/../../gradle/publish.gradle"
+apply from: "${project.projectDir}/../../gradle/publish-common.gradle"
 
 jar.enabled = false
 

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -67,7 +67,7 @@ evaluationDependsOnChildren()
 }
 
 apply plugin: 'distribution'
-apply from: "${rootDir}/${scriptDir}/publish.gradle"
+apply from: "${rootDir}/${scriptDir}/publish-common.gradle"
 
 
 // This subproject's 'publication' is not a jar and should not be constrained to match versions

diff --git a/geode-common/build.gradle b/geode-common/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))

diff --git a/geode-concurrency-test/build.gradle b/geode-concurrency-test/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))

diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
@@ -26,7 +26,7 @@ repositories {
   }
 }
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 configurations {
   //Configuration used to download mysql jar

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -22,7 +22,7 @@ plugins {
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
 apply plugin: 'antlr'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 apply from: "${project.projectDir}/../gradle/pmd.gradle"
 
 sourceSets {

diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 
 dependencies {

diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 
 dependencies {

diff --git a/geode-experimental-driver/build.gradle b/geode-experimental-driver/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 
 dependencies {

diff --git a/geode-http-service/build.gradle b/geode-http-service/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))

diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 
 dependencies {

diff --git a/geode-log4j/build.gradle b/geode-log4j/build.gradle
@@ -19,7 +19,7 @@ plugins {
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 dependencies {
   api(platform(project(':boms:geode-all-bom')))

diff --git a/geode-logging/build.gradle b/geode-logging/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 dependencies {
     compile(platform(project(':boms:geode-all-bom')))

diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 
 dependencies {

diff --git a/geode-management/build.gradle b/geode-management/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))

diff --git a/geode-memcached/build.gradle b/geode-memcached/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 dependencies {
   implementation(platform(project(':boms:geode-all-bom')))

diff --git a/geode-old-client-support/build.gradle b/geode-old-client-support/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 
 dependencies {

diff --git a/geode-protobuf-messages/build.gradle b/geode-protobuf-messages/build.gradle
@@ -30,7 +30,7 @@ buildscript {
 
 apply plugin: 'com.google.protobuf'
 apply plugin: 'idea'
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 dependencies {
   api(platform(project(':boms:geode-all-bom')))

diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
@@ -17,7 +17,7 @@
 
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-java.gradle"
 
 
 dependencies {

diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
@@ -20,8 +20,9 @@ evaluationDependsOn(':geode-core')
 apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 apply plugin: 'war'
 
-apply from: "${project.projectDir}/../gradle/publish.gradle"
+apply from: "${project.projectDir}/../gradle/publish-war.gradle"
 
+jar.enabled = true
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
@@ -31,7 +32,7 @@ dependencies {
   compile('org.springframework.security:spring-security-core')
   compile('javax.servlet:javax.servlet-api')
   compile('mx4j:mx4j') {
-    ext.optional = true 
+    ext.optional = true
   }
   compile('mx4j:mx4j-remote') {
     ext.optional = true
@@ -58,7 +59,7 @@ dependencies {
   compile('commons-digester:commons-digester')
   compile('org.apache.commons:commons-lang3')
   compile('org.springframework.ldap:spring-ldap-core')
-  
+
   compile('org.springframework.security:spring-security-config') {
     exclude module: 'aopalliance'
     exclude module: 'spring-expression'
@@ -169,6 +170,7 @@ artifacts {
 }
 
 war {
+  enabled = true
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
   classpath configurations.runtimeClasspath
 }