GEODE-6302 Improve checkPom check and reporting (apache#3107)

* Verify versions exist only in <dependencyManagement> * Check pom <groupId> * Check pom <artifactId> * Check all values of <dependencies> * Check all values of <dependencyManagement> * Improved task caching * Safeguard against regression in expected poms. * Correct those poms which did not adhere to the above. * Once fully moved to BOMs for dependency tracking, some further changes to the <dependencyManagment> compare will be needed
IronOnet · Jan 23, 2019 · b393482 · b393482
1 parent f2a1248
commit b393482
Show file tree

Hide file tree

Showing 30 changed files with 1,255 additions and 102 deletions.
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -112,6 +112,11 @@
         <artifactId>spring-test</artifactId>
         <version>4.3.20.RELEASE</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-web-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
@@ -382,6 +387,11 @@
         <artifactId>JUnitParams</artifactId>
         <version>1.1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-gradle-plugin</artifactId>
+        <version>0.8.6</version>
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
@@ -417,6 +427,11 @@
         <artifactId>geode-pulse</artifactId>
         <version>1.9.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.mockrunner</groupId>
         <artifactId>mockrunner-servlet</artifactId>
@@ -692,6 +707,11 @@
         <artifactId>commons-digester</artifactId>
         <version>2.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp</artifactId>
+        <version>9.4.12.v20180830</version>
+      </dependency>
       <dependency>
         <groupId>com.pholser</groupId>
         <artifactId>junit-quickcheck-core</artifactId>

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -27,11 +27,13 @@ apply from: "${project.projectDir}/../gradle/publish.gradle"
 // disable artifact generation for this project
 jar.enabled = false
 
+project.ext {artifactName = 'apache-geode'}
+
 publishing {
   publications {
     maven(MavenPublication) {
       afterEvaluate {
-        artifactId = 'apache-geode'
+        artifactId = artifactName
 
         artifacts = []
 

diff --git a/geode-assembly/src/test/resources/expected-pom.xml b/geode-assembly/src/test/resources/expected-pom.xml
@@ -112,6 +112,11 @@
         <artifactId>spring-test</artifactId>
         <version>4.3.20.RELEASE</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-web-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
@@ -382,6 +387,11 @@
         <artifactId>JUnitParams</artifactId>
         <version>1.1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-gradle-plugin</artifactId>
+        <version>0.8.6</version>
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
@@ -417,6 +427,11 @@
         <artifactId>geode-pulse</artifactId>
         <version>1.9.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.mockrunner</groupId>
         <artifactId>mockrunner-servlet</artifactId>
@@ -692,6 +707,11 @@
         <artifactId>commons-digester</artifactId>
         <version>2.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp</artifactId>
+        <version>9.4.12.v20180830</version>
+      </dependency>
       <dependency>
         <groupId>com.pholser</groupId>
         <artifactId>junit-quickcheck-core</artifactId>

diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml
@@ -111,6 +111,11 @@
         <artifactId>spring-test</artifactId>
         <version>4.3.20.RELEASE</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-web-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
@@ -381,6 +386,11 @@
         <artifactId>JUnitParams</artifactId>
         <version>1.1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-gradle-plugin</artifactId>
+        <version>0.8.6</version>
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
@@ -416,6 +426,11 @@
         <artifactId>geode-pulse</artifactId>
         <version>1.9.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.mockrunner</groupId>
         <artifactId>mockrunner-servlet</artifactId>
@@ -691,6 +706,11 @@
         <artifactId>commons-digester</artifactId>
         <version>2.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp</artifactId>
+        <version>9.4.12.v20180830</version>
+      </dependency>
       <dependency>
         <groupId>com.pholser</groupId>
         <artifactId>junit-quickcheck-core</artifactId>

diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml
@@ -123,6 +123,11 @@
         <artifactId>spring-test</artifactId>
         <version>4.3.20.RELEASE</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-web-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
@@ -393,6 +398,11 @@
         <artifactId>JUnitParams</artifactId>
         <version>1.1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-gradle-plugin</artifactId>
+        <version>0.8.6</version>
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
@@ -428,6 +438,11 @@
         <artifactId>geode-pulse</artifactId>
         <version>1.9.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.mockrunner</groupId>
         <artifactId>mockrunner-servlet</artifactId>
@@ -703,6 +718,11 @@
         <artifactId>commons-digester</artifactId>
         <version>2.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp</artifactId>
+        <version>9.4.12.v20180830</version>
+      </dependency>
       <dependency>
         <groupId>com.pholser</groupId>
         <artifactId>junit-quickcheck-core</artifactId>

diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml
@@ -38,13 +38,11 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-common</artifactId>
-      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-core</artifactId>
-      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -187,6 +185,11 @@
         <artifactId>spring-test</artifactId>
         <version>4.3.20.RELEASE</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-web-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
@@ -457,6 +460,11 @@
         <artifactId>JUnitParams</artifactId>
         <version>1.1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-gradle-plugin</artifactId>
+        <version>0.8.6</version>
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
@@ -492,6 +500,11 @@
         <artifactId>geode-pulse</artifactId>
         <version>1.9.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.mockrunner</groupId>
         <artifactId>mockrunner-servlet</artifactId>
@@ -767,6 +780,11 @@
         <artifactId>commons-digester</artifactId>
         <version>2.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp</artifactId>
+        <version>9.4.12.v20180830</version>
+      </dependency>
       <dependency>
         <groupId>com.pholser</groupId>
         <artifactId>junit-quickcheck-core</artifactId>

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -226,7 +226,7 @@ dependencies {
   runtimeOnly('org.apache.logging.log4j:log4j-jul') {
     ext.optional = true
   }
-  compile('org.eclipse.jetty:jetty-webapp:' + project.'jetty.version') {
+  compile('org.eclipse.jetty:jetty-webapp') {
     ext.optional = true
   }
   compileOnly('org.springframework:spring-webmvc') {

diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
@@ -198,7 +198,6 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>9.4.12.v20180830</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -267,19 +266,16 @@
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-common</artifactId>
-      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-json</artifactId>
-      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
       <artifactId>geode-management</artifactId>
-      <version>1.9.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -395,6 +391,11 @@
         <artifactId>spring-test</artifactId>
         <version>4.3.20.RELEASE</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-web-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
@@ -665,6 +666,11 @@
         <artifactId>JUnitParams</artifactId>
         <version>1.1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-gradle-plugin</artifactId>
+        <version>0.8.6</version>
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
@@ -700,6 +706,11 @@
         <artifactId>geode-pulse</artifactId>
         <version>1.9.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-management</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>com.mockrunner</groupId>
         <artifactId>mockrunner-servlet</artifactId>
@@ -975,6 +986,11 @@
         <artifactId>commons-digester</artifactId>
         <version>2.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp</artifactId>
+        <version>9.4.12.v20180830</version>
+      </dependency>
       <dependency>
         <groupId>com.pholser</groupId>
         <artifactId>junit-quickcheck-core</artifactId>