Revert "Declare dependencies we use, drop unused dependencies (apache…

…#6973)" (apache#7020) This reverts commit 9aa120e.
meslubi2021 · Oct 20, 2021 · 9079de9 · 9079de9
1 parent 9aa120e
commit 9079de9
Show file tree

Hide file tree

Showing 59 changed files with 505 additions and 998 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
@@ -118,9 +118,9 @@
         <version>2.3.2</version>
       </dependency>
       <dependency>
-        <groupId>com.vaadin.external.google</groupId>
-        <artifactId>android-json</artifactId>
-        <version>0.0.20131108.vaadin1</version>
+        <groupId>com.tngtech.archunit</groupId>
+        <artifactId>archunit-junit4</artifactId>
+        <version>0.15.0</version>
       </dependency>
       <dependency>
         <groupId>com.zaxxer</groupId>
@@ -207,6 +207,11 @@
         <artifactId>swagger-annotations</artifactId>
         <version>1.6.2</version>
       </dependency>
+      <dependency>
+        <groupId>it.unimi.dsi</groupId>
+        <artifactId>fastutil</artifactId>
+        <version>8.5.4</version>
+      </dependency>
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
@@ -237,11 +242,6 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>3.1.0</version>
       </dependency>
-      <dependency>
-        <groupId>javax.transaction</groupId>
-        <artifactId>javax.transaction-api</artifactId>
-        <version>1.3</version>
-      </dependency>
       <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
@@ -357,6 +357,11 @@
         <artifactId>jproc</artifactId>
         <version>2.6.2</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-core-uberjar</artifactId>
+        <version>1.9.7</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
@@ -512,16 +517,6 @@
         <artifactId>junit-quickcheck-generators</artifactId>
         <version>1.0</version>
       </dependency>
-      <dependency>
-        <groupId>com.tngtech.archunit</groupId>
-        <artifactId>archunit-junit4</artifactId>
-        <version>0.15.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.tngtech.archunit</groupId>
-        <artifactId>archunit</artifactId>
-        <version>0.15.0</version>
-      </dependency>
       <dependency>
         <groupId>io.springfox</groupId>
         <artifactId>springfox-swagger-ui</artifactId>
@@ -532,21 +527,6 @@
         <artifactId>springfox-swagger2</artifactId>
         <version>2.9.2</version>
       </dependency>
-      <dependency>
-        <groupId>it.unimi.dsi</groupId>
-        <artifactId>fastutil</artifactId>
-        <version>8.5.4</version>
-      </dependency>
-      <dependency>
-        <groupId>it.unimi.dsi</groupId>
-        <artifactId>fastutil-core</artifactId>
-        <version>8.5.4</version>
-      </dependency>
-      <dependency>
-        <groupId>it.unimi.dsi</groupId>
-        <artifactId>fastutil-extra</artifactId>
-        <version>8.5.4</version>
-      </dependency>
       <dependency>
         <groupId>mx4j</groupId>
         <artifactId>mx4j-remote</artifactId>
@@ -607,26 +587,6 @@
         <artifactId>lucene-test-framework</artifactId>
         <version>6.6.6</version>
       </dependency>
-      <dependency>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-core-uberjar</artifactId>
-        <version>1.9.7</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-core-api-container</artifactId>
-        <version>1.9.7</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-core-api-generic</artifactId>
-        <version>1.9.7</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-core-api-util</artifactId>
-        <version>1.9.7</version>
-      </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest</artifactId>
@@ -677,11 +637,6 @@
         <artifactId>spring-security-config</artifactId>
         <version>5.5.2</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-crypto</artifactId>
-        <version>5.5.2</version>
-      </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-core</artifactId>
@@ -742,11 +697,6 @@
         <artifactId>spring-expression</artifactId>
         <version>5.3.9</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-jcl</artifactId>
-        <version>5.3.9</version>
-      </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-oxm</artifactId>
@@ -802,6 +752,12 @@
         <artifactId>annotations</artifactId>
         <version>22.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-for-redis</artifactId>
+        <version>${version}</version>
+        <scope>compile</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.geode</groupId>
         <artifactId>geode-common</artifactId>
@@ -838,12 +794,6 @@
         <version>${version}</version>
         <scope>compile</scope>
       </dependency>
-      <dependency>
-        <groupId>org.apache.geode</groupId>
-        <artifactId>geode-for-redis</artifactId>
-        <version>${version}</version>
-        <scope>compile</scope>
-      </dependency>
       <dependency>
         <groupId>org.apache.geode</groupId>
         <artifactId>geode-gfsh</artifactId>

diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ plugins {
   id "eclipse"
   id "com.diffplug.spotless" version "5.14.3" apply false
   id "com.github.ben-manes.versions" version "0.39.0" apply false
-  id "nebula.lint" version "17.2.3" apply false
+  id "nebula.lint" version "17.1.1" apply false
   id "com.palantir.docker" version "0.28.0" apply false
   id "io.spring.dependency-management" version "1.0.11.RELEASE" apply false
   id "org.ajoberstar.grgit" version "4.1.0" apply false

diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -103,7 +103,7 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '4.0.1')
         api(group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2')
         api(group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.2')
-        api(group: 'com.vaadin.external.google', name: 'android-json', version: '0.0.20131108.vaadin1')
+        api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.15.0')
         api(group: 'com.zaxxer', name: 'HikariCP', version: '4.0.3')
         api(group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4')
         api(group: 'commons-codec', name: 'commons-codec', version: '1.15')
@@ -122,13 +122,13 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
         api(group: 'io.netty', name: 'netty-all', version: '4.1.67.Final')
         api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2')
+        api(group: 'it.unimi.dsi', name: 'fastutil', version: get('fastutil.version'))
         api(group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2')
         api(group: 'javax.annotation', name: 'jsr250-api', version: '1.0')
         api(group: 'javax.ejb', name: 'ejb-api', version: '3.0')
         api(group: 'javax.mail', name: 'javax.mail-api', version: '1.6.2')
         api(group: 'javax.resource', name: 'javax.resource-api', version: '1.7.1')
         api(group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0')
-        api(group: 'javax.transaction', name: 'javax.transaction-api', version: '1.3')
         api(group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1')
         api(group: 'joda-time', name: 'joda-time', version: '2.10.9')
         api(group: 'junit', name: 'junit', version: get('junit.version'))
@@ -152,6 +152,7 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'org.assertj', name: 'assertj-core', version: '3.20.2')
         api(group: 'org.awaitility', name: 'awaitility', version: '4.1.0')
         api(group: 'org.buildobjects', name: 'jproc', version: '2.6.2')
+        api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.9.7')
         api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
         api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
         api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')
@@ -198,22 +199,11 @@ class DependencyConstraints implements Plugin<Project> {
       entry('junit-quickcheck-generators')
     }
 
-    dependencySet(group: 'com.tngtech.archunit', version: '0.15.0') {
-      entry('archunit-junit4')
-      entry('archunit')
-    }
-
     dependencySet(group: 'io.springfox', version: '2.9.2') {
       entry('springfox-swagger-ui')
       entry('springfox-swagger2')
     }
 
-    dependencySet(group: 'it.unimi.dsi', version: get('fastutil.version')) {
-      entry('fastutil')
-      entry('fastutil-core')
-      entry('fastutil-extra')
-    }
-
     dependencySet(group: 'mx4j', version: '3.0.2') {
       entry('mx4j-remote')
       entry('mx4j')
@@ -235,13 +225,6 @@ class DependencyConstraints implements Plugin<Project> {
       entry('lucene-test-framework')
     }
 
-    dependencySet(group: 'org.codehaus.cargo', version: '1.9.7') {
-      entry('cargo-core-uberjar')
-      entry('cargo-core-api-container')
-      entry('cargo-core-api-generic')
-      entry('cargo-core-api-util')
-    }
-
     dependencySet(group: 'org.hamcrest', version: '2.2') {
       entry('hamcrest')
     }
@@ -265,7 +248,6 @@ class DependencyConstraints implements Plugin<Project> {
 
     dependencySet(group: 'org.springframework.security', version: '5.5.2') {
       entry('spring-security-config')
-      entry('spring-security-crypto')
       entry('spring-security-core')
       entry('spring-security-ldap')
       entry('spring-security-test')
@@ -281,7 +263,6 @@ class DependencyConstraints implements Plugin<Project> {
       entry('spring-context')
       entry('spring-core')
       entry('spring-expression')
-      entry('spring-jcl')
       entry('spring-oxm')
       entry('spring-test')
       entry('spring-tx')

diff --git a/extensions/geode-modules-assembly/release/session/bin/modify_war b/extensions/geode-modules-assembly/release/session/bin/modify_war
@@ -275,6 +275,7 @@ OTHER_JARS=(${GEODE}/lib/geode-core-${VERSION}.jar \
     ${GEODE}/lib/log4j-jul-@[email protected] \
     ${GEODE}/lib/fastutil-core-@[email protected] \
     ${GEODE}/lib/fastutil-extra-@[email protected] \
+    ${GEODE}/lib/fastutil-@[email protected] \
     ${GEODE}/lib/javax.transaction-api-@[email protected] \
     ${GEODE}/lib/jetty-http-@[email protected] \
     ${GEODE}/lib/jetty-io-@[email protected] \

diff --git a/extensions/geode-modules-session-internal/build.gradle b/extensions/geode-modules-session-internal/build.gradle
@@ -24,5 +24,4 @@ dependencies {
 
   compileOnly(platform(project(':boms:geode-all-bom')))
   compileOnly('javax.servlet:javax.servlet-api')
-  compileOnly('org.slf4j:slf4j-api')
 }
diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
@@ -29,19 +29,18 @@ dependencies {
     exclude module: 'geode-modules'
   }
   api(project(':geode-core'))
-
-
   implementation(project(':geode-common'))
-  implementation('javax.servlet:javax.servlet-api')
-  implementation('org.apache.tomcat:servlet-api:' + DependencyConstraints.get('tomcat6.version'))
-  implementation('org.slf4j:slf4j-api')
-
 
   integrationTestImplementation(project(':extensions:geode-modules'))
   integrationTestImplementation(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
   integrationTestImplementation(project(':geode-logging'))
+
+  implementation('javax.servlet:javax.servlet-api')
+  implementation('org.apache.tomcat:servlet-api:' + DependencyConstraints.get('tomcat6.version'))
+  implementation('org.slf4j:slf4j-api')
+
   integrationTestImplementation('com.mockrunner:mockrunner-servlet') {
     exclude group: 'jboss'
     exclude group: 'xerces'
@@ -52,15 +51,16 @@ dependencies {
   integrationTestImplementation('org.apache.tomcat:jasper:' + DependencyConstraints.get('tomcat6.version'))
   integrationTestImplementation('org.assertj:assertj-core')
   integrationTestImplementation('org.eclipse.jetty:jetty-http:' + DependencyConstraints.get('jetty.version') + ':tests')
-  integrationTestImplementation('org.eclipse.jetty:jetty-server:' + DependencyConstraints.get('jetty.version'))
+  integrationTestImplementation('org.eclipse.jetty:jetty-server')
   integrationTestImplementation('org.eclipse.jetty:jetty-servlet:' + DependencyConstraints.get('jetty.version') + ':tests')
   integrationTestImplementation('org.eclipse.jetty:jetty-servlet:' + DependencyConstraints.get('jetty.version'))
-  integrationTestImplementation('org.eclipse.jetty:jetty-util:' + DependencyConstraints.get('jetty.version'))
+  integrationTestImplementation('org.eclipse.jetty:jetty-util')
   integrationTestImplementation('org.httpunit:httpunit') {
     exclude group: 'javax.servlet'
     // this version of httpunit contains very outdated xercesImpl
     exclude group: 'xerces'
   }
+  integrationTestImplementation('org.slf4j:slf4j-api')
 
   integrationTestRuntimeOnly('xerces:xercesImpl')
 }

diff --git a/extensions/geode-modules-test/build.gradle b/extensions/geode-modules-test/build.gradle
@@ -21,28 +21,14 @@ apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
 
 dependencies {
   // main
-  api(project(':extensions:geode-modules'))
-
-
-  compileOnly(platform(project(':boms:geode-all-bom')))
-  compileOnly('org.apache.tomcat:catalina-ha:' + DependencyConstraints.get('tomcat6.version'))
-  compileOnly('org.apache.tomcat:catalina:' + DependencyConstraints.get('tomcat6.version'))
-  compileOnly('org.apache.tomcat:juli:' + DependencyConstraints.get('tomcat6.version'))
-  compileOnly('org.apache.tomcat:servlet-api:' + DependencyConstraints.get('tomcat6.version'))
-
-
   implementation(platform(project(':boms:geode-all-bom')))
   implementation(project(':geode-dunit'))
   implementation('org.springframework:spring-core')
   implementation('org.httpunit:httpunit')
   implementation('pl.pragmatists:JUnitParams')
-  implementation('commons-io:commons-io')
-  implementation('javax.servlet:servlet-api')
-  implementation('junit:junit')
-  implementation('org.assertj:assertj-core')
-  implementation('org.mockito:mockito-core')
-  implementation('xerces:xmlParserAPIs')
-  implementation('xml-apis:xml-apis')
 
+  api(project(':extensions:geode-modules'))
 
+  compileOnly(platform(project(':boms:geode-all-bom')))
+  compileOnly('org.apache.tomcat:catalina-ha:' + DependencyConstraints.get('tomcat6.version'))
 }
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
@@ -32,8 +32,6 @@ dependencies {
   compileOnly(platform(project(':boms:geode-all-bom')))
   compileOnly('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat7.version'))
   compileOnly('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat7.version'))
-  compileOnly('org.apache.tomcat:tomcat-juli:' + DependencyConstraints.get('tomcat7.version'))
-  compileOnly('org.apache.tomcat:tomcat-servlet-api:' + DependencyConstraints.get('tomcat7.version'))
 
 
   // test
@@ -43,16 +41,12 @@ dependencies {
   testImplementation('org.mockito:mockito-core')
   testImplementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat7.version'))
   testImplementation('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat7.version'))
-  testImplementation('org.apache.tomcat:tomcat-juli:' + DependencyConstraints.get('tomcat7.version'))
-  testImplementation('org.apache.tomcat:tomcat-servlet-api:' + DependencyConstraints.get('tomcat7.version'))
 
 
   // integrationTest
   integrationTestImplementation(project(':extensions:geode-modules-test'))
   integrationTestImplementation(project(':geode-dunit'))
-  integrationTestImplementation('junit:junit')
   integrationTestImplementation('org.httpunit:httpunit')
-  integrationTestImplementation('org.mockito:mockito-core')
   integrationTestImplementation('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat7.version'))
   integrationTestImplementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat7.version'))
 }