GEODE-6105: convert geode-old-versions to xyzTestRuntime dependency (a…

…pache#2917) Old versions are only used by tests, not any production runtime. Do not publish to Maven that we need it for all runtime. Mark the modules that need old-versions for testing appropriately. Authored-by: Robert Houghton <[email protected]>
kekerzzZ · Nov 29, 2018 · 4bc1e65 · 4bc1e65
1 parent 615e4ed
commit 4bc1e65
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 10 deletions.
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -147,6 +147,10 @@ dependencies {
   testCompile(project(':geode-junit')) {
     exclude module: 'geode-core'
   }
+  testRuntime(project(':geode-old-versions'))
+
+
+  acceptanceTestRuntime(project(':geode-old-versions'))
 
 
   integrationTestCompile(project(':geode-core'))
@@ -203,9 +207,10 @@ dependencies {
   }
   upgradeTestCompile(project(':geode-assembly:geode-assembly-test'))
 
+  upgradeTestRuntime(project(':geode-old-versions'))
+  upgradeTestRuntime(project(':extensions:session-testing-war'))
   upgradeTestRuntime(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3')
   upgradeTestRuntime('org.apache.httpcomponents:httpclient:' + project.'httpclient.version')
-  upgradeTestRuntime(project(':extensions:session-testing-war'))
   upgradeTestRuntime files({ downloadWebServers } )
 
   //Web servers used for session module testing

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -314,13 +314,17 @@ dependencies {
   distributedTestCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
   distributedTestCompile('com.jayway.jsonpath:json-path-assert:' + project.'json-path-assert.version')
 
+  distributedTestRuntime(project(':geode-old-versions'))
   distributedTestRuntime('org.apache.derby:derby:' + project.'derby.version')
 
 
   upgradeTestCompile(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
 
+  upgradeTestRuntime(project(':geode-old-versions'))
+
+
   performanceTestCompile(project(':geode-junit')) {
     exclude module: 'geode-core'
   }

diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
@@ -57,4 +57,6 @@ dependencies {
   upgradeTestCompile('junit:junit:' + project.'junit.version')
   upgradeTestCompile('org.awaitility:awaitility:' + project.'awaitility.version')
   upgradeTestCompile('org.mockito:mockito-core:' + project.'mockito-core.version')
+
+  upgradeTestRuntime(project(':geode-old-versions'))
 }
diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
@@ -50,6 +50,9 @@ dependencies {
   compile('junit:junit:' + project.'junit.version') {
     exclude module: 'hamcrest-core'
   }
+
+
+  distributedTestRuntime(project(':geode-old-versions'))
 }
 
 distributedTest {

diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 
   testCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
 
-  runtimeOnly(project(':geode-old-versions'))
+  testRuntime(project(':geode-old-versions'))
 }
 
 test {

diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml
@@ -137,11 +137,5 @@
       <version>1.60</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-old-versions</artifactId>
-      <version>1.9.0-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
@@ -84,6 +84,8 @@ dependencies {
     exclude module: 'geode-core'
   }
 
+  upgradeTestRuntime(project(':geode-old-versions'))
+
 
   performanceTestCompile(project(':geode-junit')) {
     exclude module: 'geode-core'

diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
@@ -30,5 +30,6 @@ dependencies {
   upgradeTestCompile(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
+  upgradeTestRuntime(project(':geode-old-versions'))
   distributedTestCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
 }
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -187,7 +187,6 @@ subprojects {
         }
       }
     }
-
   }
   check.dependsOn('checkPom')
 
@@ -200,9 +199,9 @@ subprojects {
       from actualPomFile
       into expectedPomDir
       rename '.*.xml', "expected-pom.xml"
-
     }
   }
+  checkPom.mustRunAfter(updateExpectedPom)
 } // subprojects
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ dependencies { @@
       testCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
-      runtimeOnly(project(':geode-old-versions'))
+      testRuntime(project(':geode-old-versions'))
     }
     test {
@@ Expand Down @@