GEODE-7185: Partial revert of a7e0b2e. (apache#4062)

Fixes transitive API dependency on geode-common. Some classes in the geode-core API extend classes in the geode-common module, thus making geode-common API as well.
IronOnet · Sep 16, 2019 · 09d4d70 · 09d4d70
1 parent 5e4b2ad
commit 09d4d70
Show file tree

Hide file tree

Showing 29 changed files with 6 additions and 73 deletions.
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
@@ -25,7 +25,6 @@ evaluationDependsOn(":geode-core")
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  implementation(project(':geode-common'))
   implementation(project(':geode-serialization'))
   compile(project(':geode-core'))
   integrationTestCompile(project(':extensions:geode-modules-test')) {

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -207,7 +207,6 @@ dependencies {
   integrationTestRuntime('io.swagger:swagger-annotations')
 
 
-  distributedTestImplementation(project(':geode-common'))
   distributedTestImplementation(project(':geode-serialization'))
   distributedTestCompile(project(':geode-core'))
   distributedTestCompile(project(':geode-dunit')){

diff --git a/geode-assembly/geode-assembly-test/build.gradle b/geode-assembly/geode-assembly-test/build.gradle
@@ -23,7 +23,6 @@ apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
   compileOnly(project(':extensions:geode-modules-test'))
-  compileOnly(project(':geode-common'))
   compileOnly(project(':geode-core'))
   compileOnly(project(':geode-pulse'))
   compileOnly('com.fasterxml.jackson.core:jackson-databind')

diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
@@ -48,7 +48,6 @@ task downloadJdbcJars(type:Copy) {
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  compile(project(':geode-common'))
   implementation(project(':geode-serialization'))
   compile(project(':geode-core'))
   testCompile(project(':geode-junit')) {

diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml
@@ -46,11 +46,6 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -330,7 +330,7 @@ dependencies {
   implementation('com.healthmarketscience.rmiio:rmiio')
 
   //Geode-common has annotations and other pieces used geode-core
-  implementation(project(':geode-common'))
+  api(project(':geode-common'))
   implementation(project(':geode-unsafe'))
   implementation(project(':geode-serialization'))
 

diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
@@ -101,6 +101,11 @@
       <artifactId>shiro-core</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geode</groupId>
+      <artifactId>geode-common</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-management</artifactId>
@@ -255,11 +260,6 @@
       <artifactId>rmiio</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-unsafe</artifactId>

diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
@@ -23,7 +23,6 @@ apply from: "${project.projectDir}/../gradle/publish.gradle"
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
   compile(project(':geode-core'))
-  implementation(project(':geode-common'))
   implementation(project(':geode-serialization'))
   testCompile(project(':geode-junit')) {
     exclude module: 'geode-core'

diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml
@@ -56,11 +56,6 @@
       <artifactId>log4j-api</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-serialization</artifactId>

diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
@@ -22,7 +22,6 @@ apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  implementation(project(':geode-common'))
   implementation(project(':geode-serialization'))
   compile(project(':geode-core'))
 

diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml
@@ -170,11 +170,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-serialization</artifactId>

diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
@@ -25,7 +25,6 @@ dependencies {
 
   compileOnly(project(':geode-core'))
   compileOnly(project(':geode-serialization'))
-  compileOnly(project(':geode-common'))
   compileOnly(project(':geode-unsafe'))
 
   compile('com.fasterxml.jackson.core:jackson-annotations')

diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
@@ -53,7 +53,6 @@ dependencies {
   }
   implementation(project(':geode-serialization'))
   compile(project(':geode-core'))
-  compile(project(':geode-common'))
   compile('org.apache.lucene:lucene-analyzers-common')
   compile('org.apache.lucene:lucene-queryparser') {
     exclude module: 'lucene-sandbox'

diff --git a/geode-lucene/src/test/resources/expected-pom.xml b/geode-lucene/src/test/resources/expected-pom.xml
@@ -103,11 +103,6 @@
       <artifactId>geode-core</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers-common</artifactId>

diff --git a/geode-memcached/build.gradle b/geode-memcached/build.gradle
@@ -21,7 +21,6 @@ apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {
   implementation(platform(project(':boms:geode-all-bom')))
-  implementation(project(':geode-common'))
   implementation(project(':geode-core'))
   implementation('org.apache.logging.log4j:log4j-api')
   implementation('com.github.stephenc.findbugs:findbugs-annotations')

diff --git a/geode-memcached/src/test/resources/expected-pom.xml b/geode-memcached/src/test/resources/expected-pom.xml
@@ -46,11 +46,6 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>

diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
@@ -22,7 +22,6 @@ apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  compile(project(':geode-common'))
   implementation(project(':geode-serialization'))
   compile(project(':geode-core'))
   compile(project(':geode-protobuf-messages'))

diff --git a/geode-protobuf/geode-protobuf-test/build.gradle b/geode-protobuf/geode-protobuf-test/build.gradle
@@ -22,7 +22,6 @@ apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  compile(project(':geode-common'))
   compile(project(':geode-core'))
   compileOnly(project(':geode-protobuf'))
 

diff --git a/geode-protobuf/src/test/resources/expected-pom.xml b/geode-protobuf/src/test/resources/expected-pom.xml
@@ -46,11 +46,6 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>

diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
@@ -22,7 +22,6 @@ apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  compile(project(':geode-common'))
   compile(project(':geode-core'))
   implementation(project(':geode-serialization'))
   integrationTestCompile(project(':geode-junit')) {

diff --git a/geode-rebalancer/src/test/resources/expected-pom.xml b/geode-rebalancer/src/test/resources/expected-pom.xml
@@ -46,11 +46,6 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>

diff --git a/geode-redis/build.gradle b/geode-redis/build.gradle
@@ -21,7 +21,6 @@ apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  implementation(project(':geode-common'))
   implementation(project(':geode-serialization'))
   compile(project(':geode-core'))
   compile('com.github.davidmoten:geo')

diff --git a/geode-redis/src/test/resources/expected-pom.xml b/geode-redis/src/test/resources/expected-pom.xml
@@ -66,11 +66,6 @@
       <artifactId>log4j-api</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-serialization</artifactId>

diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
@@ -26,7 +26,6 @@ dependencies {
     // See GEODE-6128 -- ignore xml-apis in linter to avoid changes with every run.
     upgradeTestCompile('xml-apis:xml-apis:1.4.01')
   }
-  implementation(project(':geode-common'))
   implementation(project(':geode-serialization'))
   compile(project(':geode-core'))
 

diff --git a/geode-wan/src/test/resources/expected-pom.xml b/geode-wan/src/test/resources/expected-pom.xml
@@ -51,11 +51,6 @@
       <artifactId>geode-core</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-serialization</artifactId>

diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
@@ -27,7 +27,6 @@ dependencies {
   compileOnly(platform(project(':boms:geode-all-bom')))
 
   compileOnly(project(':geode-core'))
-  compileOnly(project(':geode-common'))
   compileOnly(project(':geode-serialization'))
 
   compileOnly('javax.servlet:javax.servlet-api')

diff --git a/geode-web-management/build.gradle b/geode-web-management/build.gradle
@@ -48,7 +48,6 @@ dependencies {
   compile(platform(project(':boms:geode-all-bom'))) {
     exclude module: "jackson-annotations"
   }
-  compileOnly(project(':geode-common'))
   compileOnly(project(':geode-serialization'))
   compileOnly(project(':geode-core'))
 

diff --git a/geode-web/build.gradle b/geode-web/build.gradle
@@ -29,7 +29,6 @@ dependencies {
   //transitive dependencies from geode-web.war. Since geode-web.war is ony run within
   //a container that has geode-core on the classpath, is prevents duplicating jars. geode-core
   //in particular should not be duplicated in the war.
-  providedCompile(project(':geode-common'))
   providedCompile(project(path: ':geode-core')) {
     //spring-web is excluded from the providedCompile configuration to ensure
     //that it is included as part of the war. spring-web must be loaded with the war's

diff --git a/geode-web/src/test/resources/expected-pom.xml b/geode-web/src/test/resources/expected-pom.xml
@@ -46,11 +46,6 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.geode</groupId>
-      <artifactId>geode-common</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>