GEODE-9284: only upgradeTest should need geode-old-versions (apache#6492

) make test-target not automatically download old versions move tests that need old-versions into upgradeTest Authored-by: Robert Houghton <[email protected]>
jchen21 · May 21, 2021 · 3515100 · 3515100
1 parent e0d028c
commit 3515100
Show file tree

Hide file tree

Showing 32 changed files with 45 additions and 39 deletions.
diff --git a/extensions/build.gradle b/extensions/build.gradle
@@ -14,5 +14,3 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -185,8 +185,7 @@ dependencies {
   testImplementation(project(':geode-log4j')) {
     exclude module: 'geode-core'
   }
-
-  acceptanceTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+  testImplementation('org.assertj:assertj-core')
 
   integrationTestImplementation(project(':geode-core'))
   integrationTestImplementation(project(':geode-membership'))
@@ -213,7 +212,6 @@ dependencies {
   integrationTestImplementation('javax.annotation:javax.annotation-api')
   integrationTestImplementation('javax.servlet:javax.servlet-api')
 
-  integrationTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 
   integrationTestRuntimeOnly('io.swagger:swagger-annotations')
   // these two modules are for testing only
@@ -290,14 +288,13 @@ dependencies {
   }
   upgradeTestImplementation(project(':geode-assembly:geode-assembly-test'))
 
+  upgradeTestImplementation('org.apache.httpcomponents:httpclient')
+
   upgradeTestCompileOnly(platform(project(':boms:geode-all-bom')))
   upgradeTestCompileOnly('io.swagger:swagger-annotations')
-  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
-  distributedTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
-  testImplementation('org.assertj:assertj-core')
+  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
   upgradeTestRuntimeOnly(project(':extensions:session-testing-war'))
   upgradeTestRuntimeOnly('org.codehaus.cargo:cargo-core-uberjar')
-  upgradeTestRuntimeOnly('org.apache.httpcomponents:httpclient')
   upgradeTestRuntimeOnly files({ downloadWebServers } )
 
   //Web servers used for session module testing
@@ -620,8 +617,14 @@ distributions {
 // Make build final task to generate all test and product resources
 build.dependsOn(installDist)
 
+def spotlessProjects = rootProject.subprojects.findAll { subproj ->
+  subproj.plugins.hasPlugin('com.diffplug.spotless')
+}
 tasks.named('srcDistTar').configure {
   classifier 'src'
+  spotlessProjects.each {spotlessProj ->
+    dependsOn {spotlessProj.tasks.named("spotlessApply")}
+  }
 }
 
 [tasks.named('distZip'),
@@ -640,9 +643,7 @@ tasks.withType(Test) {
 acceptanceTest.dependsOn(rootProject.getTasksByName("publishToMavenLocal", true))
 installDist.dependsOn ':extensions:geode-modules-assembly:dist'
 distributedTest.dependsOn ':extensions:session-testing-war:war'
-distributedTest.dependsOn ':geode-old-versions:build'
 upgradeTest.dependsOn ':extensions:session-testing-war:war'
-upgradeTest.dependsOn ':geode-old-versions:build'
 
 /**Print the names of all jar files in a fileTree */
 def printJars(tree) {

diff --git a/...ommands/ConnectCommandAcceptanceTest.java → ...i/commands/ConnectCommandUpgradeTest.java b/...ommands/ConnectCommandAcceptanceTest.java → ...i/commands/ConnectCommandUpgradeTest.java
@@ -31,7 +31,7 @@
 import org.apache.geode.test.junit.rules.gfsh.GfshScript;
 
 @Category(GfshTest.class)
-public class ConnectCommandAcceptanceTest {
+public class ConnectCommandUpgradeTest {
 
   @Rule
   public GfshRule gfsh130 = new GfshRule("1.3.0");

diff --git a/...controllers/RestAPICompatibilityTest.java → ...controllers/RestAPICompatibilityTest.java b/...controllers/RestAPICompatibilityTest.java → ...controllers/RestAPICompatibilityTest.java
diff --git a/.../junit/rules/GfshRuleIntegrationTest.java → ...test/junit/rules/GfshRuleUpgradeTest.java b/.../junit/rules/GfshRuleIntegrationTest.java → ...test/junit/rules/GfshRuleUpgradeTest.java
@@ -30,7 +30,7 @@
 import org.apache.geode.test.version.VersionManager;
 
 @Category(GfshTest.class)
-public class GfshRuleIntegrationTest {
+public class GfshRuleUpgradeTest {
 
   private static final String GEODE_HOME = System.getenv("GEODE_HOME");
   private static final String GFSH_OLD_VERSION = "1.3.0";

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -359,7 +359,6 @@ dependencies {
     integrationTestImplementation('pl.pragmatists:JUnitParams')
     integrationTestImplementation('com.tngtech.archunit:archunit-junit4')
 
-    integrationTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 
     integrationTestRuntimeOnly('org.apache.derby:derby')
     integrationTestRuntimeOnly('xerces:xercesImpl')
@@ -379,15 +378,14 @@ dependencies {
     distributedTestImplementation('com.jayway.jsonpath:json-path-assert')
     distributedTestImplementation('net.openhft:compiler')
 
-    distributedTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
     distributedTestRuntimeOnly('org.apache.derby:derby')
 
 
     upgradeTestImplementation(project(':geode-dunit')) {
         exclude module: 'geode-core'
     }
 
-    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
     upgradeTestRuntimeOnly(project(':geode-log4j'))
 
 

diff --git a/...geode/ClusterCommunicationsDUnitTest.java → ...geode/ClusterCommunicationsDUnitTest.java b/...geode/ClusterCommunicationsDUnitTest.java → ...geode/ClusterCommunicationsDUnitTest.java
diff --git a/...thMixedVersionServersDistributedTest.java → ...thMixedVersionServersDistributedTest.java b/...thMixedVersionServersDistributedTest.java → ...thMixedVersionServersDistributedTest.java
diff --git a/...e/geode/security/ClientAuthDUnitTest.java → ...e/geode/security/ClientAuthDUnitTest.java b/...e/geode/security/ClientAuthDUnitTest.java → ...e/geode/security/ClientAuthDUnitTest.java
diff --git a/...curity/ClientAuthenticationDUnitTest.java → ...curity/ClientAuthenticationDUnitTest.java b/...curity/ClientAuthenticationDUnitTest.java → ...curity/ClientAuthenticationDUnitTest.java
diff --git a/...y/ClientAuthenticationPart2DUnitTest.java → ...y/ClientAuthenticationPart2DUnitTest.java b/...y/ClientAuthenticationPart2DUnitTest.java → ...y/ClientAuthenticationPart2DUnitTest.java
diff --git a/...ecurity/ClientAuthenticationTestCase.java → ...ecurity/ClientAuthenticationTestCase.java b/...ecurity/ClientAuthenticationTestCase.java → ...ecurity/ClientAuthenticationTestCase.java
diff --git a/...curity/ClientAuthenticationTestUtils.java → ...curity/ClientAuthenticationTestUtils.java b/...curity/ClientAuthenticationTestUtils.java → ...curity/ClientAuthenticationTestUtils.java
diff --git a/...rizationLegacyConfigurationDUnitTest.java → ...rizationLegacyConfigurationDUnitTest.java b/...rizationLegacyConfigurationDUnitTest.java → ...rizationLegacyConfigurationDUnitTest.java
diff --git a/...rizationUsingLegacySecurityDUnitTest.java → ...rizationUsingLegacySecurityDUnitTest.java b/...rizationUsingLegacySecurityDUnitTest.java → ...rizationUsingLegacySecurityDUnitTest.java
diff --git a/...gLegacySecurityWithFailoverDUnitTest.java → ...gLegacySecurityWithFailoverDUnitTest.java b/...gLegacySecurityWithFailoverDUnitTest.java → ...gLegacySecurityWithFailoverDUnitTest.java
diff --git a/...ty/DeltaClientAuthorizationDUnitTest.java → ...ty/DeltaClientAuthorizationDUnitTest.java b/...ty/DeltaClientAuthorizationDUnitTest.java → ...ty/DeltaClientAuthorizationDUnitTest.java
diff --git a/...ersion/VersionManagerIntegrationTest.java → ...st/version/VersionManagerUpgradeTest.java b/...ersion/VersionManagerIntegrationTest.java → ...st/version/VersionManagerUpgradeTest.java
@@ -23,7 +23,7 @@
 import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
 
 @Category(BackwardCompatibilityTest.class)
-public class VersionManagerIntegrationTest {
+public class VersionManagerUpgradeTest {
 
   @Test
   public void exceptionIsNotThrownInInitialization() {

diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
@@ -56,7 +56,7 @@ dependencies {
   upgradeTestImplementation('org.awaitility:awaitility')
   upgradeTestImplementation('org.mockito:mockito-core')
 
-  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 }
 
 ext.moduleName = group + '.cq'

diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     exclude module: 'hamcrest'
   }
 
-  distributedTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 }
 
 distributedTest {

diff --git a/...RuleCanSpecifyOlderVersionsDUnitTest.java → ...RuleCanSpecifyOlderVersionsDUnitTest.java b/...RuleCanSpecifyOlderVersionsDUnitTest.java → ...RuleCanSpecifyOlderVersionsDUnitTest.java
diff --git a/.../ChangeProductVersionDistributedTest.java → .../ChangeProductVersionDistributedTest.java b/.../ChangeProductVersionDistributedTest.java → .../ChangeProductVersionDistributedTest.java
diff --git a/geode-gfsh/build.gradle b/geode-gfsh/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     upgradeTestImplementation('org.assertj:assertj-core')
     upgradeTestImplementation('junit:junit')
     upgradeTestImplementation('xml-apis:xml-apis:2.0.2')
-    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 
     implementation('net.sf.jopt-simple:jopt-simple')
 

diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
@@ -59,7 +59,6 @@ dependencies {
 
   testImplementation('pl.pragmatists:JUnitParams')
 
-  testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 }
 
 test {

diff --git a/geode-logging/build.gradle b/geode-logging/build.gradle
@@ -37,7 +37,6 @@ dependencies {
     testImplementation('junit:junit')
     testImplementation('org.assertj:assertj-core')
 
-    testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 
     integrationTestImplementation(project(':geode-junit')) {
         exclude module: 'geode-logging'
@@ -53,8 +52,7 @@ dependencies {
         exclude module: 'geode-logging'
     }
     distributedTestImplementation('pl.pragmatists:JUnitParams')
-    distributedTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
-    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 
     testImplementation('com.tngtech.archunit:archunit-junit4')
 

diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
@@ -68,7 +68,7 @@ dependencies {
 
   upgradeTestImplementation(project(':geode-dunit'))
   upgradeTestImplementation('commons-io:commons-io')
-  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 
 
   performanceTestImplementation(project(':geode-junit'))

diff --git a/geode-membership/build.gradle b/geode-membership/build.gradle
@@ -48,7 +48,6 @@ dependencies {
     testImplementation('org.assertj:assertj-core')
     testImplementation('com.tngtech.archunit:archunit-junit4')
 
-    testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 
 
     integrationTestImplementation(project(':geode-junit'))
@@ -62,10 +61,9 @@ dependencies {
     distributedTestImplementation(project(':geode-dunit'))
     distributedTestImplementation('pl.pragmatists:JUnitParams')
 
-    distributedTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 
 
-    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 }
 
 distributedTest {

diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle
@@ -115,12 +115,27 @@ tasks.named('clean') {
 project.createGeodeClasspathsFile.mustRunAfter(clean)
 project.createGeodeClasspathsFile.inputs.files(getTasksByName('downloadAndUnzipFile', true))
 project.createGeodeClasspathsFile.inputs.files(getTasksByName('enumerateArchiveContents', true))
-project.jarTest.dependsOn(createGeodeClasspathsFile)
 tasks.named('build') {
   dependsOn(tasks.named('createGeodeClasspathsFile'))
 }
+
+configurations {
+  oldVersions
+  classpathsOutput {
+    description 'previous geode releases, and their classpath(s)'
+  }
+}
+
 sourceSets {
-  test {
+  oldVersions {
     output.dir(generatedResources, builtBy: createGeodeClasspathsFile)
   }
 }
+tasks.register('geodeOldVersionClasspathsJar', Jar) {
+  from sourceSets.oldVersions.output
+  classifier 'oldVersions'
+}
+
+artifacts {
+  classpathsOutput tasks.named('geodeOldVersionClasspathsJar')
+}
diff --git a/geode-serialization/build.gradle b/geode-serialization/build.gradle
@@ -43,7 +43,6 @@ dependencies {
   testImplementation('junit:junit')
   testImplementation('org.assertj:assertj-core')
 
-  testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 
   integrationTestImplementation(project(':geode-junit')) {
     exclude module: 'geode-serialization'
@@ -59,8 +58,7 @@ dependencies {
     exclude module: 'geode-serialization'
   }
   distributedTestImplementation('pl.pragmatists:JUnitParams')
-  distributedTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
-  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 }
 
 distributedTest {

diff --git a/geode-tcp-server/build.gradle b/geode-tcp-server/build.gradle
@@ -39,8 +39,9 @@ dependencies {
     integrationTestImplementation('org.mockito:mockito-core')
     integrationTestImplementation(project(':geode-junit'))
 
-    distributedTestImplementation(project(':geode-gfsh'))
-    distributedTestImplementation(project(':geode-dunit'))
-    distributedTestImplementation(project(':geode-membership'))
-    distributedTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
-}
+    upgradeTestImplementation(project(':geode-gfsh'))
+    upgradeTestImplementation(project(':geode-dunit'))
+    upgradeTestImplementation(project(':geode-membership'))
+
+    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
+}
diff --git a/...ver/TcpServerProductVersionDUnitTest.java → ...ver/TcpServerProductVersionDUnitTest.java b/...ver/TcpServerProductVersionDUnitTest.java → ...ver/TcpServerProductVersionDUnitTest.java
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
@@ -69,5 +69,5 @@ dependencies {
   upgradeTestImplementation('junit:junit')
   upgradeTestImplementation('xml-apis:xml-apis:2.0.2')
 
-  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
+  upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,6 @@ dependencies { @@
       testImplementation('pl.pragmatists:JUnitParams')
-      testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
     }
     test {
@@ Expand Down @@