Adds support for java 11.

jitsi · May 9, 2019 · 6f5f945 · 6f5f945
1 parent e537049
commit 6f5f945
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jicoco</artifactId>
-      <version>1.1-20190409.112040-14</version>
+      <version>1.1-20190509.130302-15</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -159,7 +159,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ice4j</artifactId>
-      <version>2.0.0-20181005.221549-11</version>
+      <version>2.0.0-20190509.132540-35</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -231,7 +231,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.8.0</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>

diff --git a/resources/install/debian/control b/resources/install/debian/control
@@ -9,6 +9,6 @@ Homepage: https://jitsi.org/meet
 
 Package: jicofo
 Architecture: any
-Depends: ${misc:Depends}, openjdk-8-jre-headless
+Depends: ${misc:Depends}, openjdk-8-jre-headless | openjdk-11-jre-headless
 Description: JItsi Meet COnference FOcus
  Jicofo is a conference focus for Jitsi Meet application.
diff --git a/src/test/java/org/jitsi/jicofo/OSGiHandler.java b/src/test/java/org/jitsi/jicofo/OSGiHandler.java
@@ -1,7 +1,7 @@
 /*
  * Jicofo, the Jitsi Conference Focus.
  *
- * Copyright @ 2015 Atlassian Pty Ltd
+ * Copyright @ 2018 - present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@
 import org.jitsi.meet.*;
 import org.osgi.framework.*;
 
-import java.lang.reflect.*;
-
 /**
  * Helper class takes encapsulates OSGi specifics operations.
  *
@@ -112,7 +110,7 @@ public void stop(BundleContext bundleContext)
         JicofoBundleConfig jicofoBundles = new JicofoBundleConfig();
         jicofoBundles.setUseMockProtocols(true);
         OSGi.setBundleConfig(jicofoBundles);
-        OSGi.setClassLoader(getPlatformClassLoader());
+        OSGi.setClassLoader(ClassLoader.getSystemClassLoader());
 
         OSGi.start(bundleActivator);
 
@@ -161,24 +159,6 @@ public BundleContext bc()
         return bc;
     }
 
-    private ClassLoader getPlatformClassLoader() {
-        ClassLoader cl;
-        //JDK 9
-        try
-        {
-            Method getPlatformClassLoader =
-                    ClassLoader.class.getMethod("getPlatformClassLoader");
-            cl = (ClassLoader) getPlatformClassLoader.invoke(null);
-        }
-        catch (NoSuchMethodException | IllegalAccessException |
-                InvocationTargetException t)
-        {
-            // pre-JDK9
-            cl = ClassLoader.getSystemClassLoader();
-        }
-        return cl;
-    }
-
     public boolean isDeadlocked()
     {
         return deadlocked;