Changeset 5505

Timestamp:

Jun 17, 2019, 2:48:32 PM (4 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1152: Switch to Java 11 and BASE 3.15

Worked fine with just updating version numbers in a couple of places and a minial code change due to generic return parameters implementation in BASE 3.15.

Location:

extensions/net.sf.basedb.opengrid/trunk

Files:

• .classpath (modified) (1 diff)
• META-INF/extensions.xml (modified) (1 diff)
• README (modified) (2 diffs)
• build.xml (modified) (3 diffs)
• lib/slf4j-api-1.6.4.jar (deleted)
• lib/slf4j-api-1.7.25.jar (added)
• src/net/sf/basedb/opengrid/service/OpenGridService.java (modified) (2 diffs)

extensions/net.sf.basedb.opengrid/trunk/.classpath

@@ -2 +2 @@
 <classpath>
   <classpathentry kind="src" path="src"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-  <classpathentry kind="lib" path="lib/slf4j-api-1.6.4.jar"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+    <attributes>
+      <attribute name="module" value="true"/>
+    </attributes>
+  </classpathentry>
   <classpathentry kind="lib" path="lib/servlet-api.jar"/>
   <classpathentry kind="lib" path="lib/jdom-2.0.6.jar"/>
-  <classpathentry kind="lib" path="lib/base-core-3.13.0.jar"/>
-  <classpathentry kind="lib" path="lib/base-webclient-3.13.0.jar"/>
   <classpathentry kind="lib" path="META-INF/lib/sshj-0.27.0.jar"/>
   <classpathentry kind="lib" path="lib/json-simple-1.1.1-1.jar"/>
+  <classpathentry kind="lib" path="lib/base-core-3.15.0.jar"/>
+  <classpathentry kind="lib" path="lib/base-webclient-3.15.0.jar"/>
+  <classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
   <classpathentry kind="output" path="bin"/>
 </classpath>

extensions/net.sf.basedb.opengrid/trunk/META-INF/extensions.xml

@@ -8 +8 @@
     </description>
     <version>1.3-dev</version>
-    <min-base-version>3.13.0</min-base-version>
+    <min-base-version>3.15.0</min-base-version>
     <copyright>BASE development team</copyright>
     <email>basedb-users@lists.sourceforge.net</email>

extensions/net.sf.basedb.opengrid/trunk/README

@@ -1 +1 @@
 == Requirements ==
 
- 1. BASE 3.13 or later.
+ 1. BASE 3.15 or later.
+ 2. Java 11 or later.
  
 == Introduction ==
@@ -28 +29 @@
 To compile this package you also need:
  
- 1. Ant 1.9
- 2. Java 1.8
+ 1. Ant 1.10
+ 2. Java 11
 
 Follow these instructions:

extensions/net.sf.basedb.opengrid/trunk/build.xml

@@ -18 +18 @@
   <property name="tar.name" value="${tar.prefix}.tar.gz" description="Full name of .tar.gz file for download." />
   <property name="javac.arg" value="-Xlint:unchecked" />
-  <property name="javac.source" value="1.8" />
-  <property name="javac.target" value="1.8" />
+  <property name="javac.release" value="11" />
   <property name="javac.encoding" value="UTF-8" />
   <property name="depend.base-version" 
-    value="3.13.0" 
+    value="3.15.0" 
     description="The BASE version that this project depends on."
   />
@@ -118 +117 @@
       includeantruntime="false"
       classpathref="classpath"
-      source="${javac.source}"
-      target="${javac.target}"
+      release="${javac.release}"
       >
       <compilerarg value="${javac.arg}" />
@@ -175 +173 @@
       >
       <header><![CDATA[Open Grid Scheduler package for BASE ${version}: ${TODAY}]]></header>
-      <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+      <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
       <link href="http://base.thep.lu.se/chrome/site/latest/api/" />
     </javadoc>

extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/service/OpenGridService.java

@@ -797 +797 @@
     private final ExtensionsInvoker<JobCompletionHandler> invoker;
     
-    @SuppressWarnings("unchecked")
     JobCompletionInvoker(SessionControl rootSc) 
     {
@@ -805 +804 @@
       Registry registry = Application.getExtensionsManager().getRegistry();
       Settings settings = Application.getExtensionsManager().getSettings();
-      this.invoker = (ExtensionsInvoker<JobCompletionHandler>)registry.useExtensions(
+      this.invoker = registry.useExtensions(
           context, settings, new String[] { "net.sf.basedb.opengrid.job-complete" });
     }