Changeset 7732

Timestamp:

Jun 17, 2019, 9:36:09 AM (2 years ago)

Author:

Nicklas Nordborg

Message:

References #2139: Switch to Java 11 (or later)

Changed some references to external Javadoc and fixed an error related to Thread.stop() that no longer exists.

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• src/core/net/sf/basedb/core/signal/ThreadSignalHandler.java (modified) (1 diff)

trunk/build.xml

@@ -1027 +1027 @@
       
       <header><![CDATA[${base.version}${base.versionsuffix}: ${TODAY}]]></header>
-      <link href="http://docs.oracle.com/javase/8/docs/api/"/>
-      <link href="http://docs.jboss.org/hibernate/core/4.3/javadocs/" />
+      <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
+      <link href="https://docs.jboss.org/hibernate/orm/5.4/javadocs/" />
       <link href="http://www.jdom.org/docs/apidocs/" />
-      <link href="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/" />
-      <link href="http://tomcat.apache.org/tomcat-8.0-doc/jspapi/" />
-      <link href="http://tomcat.apache.org/tomcat-8.0-doc/api/" />
+      <link href="http://tomcat.apache.org/tomcat-9.0-doc/servletapi/" />
+      <link href="http://tomcat.apache.org/tomcat-9.0-doc/jspapi/" />
+      <link href="http://tomcat.apache.org/tomcat-9.0-doc/api/" />
       <link href="http://www.singularsys.com/jep/doc/javadoc/" />
       <link href="http://www.jfree.org/jfreechart/api/gjdoc/" />
       <link href="http://logging.apache.org/log4j/1.2/apidocs/" />
-      <link href="http://download.oracle.com/docs/cd/E17802_01/products/products/java-media/jai/forDevelopers/jai-apidocs/" />
       <tag name="base.developer" description="Developer info" />
       <tag name="base.internal" description="This class/package is not part of the Public API" scope="overview,packages,types" />
@@ -1061 +1060 @@
       <tag name="hibernate.collection-one-to-many" description="Hibernate: collection-one-to-many" scope="methods" />
       <tag name="hibernate.collection-many-to-many" description="Hibernate: collection-many-to-many" scope="methods" />
+      <tag name="hibernate.component" description="Hibernate: component" scope="methods" />
       <tag name="hibernate.bag" description="Hibernate: bag" scope="methods" />
       <tag name="hibernate.many-to-any" description="Hibernate: many-to-any" scope="methods" />
       <tag name="hibernate.many-to-any-column" description="Hibernate: many-to-any-column" scope="methods" />
-      <!-- The below tags are needed to get rid of javadoc warnings for all tags with a hyphen (hibernate.many-to-one, etc.) -->
-      <tag name="hibernate.component" description="Hibernate: component" scope="methods" />
-      <tag name="hibernate.many" description="Hibernate: many" scope="methods" />
-      <tag name="hibernate.collection" description="Hibernate: collection" scope="methods" />
-      <tag name="hibernate.index" description="Hibernate: index" scope="methods" />
-      <tag name="hibernate.one" description="Hibernate: one" scope="methods" />
-      <tag name="hibernate.generator" description="Hibernate: one" scope="methods" />
     </javadoc>
   </target>

trunk/src/core/net/sf/basedb/core/signal/ThreadSignalHandler.java

@@ -223 +223 @@
   
   /**
-    Call this method with a true value to make the signal handler
-    use {@link Thread#stop(Throwable)} instead of {@link Thread#interrupt()}.
-    Note that the <code>Thread.stop</code> method is deprecated and it is not
-    recommended that it is used. For some plug-ins though this may be the
-    only option, if they are mainly executing code outside of their control
-    which doesn't check the {@link Thread#interrupted()} status. The exception
-    passed to the thread will be a {@link InterruptedException}.
-    @param forceStop TRUE to stop the thread by force, FALSE to signal to
-      it with a flag
+    Thread.stop() has been removed from the Java API.
     @deprecated In 3.14. Calling this is ignored and the signal handler will always use the interrupt method.
   */