Fix MailboxServiceShadedIT for shaded dropwizard deps (#1724)

* Don't load dropwizard dependency for shaded osgi tests

* Remove com.codahale.metrics import from shaded jar manifest and add javax.management (required by dropwizard)

* Separate osgi tests into shaded and non-shaded to each compile with respective version of driver-code

* Move common osgi test harness to separate subproject, osgi-unshaded and osgi-shaded depend on osgi-common sources which they recompile with the respective version of the driver-core jar

---------

Co-authored-by: Bret McGuire <[email protected]>

Author: hhughes

driver-core/pom.xml

@@ -256,8 +256,9 @@
                                 JNR does not provide OSGi bundles, so exclude it; the driver can live without it
                                 Explicitly import javax.security.cert because it's required by Netty, but Netty has been explicitly excluded
                                 -->
-                                <Import-Package><![CDATA[com.google.common.*;version="16.0.1",!jnr.*,!io.netty.*,javax.security.cert,*]]></Import-Package>
+                                <Import-Package><![CDATA[com.google.common.*;version="16.0.1",!jnr.*,!io.netty.*,!com.codahale.metrics,javax.security.cert,javax.management,*]]></Import-Package>
                                 <Private-Package>com.datastax.shaded.*</Private-Package>
+                                <Export-Package>com.datastax.shaded.metrics;*</Export-Package>
                             </instructions>
                         </configuration>
                     </execution>
@@ -302,6 +303,8 @@
                                 <resource>META-INF/maven/io.netty/netty-handler/pom.xml</resource>
                                 <resource>META-INF/maven/io.netty/netty-transport/pom.properties</resource>
                                 <resource>META-INF/maven/io.netty/netty-transport/pom.xml</resource>
+                                <resource>META-INF/maven/io.dropwizard.metrics/metrics-core/pom.properties</resource>
+                                <resource>META-INF/maven/io.dropwizard.metrics/metrics-core/pom.xml</resource>
                             </resources>
                         </transformer>
                         <!-- Pick up the alternate manifest that was generated by the alternate execution of the bundle plugin -->

driver-tests/osgi/common/pom.xml

@@ -0,0 +1,44 @@
+<!--
+
+    Copyright DataStax, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.datastax.cassandra</groupId>
+        <artifactId>cassandra-driver-tests-osgi</artifactId>
+        <version>3.11.5-SNAPSHOT</version>
+    </parent>
+
+    <packaging>jar</packaging>
+    <artifactId>cassandra-driver-tests-osgi-common</artifactId>
+    <name>DataStax Java Driver for Apache Cassandra Tests - OSGi - Shaded</name>
+    <description>Common classes for testing DataStax Java Driver in an OSGi container.</description>
+
+    <!--
+        This submodule holds the common test classes for the shaded and unshaded osgi tests.
+        Since each testing submodule uses a different version of driver-core, each copies
+        these common classes into it's build-dir and recompiles them with the correct driver
+        artifact. This is required because MailboxImpl uses dropwizard classes that may or
+        may not be shaded. In order for the shaded/unshaded classes on the classpath to match
+        those referenced in the compiled .class files we need the correct driver-core
+        dependency loaded at compile-time, hence why each submodule must recompile the common
+        test code.
+    -->
+
+</project>

driver-tests/osgi/src/main/java/com/datastax/driver/osgi/api/MailboxException.java renamed to driver-tests/osgi/common/src/main/java/com/datastax/driver/osgi/api/MailboxException.java

@@ -15,7 +15,7 @@
  */
 package com.datastax.driver.osgi;
 
-import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackage;
+import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
 import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
@@ -60,7 +60,7 @@ public static UrlProvisionOption driverBundle(boolean useShaded) {
     return bundle(
         "reference:file:"
             + PathUtils.getBaseDir()
-            + "/../../driver-core/target/cassandra-driver-core-"
+            + "/../../../driver-core/target/cassandra-driver-core-"
             + Cluster.getDriverVersion()
             + classifier
             + ".jar");
@@ -70,7 +70,7 @@ public static UrlProvisionOption mappingBundle() {
     return bundle(
         "reference:file:"
             + PathUtils.getBaseDir()
-            + "/../../driver-mapping/target/cassandra-driver-mapping-"
+            + "/../../../driver-mapping/target/cassandra-driver-mapping-"
             + Cluster.getDriverVersion()
             + ".jar");
   }
@@ -79,7 +79,7 @@ public static UrlProvisionOption extrasBundle() {
     return bundle(
         "reference:file:"
             + PathUtils.getBaseDir()
-            + "/../../driver-extras/target/cassandra-driver-extras-"
+            + "/../../../driver-extras/target/cassandra-driver-extras-"
             + Cluster.getDriverVersion()
             + ".jar");
   }
@@ -143,6 +143,17 @@ public Option[] getOptions() {
     };
   }
 
+  public static CompositeOption dropwizardMetricsBundle() {
+    return new CompositeOption() {
+
+      @Override
+      public Option[] getOptions() {
+        return options(
+            mavenBundle("io.dropwizard.metrics", "metrics-core", getVersion("metrics.version")));
+      }
+    };
+  }
+
   public static UrlProvisionOption mailboxBundle() {
     return bundle("reference:file:" + PathUtils.getBaseDir() + "/target/classes");
   }
@@ -157,7 +168,7 @@ public Option[] getOptions() {
                 // Delegate javax.security.cert to the parent classloader.
                 // javax.security.cert.X509Certificate is used in
                 // io.netty.util.internal.EmptyArrays, but not directly by the driver.
-                bootDelegationPackage("javax.security.cert"),
+                bootDelegationPackages("javax.security.cert", "javax.management"),
                 systemProperty("cassandra.version")
                     .value(CCMBridge.getGlobalCassandraVersion().toString()),
                 systemProperty("cassandra.contactpoints").value(TestUtils.IP_PREFIX + 1),
@@ -166,7 +177,6 @@ public Option[] getOptions() {
                 mavenBundle("org.slf4j", "slf4j-api", getVersion("slf4j.version")),
                 mavenBundle("ch.qos.logback", "logback-classic", getVersion("logback.version")),
                 mavenBundle("ch.qos.logback", "logback-core", getVersion("logback.version")),
-                mavenBundle("io.dropwizard.metrics", "metrics-core", getVersion("metrics.version")),
                 mavenBundle(
                     "com.fasterxml.jackson.core",
                     "jackson-databind",