Ignore:
Timestamp:
Jun 17, 2019, 2:48:32 PM (3 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:
1 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.opengrid/trunk/.classpath

    r5504 r5505  
    22<classpath>
    33  <classpathentry kind="src" path="src"/>
    4   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
    5   <classpathentry kind="lib" path="lib/slf4j-api-1.6.4.jar"/>
     4  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
     5    <attributes>
     6      <attribute name="module" value="true"/>
     7    </attributes>
     8  </classpathentry>
    69  <classpathentry kind="lib" path="lib/servlet-api.jar"/>
    710  <classpathentry kind="lib" path="lib/jdom-2.0.6.jar"/>
    8   <classpathentry kind="lib" path="lib/base-core-3.13.0.jar"/>
    9   <classpathentry kind="lib" path="lib/base-webclient-3.13.0.jar"/>
    1011  <classpathentry kind="lib" path="META-INF/lib/sshj-0.27.0.jar"/>
    1112  <classpathentry kind="lib" path="lib/json-simple-1.1.1-1.jar"/>
     13  <classpathentry kind="lib" path="lib/base-core-3.15.0.jar"/>
     14  <classpathentry kind="lib" path="lib/base-webclient-3.15.0.jar"/>
     15  <classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
    1216  <classpathentry kind="output" path="bin"/>
    1317</classpath>
  • extensions/net.sf.basedb.opengrid/trunk/META-INF/extensions.xml

    r4936 r5505  
    88    </description>
    99    <version>1.3-dev</version>
    10     <min-base-version>3.13.0</min-base-version>
     10    <min-base-version>3.15.0</min-base-version>
    1111    <copyright>BASE development team</copyright>
    1212    <email>basedb-users@lists.sourceforge.net</email>
  • extensions/net.sf.basedb.opengrid/trunk/README

    r4927 r5505  
    11== Requirements ==
    22
    3  1. BASE 3.13 or later.
     3 1. BASE 3.15 or later.
     4 2. Java 11 or later.
    45 
    56== Introduction ==
     
    2829To compile this package you also need:
    2930 
    30  1. Ant 1.9
    31  2. Java 1.8
     31 1. Ant 1.10
     32 2. Java 11
    3233
    3334Follow these instructions:
  • extensions/net.sf.basedb.opengrid/trunk/build.xml

    r4936 r5505  
    1818  <property name="tar.name" value="${tar.prefix}.tar.gz" description="Full name of .tar.gz file for download." />
    1919  <property name="javac.arg" value="-Xlint:unchecked" />
    20   <property name="javac.source" value="1.8" />
    21   <property name="javac.target" value="1.8" />
     20  <property name="javac.release" value="11" />
    2221  <property name="javac.encoding" value="UTF-8" />
    2322  <property name="depend.base-version"
    24     value="3.13.0"
     23    value="3.15.0"
    2524    description="The BASE version that this project depends on."
    2625  />
     
    118117      includeantruntime="false"
    119118      classpathref="classpath"
    120       source="${javac.source}"
    121       target="${javac.target}"
     119      release="${javac.release}"
    122120      >
    123121      <compilerarg value="${javac.arg}" />
     
    175173      >
    176174      <header><![CDATA[Open Grid Scheduler package for BASE ${version}: ${TODAY}]]></header>
    177       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
     175      <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
    178176      <link href="http://base.thep.lu.se/chrome/site/latest/api/" />
    179177    </javadoc>
  • extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/service/OpenGridService.java

    r4309 r5505  
    797797    private final ExtensionsInvoker<JobCompletionHandler> invoker;
    798798   
    799     @SuppressWarnings("unchecked")
    800799    JobCompletionInvoker(SessionControl rootSc)
    801800    {
     
    805804      Registry registry = Application.getExtensionsManager().getRegistry();
    806805      Settings settings = Application.getExtensionsManager().getSettings();
    807       this.invoker = (ExtensionsInvoker<JobCompletionHandler>)registry.useExtensions(
     806      this.invoker = registry.useExtensions(
    808807          context, settings, new String[] { "net.sf.basedb.opengrid.job-complete" });
    809808    }
Note: See TracChangeset for help on using the changeset viewer.