GEODE-8066: Pull up transitive dependency to clean up javax.activation and mail licenses. (apache#5291)

* correct dependency classpath test to remove javax.activation
* fix assembly_content test
* fix expected-jars test in gemfire-assembly:integrationTest
* Drop 'activation v1.1.0' from src license file

Author: robbadler

boms/geode-all-bom/src/test/resources/expected-pom.xml

@@ -140,9 +140,9 @@
         <scope>compile</scope>
       </dependency>
       <dependency>
-        <groupId>com.sun.activation</groupId>
-        <artifactId>javax.activation</artifactId>
-        <version>1.2.0</version>
+        <groupId>com.nimbusds</groupId>
+        <artifactId>oauth2-oidc-sdk</artifactId>
+        <version>8.9</version>
         <scope>compile</scope>
       </dependency>
       <dependency>

buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

@@ -100,7 +100,8 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'com.healthmarketscience.rmiio', name: 'rmiio', version: '2.1.2')
         api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.4')
         api(group: 'com.nimbusds', name:'nimbus-jose-jwt', version:'8.11')
-        api(group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0')
+        // Pinning transitive dependency from spring-security-oauth2 to clean up our licenses.
+        api(group: 'com.nimbusds', name: 'oauth2-oidc-sdk', version: '8.9')
         api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '3.0.11')
         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')

geode-assembly/src/integrationTest/resources/assembly_content.txt

@@ -1020,7 +1020,6 @@ lib/istack-commons-runtime-3.0.11.jar
 lib/jackson-annotations-2.10.1.jar
 lib/jackson-core-2.10.1.jar
 lib/jackson-databind-2.10.1.jar
-lib/javax.activation-1.2.0.jar
 lib/javax.activation-api-1.2.0.jar
 lib/javax.mail-api-1.6.2.jar
 lib/javax.resource-api-1.7.1.jar

geode-assembly/src/integrationTest/resources/dependency_classpath.txt

@@ -32,7 +32,6 @@ log4j-api-2.13.1.jar
 spring-shell-1.2.0.RELEASE.jar
 rmiio-2.1.2.jar
 antlr-2.7.7.jar
-javax.activation-1.2.0.jar
 istack-commons-runtime-3.0.11.jar
 jaxb-impl-2.3.2.jar
 commons-validator-1.6.jar

geode-assembly/src/integrationTest/resources/expected_jars.txt

@@ -2,7 +2,6 @@ HdrHistogram
 HikariCP
 LatencyUtils
 accessors-smart
-activation
 antlr
 asm
 byte-buddy
@@ -35,9 +34,7 @@ j2objc-annotations
 jackson-annotations
 jackson-core
 jackson-databind
-javax.activation
 javax.activation-api
-javax.mail
 javax.mail-api
 javax.resource-api
 javax.servlet-api

geode-assembly/src/main/dist/LICENSE

@@ -264,8 +264,6 @@ The CDDL Version 1.1 (https://javaee.github.io/glassfish/LICENSE)
 Apache Geode bundles the following files under the Common Development and
 Distribution License:
 
-  - activation v1.1.0
-    (https://www.oracle.com/java/technologies/java-beans-activation.html)
   - javax.activation v1.2.0
     (https://www.oracle.com/technetwork/java/javase/jaf-135115.html)
   - javax.mail v1.6.2 (http://www.oracle.com/)

geode-core/build.gradle

@@ -219,8 +219,6 @@ dependencies {
     //Commons validator is used to validate inet addresses in membership
     implementation('commons-validator:commons-validator')
 
-    //javax.activation is runtime dependency for gfsh with java 11 (used by gfsh-over-http)
-    runtimeOnly('com.sun.activation:javax.activation')
 
     //jaxb is used by cluster configuration
     implementation('javax.xml.bind:jaxb-api')

geode-core/src/test/resources/expected-pom.xml

@@ -237,11 +237,6 @@
       <artifactId>geode-tcp-server</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.sun.activation</groupId>
-      <artifactId>javax.activation</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>com.sun.istack</groupId>
       <artifactId>istack-commons-runtime</artifactId>

geode-old-versions/build.gradle

@@ -77,9 +77,6 @@ subprojects {
         new File(contentsFile.toAbsolutePath().toString()).text = file(unpackDest).listFiles()
       }
     }
-    project.assemble.dependsOn(project.downloadAndUnzipFile)
-    project.assemble.dependsOn(project.enumerateArchiveContents)
-
   }
 }
 
@@ -119,7 +116,7 @@ project.createGeodeClasspathsFile.mustRunAfter(clean)
 project.createGeodeClasspathsFile.inputs.files(getTasksByName('downloadAndUnzipFile', true))
 project.createGeodeClasspathsFile.inputs.files(getTasksByName('enumerateArchiveContents', true))
 project.jarTest.dependsOn(createGeodeClasspathsFile)
-tasks.named('assemble') {
+tasks.named('build') {
   dependsOn(tasks.named('createGeodeClasspathsFile'))
 }
 sourceSets {