avoid warnings

4 files changed, 7 insertions, 7 deletions

diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java
index 7fe517fdd80..ce25f40dc65 100644
--- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java
+++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java
@@ -22,10 +22,10 @@ public class BundleActivatorIntegrationTest {
         OsgiFramework osgi = driver.osgiFramework();
         BundleInstaller installer = new BundleInstaller(driver.osgiFramework());
         Bundle bundle = installer.installAndStart("my-bundle-activator.jar").get(0);
-        Class serviceClass = bundle.loadClass("com.yahoo.jdisc.bundle.MyService");
+        Class<?> serviceClass = bundle.loadClass("com.yahoo.jdisc.bundle.MyService");
         assertNotNull(serviceClass);
         BundleContext ctx = osgi.bundleContext();
-        ServiceReference serviceRef = ctx.getServiceReference(serviceClass.getName());
+        ServiceReference<?> serviceRef = ctx.getServiceReference(serviceClass.getName());
         assertNotNull(serviceRef);
         Object service = ctx.getService(serviceRef);
         assertNotNull(service);
@@ -37,10 +37,10 @@ public class BundleActivatorIntegrationTest {
     public void requireThatApplicationBundleActivatorHasAccessToCurrentContainer() throws Exception {
         TestDriver driver = TestDriver.newApplicationBundleInstance("app-g-act.jar", false);
         OsgiFramework osgi = driver.osgiFramework();
-        Class serviceClass = osgi.bundles().get(1).loadClass("com.yahoo.jdisc.bundle.MyService");
+        Class<?> serviceClass = osgi.bundles().get(1).loadClass("com.yahoo.jdisc.bundle.MyService");
         assertNotNull(serviceClass);
         BundleContext ctx = osgi.bundleContext();
-        ServiceReference serviceRef = ctx.getServiceReference(serviceClass.getName());
+        ServiceReference<?> serviceRef = ctx.getServiceReference(serviceClass.getName());
         assertNotNull(serviceRef);
         Object service = ctx.getService(serviceRef);
         assertNotNull(service);
diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/client/ClientDriverIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/client/ClientDriverIntegrationTest.java
index bcb4a0b4fd7..85a80d0ffeb 100644
--- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/client/ClientDriverIntegrationTest.java
+++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/client/ClientDriverIntegrationTest.java
@@ -55,7 +55,7 @@ public class ClientDriverIntegrationTest {
             }
             try {
                 List<Bundle> bundles = installer.installAndStart("cert-a.jar");
-                Class classObj = bundles.get(0).loadClass("com.yahoo.jdisc.bundle.a.CertificateA");
+                Class<?> classObj = bundles.get(0).loadClass("com.yahoo.jdisc.bundle.a.CertificateA");
                 log.info("Loaded '" + classObj.getName() + "'.");
             } catch (Exception e) {
                 throw new AssertionError(e);
diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/FelixFrameworkIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/FelixFrameworkIntegrationTest.java
index d6a77a88625..9836f2879cd 100644
--- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/FelixFrameworkIntegrationTest.java
+++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/FelixFrameworkIntegrationTest.java
@@ -194,7 +194,7 @@ public class FelixFrameworkIntegrationTest {
 
     @SuppressWarnings({ "unchecked" })
     private static int callClass(Bundle bundle, String className) throws Exception {
-        Class certClass = bundle.loadClass(className);
+        Class<?> certClass = bundle.loadClass(className);
         assertNotNull(certClass);
         Callable<Integer> cert = (Callable<Integer>)certClass.newInstance();
         assertNotNull(cert);
diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java
index 89420464f6f..3ec05295750 100644
--- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java
+++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceIntegrationTest.java
@@ -33,7 +33,7 @@ public class OsgiLogServiceIntegrationTest {
         long now = System.currentTimeMillis();
         TestDriver driver = TestDriver.newApplicationBundleInstance("app-h-log.jar", false);
         BundleContext ctx = driver.osgiFramework().bundleContext();
-        ServiceReference ref = ctx.getServiceReference(LogReaderService.class.getName());
+        ServiceReference<?> ref = ctx.getServiceReference(LogReaderService.class.getName());
         LogReaderService reader = (LogReaderService)ctx.getService(ref);
         Enumeration<LogEntry> log = (Enumeration<LogEntry>)reader.getLog();