Merge pull request #1028 from guusdk/OF-1421_Drop-java-7-support

OF-1421: Drop Java 7 support, require Java 8.

build/build.xml

@@ -9,7 +9,7 @@
     Build Requirements:
 
         * Ant 1.7.1 or higher (including optional tasks)
-        * JDK 1.7 or higher
+        * JDK 1.8 or higher
         * jUnit in your Ant or Java classpath
 -->
 
@@ -28,8 +28,8 @@
     <property name="version.revision" value="0"/>
     <property name="version.extra" value="alpha"/>    <!-- For 'beta' or 'alpha' -->
 
-    <property name="javac.source" value="1.7"/>
-    <property name="javac.target" value="1.7"/>
+    <property name="javac.source" value="1.8"/>
+    <property name="javac.target" value="1.8"/>
     <property name="dist.prefix" value="openfire"/>
 
     <property file="${basedir}/build/build.properties"/>
@@ -295,7 +295,7 @@
             </not>
         </condition>
         <fail if="ant.not.ok" message="Must use Ant 1.7.1 or higher to build Openfire"/>
-        <fail if="java.not.ok" message="Must use JDK 1.7 or higher to build Openfire"/>
+        <fail if="java.not.ok" message="Must use JDK 1.8 or higher to build Openfire"/>
 
         <tstamp/>
         <tstamp>
@@ -591,8 +591,8 @@
             <classpath>
                 <path refid="javadoc.dependencies"/>
             </classpath>
-            <link offline="true" href="http://docs.oracle.com/javase/7/docs/api/"
-                  packagelistLoc="${javadoc.src.dir}/jdk15"/>
+            <link offline="true" href="http://docs.oracle.com/javase/8/docs/api/"
+                  packagelistLoc="${javadoc.src.dir}/jdk18"/>
         </javadoc>
     </target>
 

build/debian/control

@@ -2,14 +2,14 @@ Source: openfire
 Section: net
 Priority: optional
 Maintainer: Ignite Realtime Community <admin@igniterealtime.org>
-Build-Depends: debhelper (>= 5), cdbs, patchutils, default-jdk (>= 1.7), ant
+Build-Depends: debhelper (>= 5), cdbs, patchutils, default-jdk (>= 1.8), ant
 Standards-Version: 3.7.2
 Homepage: http://www.igniterealtime.org
 
 Package: openfire
 Section: net
 Priority: optional
-Pre-Depends: default-jre-headless (>= 1.7) | java7-runtime-headless | java7-runtime | java8-runtime-headless | java8-runtime | java9-runtime-headless | java9-runtime
+Pre-Depends: default-jre-headless (>= 1.8) | java8-runtime-headless | java8-runtime | java9-runtime-headless | java9-runtime
 Architecture: all
 Description: A high performance XMPP (Jabber) server.
  Openfire is an instant messaging server that implements the XMPP

build/rpm/openfire.spec

@@ -10,7 +10,7 @@ Source1: %{JRE_BUNDLE}
 %ifarch noarch
 # Note that epoch is set here to 1, this appears to be consistent with non-Redhat
 # jres as well due to an ancient problem with java-1.5.0-ibm jpackage RPM
-Requires: java >= 1:1.7.0
+Requires: java >= 1:1.8.0
 %endif
 Group: Applications/Communications
 Vendor: Igniterealtime Community

distribution/src/installer/openfire.install4j

 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="7.0.2" transformSequenceNumber="7">
   <directoryPresets config="${compiler:RELEASE_FULL_PATH}/resources/security/truststore" />
-  <application name="${compiler:APP_NAME}" distributionSourceDir="" applicationId="${compiler:APPLICATION_ID}" mediaDir="../../target/distributions" mediaFilePattern="${compiler:FILE_PREFIX}_${compiler:sys.version}" compression="9" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="${compiler:APP_SHORT_NAME}" publisher="${compiler:PUBLISHER}" publisherWeb="${compiler:PUBLISHER_URL}" version="undefined" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="419a18ebe125f2bf" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="true" jdkMode="runtimeJre" jdkName="">
+  <application name="${compiler:APP_NAME}" distributionSourceDir="" applicationId="${compiler:APPLICATION_ID}" mediaDir="../../target/distributions" mediaFilePattern="${compiler:FILE_PREFIX}_${compiler:sys.version}" compression="9" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="${compiler:APP_SHORT_NAME}" publisher="${compiler:PUBLISHER}" publisherWeb="${compiler:PUBLISHER_URL}" version="undefined" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="419a18ebe125f2bf" javaMinVersion="1.8" javaMaxVersion="" allowBetaVM="true" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages>

documentation/docs/source-build.html

@@ -55,11 +55,11 @@ possible, instructions are provided for both Unix/Linux and Windows users.
 
 <b><a name="javaSetup">Configure Java for Openfire</a></b>
 <ul>
-    Java 5 (JDK 1.5) must be installed and setup on your machine. To test the installation,
+    Java 8 (JDK 1.8) must be installed and setup on your machine. To test the installation,
     open a shell in a Unix or a MS-DOS prompt in Windows. Check your version of
-    Java with "java -version" -- it must version 1.5 or greater.
+    Java with "java -version" -- it must version 1.8 or greater.
     If Java isn't installed, download a copy from the
-    <a href="http://java.sun.com/">Java website</a>.
+    <a href="http://www.oracle.com/technetwork/java/javase/overview/index.html">Java website</a>.
     <p>
     <font color="red">Important!</font> -- the Openfire build tool needs to know
     where Java is installed on your system. You must configure the "JAVA_HOME"
@@ -75,10 +75,10 @@ possible, instructions are provided for both Unix/Linux and Windows users.
                 <li>Set the JAVA_HOME environment variable by adding the
                     following line to the file:
                     <p><span class="code">
-                    export JAVA_HOME=/usr/local/jdk1.5
+                    export JAVA_HOME=/usr/local/jdk1.8
                     </span>
                     <p>
-                    The value "/usr/local/jdk1.5" should be replaced with your actual
+                    The value "/usr/local/jdk1.8" should be replaced with your actual
                     Java directory. Be sure there are no spaces after the end of
                     the directory name. Do not add an extra slash after the directory name.
                 <li>Save changes to the file and then "source" it:
@@ -99,7 +99,7 @@ possible, instructions are provided for both Unix/Linux and Windows users.
                 <li>Click the "New..." button in the System variables section.
                     Enter the variable name "JAVA_HOME" and set the variable
                     value to the full path of your Java installation. For example,
-                    "c:\jdk1.5". Be sure to not add an extra slash to the end
+                    "c:\jdk1.8". Be sure to not add an extra slash to the end
                     of the directory name.
                 <li>Click "OK" in all of the menus to accept the changes.
                 <li>Close any open command prompt windows. The next time you
@@ -113,10 +113,10 @@ possible, instructions are provided for both Unix/Linux and Windows users.
                 <li>Open your autoexec.bat file (often at "c:\autoexec.bat") using Notepad.
                 <li>Add a line to the end of the file that resembles the following:
                     <p><span class="code">
-                    set JAVA_HOME=c:\jdk1.5
+                    set JAVA_HOME=c:\jdk1.8
                     </span>
                     <p>
-                    The value "c:\jdk1.5" should be replaced with your actual
+                    The value "c:\jdk1.8" should be replaced with your actual
                     Java directory. Be sure there are no spaces between
                     the "=" sign or after the end of the directory name. Do
                     not add an extra slash after the directory name.

documentation/docs/ssl-guide.html

@@ -26,7 +26,7 @@
 This document outlines how to <b>manually</b> customize the SSL support in
 Openfire. As of Openfire 3.2 certificate management can be performed from the
 Admin Console. However, if needed you can still manually manage certificates
-using JDK 1.5 tools.
+using Java Develpment Kit (JDK) tools.
 
 <font color="red"><b>Important note:</b></font>
 Once the setup process is completed Openfire will create self-signed certificates
@@ -36,7 +36,7 @@ with your own certificates.</p>
 
 <p>Openfire's SSL support is built using the standard Java security
 SSL implementation (javax.net.ssl.SSLServerSocket). In this document, we will
-describe how use the standard JDK 1.5 tools to accomplish these tasks.
+describe how use the standard Java Development Kit (JDK) tools to accomplish these tasks.
 </p>
 <h2>Background</h2>
 <p>
@@ -91,12 +91,12 @@ servers they've never interacted with before. Certificate signing is similar
 to a public notary (with equivalent amounts of verification of identity,
 record keeping, and costs).
 </p>
-<h2>Sun JDK 1.5 security tools</h2>
+<h2>Oracle Java Development Kit security tools</h2>
 <p>
-The Sun JDK (version 1.5.x) ships with all the security tools you need
+The Oracle JDK ships with all the security tools you need
 to configure SSL with Openfire. The most important is the
 <tt>keytool</tt> located in the <tt>JAVA_HOME/bin directory</tt> of the
-JDK. Sun JVMs persist keystores and truststores on the filesystem as
+JDK. Java Virtual Machines persist keystores and truststores on the filesystem as
 encrypted files. The <tt>keytool</tt> is used to create, read, update,
 and delete entries in these files. Openfire ships with a self-signed
 "dummy" certificate designed for initial evaluation testing. You will need

pom.xml

@@ -265,8 +265,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
 

src/i18n/openfire_i18n_cs_CZ.properties

@@ -1187,7 +1187,7 @@ setup.title=Nastavení
 
 setup.env.check.error=Chyba: Nemůžete pokračovat
 setup.env.check.error_info=Vaše současné instalace nesplňuje minimální požadavky Openfire - prosím prohlédněte si dole kontrolní seznam:
-setup.env.check.jdk=JDK nejméně 1.5
+setup.env.check.jdk=JRE nejméně 1.8
 setup.env.check.servlet=Podpora servletů 2.3
 setup.env.check.jsp=Podpora JSP 1.2
 setup.env.check.class=Třídy
@@ -1491,7 +1491,7 @@ setup.index.info=Vítejte v nastavení {0}. Tento nástroj vás provede úvodní
 setup.index.success=Úspěch
 setup.index.error=Chyba
 setup.index.vm=Podpora Java VM
-setup.index.jdk=Nejméně JDK 1.5
+setup.index.jdk=Nejméně JRE 1.8
 setup.index.found=Nalezeno: JVM
 setup.index.class=Třídy
 setup.index.con_file=Konfigurační soubory

src/i18n/openfire_i18n_de.properties

@@ -1135,7 +1135,7 @@ setup.title=Konfiguration
 
 setup.env.check.error=Fehler: Kann nicht fortfahren mit
 setup.env.check.error_info=Die aktuelle Installation erfüllt die Mindestanforderungen nicht - Checkliste:
-setup.env.check.jdk=Mindestens JDK 1.5
+setup.env.check.jdk=Mindestens JRE 1.8
 setup.env.check.servlet=Servlet 2.3 Unterstützung
 setup.env.check.jsp=JSP 1.2 Unterstützung
 setup.env.check.class=Klassen
@@ -1430,7 +1430,7 @@ setup.index.info=Wilkommen zum {0} Setup. Dieses Werkzeug wird durch das initial
 setup.index.success=Erfolg
 setup.index.error=Fehler
 setup.index.vm=Java VM Unterstützung
-setup.index.jdk=Mindestens JDK 1.5
+setup.index.jdk=Mindestens JRE 1.8
 setup.index.found=Gefunden: JVM
 setup.index.class=Klassen
 setup.index.con_file=Konfigurationsdateien

src/i18n/openfire_i18n_en.properties

@@ -1909,7 +1909,7 @@ setup.invalid_session=A failure occurred while fetching your session from the se
 
 setup.env.check.error=Error: Can not proceed with
 setup.env.check.error_info=Your current installation fails to meet minimum server requirements - please see the checklist below:
-setup.env.check.jdk=At least JDK 1.5
+setup.env.check.jdk=At least JRE 1.8
 setup.env.check.servlet=Servlet 2.3 Support
 setup.env.check.jsp=JSP 1.2 Support
 setup.env.check.class=Classes
@@ -2235,7 +2235,7 @@ setup.index.info=Welcome to {0} Setup. This tool will lead you through the initi
 setup.index.success=Success
 setup.index.error=Error
 setup.index.vm=Java VM Support
-setup.index.jdk=At least JDK 1.5
+setup.index.jdk=At least JRE 1.8
 setup.index.found=Found: JVM
 setup.index.class=Classes
 setup.index.con_file=Configuration Files

src/i18n/openfire_i18n_es.properties

@@ -1358,7 +1358,7 @@ setup.title=Configuración
 
 setup.env.check.error=Error: No se puede seguir con
 setup.env.check.error_info=Su instalación actual no cumple con los requerimientos mínimos para el Openfire - por favor vea la lista siguiente:
-setup.env.check.jdk=Por lo menos JDK 1.5
+setup.env.check.jdk=Por lo menos JRE 1.8
 setup.env.check.servlet=Sporte para Servlet 2.3
 setup.env.check.jsp=Soporte para JSP 1.2
 setup.env.check.class=Clases
@@ -1682,7 +1682,7 @@ setup.index.info=Bienvenido a la configuración de {0}. Esta herramienta lo guia
 setup.index.success=Éxito
 setup.index.error=Error
 setup.index.vm=Spoporte de Java VM
-setup.index.jdk=Por lo menos JDK 1.5
+setup.index.jdk=Por lo menos JRE 1.8
 setup.index.found=Encontrado: JVM
 setup.index.class=Clases
 setup.index.con_file=Archivos de Configuración

src/i18n/openfire_i18n_fr.properties

@@ -991,7 +991,7 @@ setup.title = Paramétrage
 # Setup environment check
 setup.env.check.error = Erreur \: Ne peut poursuivre avec
 setup.env.check.error_info = Votre installation ne compporte pas les pré-requis minimums pour Openfire  - Veuillez consulter la liste ci-dessous \:
-setup.env.check.jdk = Au mois le JDK 1.5
+setup.env.check.jdk = Au mois le JRE 1.8
 setup.env.check.servlet = Support de Servlet 2.3
 setup.env.check.jsp = Support de JSP 1.2
 setup.env.check.class = Classes
@@ -1199,7 +1199,7 @@ setup.index.info = Bienvenue dans le Paramétrage de {0}. Cet outil vous guidera
 setup.index.success = Succès
 setup.index.error = Erreur
 setup.index.vm = Support de Java VM
-setup.index.jdk = Au moins JDK 1.5
+setup.index.jdk = Au moins JRE 1.8
 setup.index.found = Trouvé \: JVM
 setup.index.class = Classes
 setup.index.con_file = Fichiers de Configuration

src/i18n/openfire_i18n_ja_JP.properties

@@ -1209,7 +1209,7 @@ setup.title=設定
 
 setup.env.check.error=エラー: 継続することはできません。
 setup.env.check.error_info=現在のインストールは、インストールの最小要求を満たしていないため、失敗しました。- 次のチェックリストを確認してください。:
-setup.env.check.jdk=少なくともJDK 1.5以上か。
+setup.env.check.jdk=少なくともJRE 1.8以上か。
 setup.env.check.servlet=サーブレット2.3がサポートされているか。
 setup.env.check.jsp=JSP1.2がサポートされているか。
 setup.env.check.class=クラス
@@ -1506,7 +1506,7 @@ setup.index.info=ようこそ、{0} セットアップへ。このツールに
 setup.index.success=成功
 setup.index.error=エラー
 setup.index.vm=Java VM サポート
-setup.index.jdk=少なくとも JDK 1.5
+setup.index.jdk=少なくとも JRE 1.8
 setup.index.found=見つかりました: JVM
 setup.index.class=クラス
 setup.index.con_file=設定ファイル

src/i18n/openfire_i18n_nl.properties

@@ -1138,7 +1138,7 @@ setup.title=Installatie
 
 setup.env.check.error=Fout: Can niet doorgaan met
 setup.env.check.error_info=Uw huidige installatie haalt niet de minimum systeemeisen van Openfire - zie de onderstaande controlelijst:
-setup.env.check.jdk=Minstens JDK 1.5
+setup.env.check.jdk=Minstens JRE 1.8
 setup.env.check.servlet=Ondersteuning voor Servlet 2.3
 setup.env.check.jsp=Ondersteuning voor JSP 1.2
 setup.env.check.class=Klassen
@@ -1429,7 +1429,7 @@ setup.index.info=Welkom bij de {0} installatie. Dit programma helpt u doorheen h
 setup.index.success=Succes
 setup.index.error=Fout
 setup.index.vm=Java VM ondersteuning
-setup.index.jdk=Minstens JDK 1.5
+setup.index.jdk=Minstens JRE 1.8
 setup.index.found=Gevonden: JVM
 setup.index.class=Onderdelen
 setup.index.con_file=Configuratiebestanden

src/i18n/openfire_i18n_pl_PL.properties

@@ -1128,7 +1128,7 @@ setup.title=Konfiguracja
 
 setup.env.check.error=Błąd: Nie można kontynuować z
 setup.env.check.error_info=Twoja instalacja nie spełnia wymagań serwera Openfire - zobacz listę poniżej:
-setup.env.check.jdk=JDK conajmniej w wesji 1.5
+setup.env.check.jdk=JRE conajmniej w wesji 1.8
 setup.env.check.servlet=Wsparcie dla Servlet 2.3
 setup.env.check.jsp=Wsparcie dla JSP 1.2
 setup.env.check.class=Klasy
@@ -1410,7 +1410,7 @@ setup.index.info=Witamy w  {0} Konfiguracji. Narzędzie to poprowadzi cię przez
 setup.index.success=Sukces
 setup.index.error=Błąd
 setup.index.vm=Wsparcie dla maszyny wirtualnej Java
-setup.index.jdk=Przynajmniej JDK 1.5
+setup.index.jdk=Przynajmniej JRE 1.8
 setup.index.found=Znaleziono: JVM
 setup.index.class=Klasy
 setup.index.con_file=Pliki konfiguracyjne

src/i18n/openfire_i18n_pt_BR.properties

@@ -1186,7 +1186,7 @@ setup.title=Setup
 
 setup.env.check.error=Error: Não é possível proceder com
 setup.env.check.error_info=Sua instalação atual não atingiu os requisitos mínimos do Openfire - por favor veja a lista abaixo:
-setup.env.check.jdk=Pelo menos JDK 1.5
+setup.env.check.jdk=Pelo menos JRE 1.8
 setup.env.check.servlet=Suporte a Servlet 2.3
 setup.env.check.jsp=Suporte a JSP 1.2
 setup.env.check.class=Classes
@@ -1490,7 +1490,7 @@ setup.index.info=Bem vindo ao {0} Setup. Esta ferramenta lhe guiará na configur
 setup.index.success=Successo
 setup.index.error=Erro
 setup.index.vm=Suporte ao Java VM
-setup.index.jdk=Pelo menos JDK 1.5
+setup.index.jdk=Pelo menos JRE 1.8
 setup.index.found=Encontrado: JVM
 setup.index.class=Classes
 setup.index.con_file=Arquivos de Configuração

src/i18n/openfire_i18n_pt_PT.properties

@@ -1754,7 +1754,7 @@ setup.title=Configuração
 
 setup.env.check.error=Erro: Não é possível proceder com
 setup.env.check.error_info=A sua instalação atual não atingiu os requisitos mínimos do Openfire - verifique a lista abaixo:
-setup.env.check.jdk=Pelo menos JDK 1.5
+setup.env.check.jdk=Pelo menos JRE 1.8
 setup.env.check.servlet=Suporte a Servlet 2.3
 setup.env.check.jsp=Suporte a JSP 1.2
 setup.env.check.class=Classes
@@ -2072,7 +2072,7 @@ setup.index.info=Bem vindo ao {0} Setup. Esta ferramenta vai ajudar na configura
 setup.index.success=Successo
 setup.index.error=Erro
 setup.index.vm=Suporte ao Java VM
-setup.index.jdk=Pelo menos JDK 1.5
+setup.index.jdk=Pelo menos JRE 1.8
 setup.index.found=Encontrado: JVM
 setup.index.class=Classes
 setup.index.con_file=Ficheiros de Configuração

src/i18n/openfire_i18n_ru_RU.properties

@@ -1410,7 +1410,7 @@ setup.invalid_session=Произошел сбой при получении се
 
 setup.env.check.error=Ошибка: не удается выполнить
 setup.env.check.error_info=Текущая установка не отвечает минимальным требованиям к серверу - см. контрольный список ниже:
-setup.env.check.jdk=Как минимум, JDK 1.5
+setup.env.check.jdk=Как минимум, JRE 1.8
 setup.env.check.servlet=Поддержка Servlet 2.3
 setup.env.check.jsp=Поддержка JSP 1.2
 setup.env.check.class=Классы
@@ -1723,7 +1723,7 @@ setup.index.info=Добро пожаловать в программу уста
 setup.index.success=Успех
 setup.index.error=Ошибка
 setup.index.vm=Поддержка Java
-setup.index.jdk=Как минимум, JDK 1.5
+setup.index.jdk=Как минимум, JRE 1.8
 setup.index.found=Найдено: JVM
 setup.index.class=Классы
 setup.index.con_file=Файлы конфигурации

src/i18n/openfire_i18n_sk.properties

@@ -1160,7 +1160,7 @@ setup.title=Nastavenie
 
 setup.env.check.error=Chyba: Nie je možné pokračovať
 setup.env.check.error_info=Vaša momentálna inštalácia nespĺňa minimálne požiadavky servera - prosím, skontrolujte tento zoznam:
-setup.env.check.jdk=Aspoň JDK 1.5
+setup.env.check.jdk=Aspoň JRE 1.8
 setup.env.check.servlet=Podpora Servlet 2.3
 setup.env.check.jsp=Podpora JSP 1.2
 setup.env.check.class=Triedy
@@ -1403,7 +1403,7 @@ setup.index.info=Vitajte pri inštalácii {0}. Tento nástroj vás prevedie prvo
 setup.index.success=Úspešné
 setup.index.error=Chyba
 setup.index.vm=Podpora Java VM
-setup.index.jdk=Aspoň JDK 1.5
+setup.index.jdk=Aspoň JRE 1.8
 setup.index.found=Nájdené: JVM
 setup.index.class=Triedy
 setup.index.con_file=Konfiguračné súbory

src/i18n/openfire_i18n_zh_CN.properties

@@ -1265,7 +1265,7 @@ setup.title=设置
 
 setup.env.check.error=错误：不能继续进行下一步操作
 setup.env.check.error_info=当前的安装无法满足Jive Openfire的最低要求-请查看下面的清单:
-setup.env.check.jdk=至少是JDK1.5
+setup.env.check.jdk=至少是JRE1.8
 setup.env.check.servlet=支持Servlet 2.3
 setup.env.check.jsp=支持JSP 1.2
 setup.env.check.class=类
@@ -1520,7 +1520,7 @@ setup.index.info=欢迎{0}设置。本工具将引导进行服务器的初始化
 setup.index.success=成功
 setup.index.error=错误
 setup.index.vm=Java VM 支持
-setup.index.jdk=至少 JDK 1.5
+setup.index.jdk=至少 JRE 1.8
 setup.index.found=找到：JVM
 setup.index.class=类
 setup.index.con_file=配置文件

src/java/org/jivesoftware/openfire/group/ConcurrentGroupMap.java

@@ -124,7 +124,7 @@ public class ConcurrentGroupMap<K, V> extends ConcurrentHashMap<K, V>  implement
                 if (result == null) {
                     result = new HashSet<>();
                     // add all the groups into the group set
-                    Iterator<K> iterator = ((ConcurrentMap) this).keySet().iterator(); // Cast prevents Java compatibility issue as described in OF-1116. Remove the cast when Java 7 support is dropped from Openfire.
+                    Iterator<K> iterator = keySet().iterator();
                     while (iterator.hasNext()) {
                         K key = iterator.next();
                         Group group = Group.resolveFrom(key);

src/javadoc/jdk15/package-list → src/javadoc/jdk18/package-list

@@ -17,6 +17,7 @@ java.io
 java.lang
 java.lang.annotation
 java.lang.instrument
+java.lang.invoke
 java.lang.management
 java.lang.ref
 java.lang.reflect
@@ -27,6 +28,9 @@ java.nio.channels
 java.nio.channels.spi
 java.nio.charset
 java.nio.charset.spi
+java.nio.file
+java.nio.file.attribute
+java.nio.file.spi
 java.rmi
 java.rmi.activation
 java.rmi.dgc
@@ -39,17 +43,29 @@ java.security.interfaces
 java.security.spec
 java.sql
 java.text
+java.text.spi
+java.time
+java.time.chrono
+java.time.format
+java.time.temporal
+java.time.zone
 java.util
 java.util.concurrent
 java.util.concurrent.atomic
 java.util.concurrent.locks
+java.util.function
 java.util.jar
 java.util.logging
 java.util.prefs
 java.util.regex
+java.util.spi
+java.util.stream
 java.util.zip
 javax.accessibility
+javax.activation
 javax.activity
+javax.annotation
+javax.annotation.processing
 javax.crypto
 javax.crypto.interfaces
 javax.crypto.spec
@@ -60,6 +76,12 @@ javax.imageio.plugins.bmp
 javax.imageio.plugins.jpeg
 javax.imageio.spi
 javax.imageio.stream
+javax.jws
+javax.jws.soap
+javax.lang.model
+javax.lang.model.element
+javax.lang.model.type
+javax.lang.model.util
 javax.management
 javax.management.loading
 javax.management.modelmbean
@@ -83,6 +105,7 @@ javax.print.event
 javax.rmi
 javax.rmi.CORBA
 javax.rmi.ssl
+javax.script
 javax.security.auth
 javax.security.auth.callback
 javax.security.auth.kerberos
@@ -108,6 +131,7 @@ javax.swing.plaf
 javax.swing.plaf.basic
 javax.swing.plaf.metal
 javax.swing.plaf.multi
+javax.swing.plaf.nimbus
 javax.swing.plaf.synth
 javax.swing.table
 javax.swing.text
@@ -116,17 +140,43 @@ javax.swing.text.html.parser
 javax.swing.text.rtf
 javax.swing.tree
 javax.swing.undo
+javax.tools
 javax.transaction
 javax.transaction.xa
 javax.xml
+javax.xml.bind
+javax.xml.bind.annotation
+javax.xml.bind.annotation.adapters
+javax.xml.bind.attachment
+javax.xml.bind.helpers
+javax.xml.bind.util
+javax.xml.crypto
+javax.xml.crypto.dom
+javax.xml.crypto.dsig
+javax.xml.crypto.dsig.dom
+javax.xml.crypto.dsig.keyinfo
+javax.xml.crypto.dsig.spec
 javax.xml.datatype
 javax.xml.namespace
 javax.xml.parsers
+javax.xml.soap
+javax.xml.stream
+javax.xml.stream.events
+javax.xml.stream.util
 javax.xml.transform
 javax.xml.transform.dom
 javax.xml.transform.sax
+javax.xml.transform.stax
 javax.xml.transform.stream
 javax.xml.validation
+javax.xml.ws
+javax.xml.ws.handler
+javax.xml.ws.handler.soap
+javax.xml.ws.http
+javax.xml.ws.soap
+javax.xml.ws.spi
+javax.xml.ws.spi.http
+javax.xml.ws.wsaddressing
 javax.xml.xpath
 org.ietf.jgss
 org.omg.CORBA
@@ -161,6 +211,7 @@ org.w3c.dom
 org.w3c.dom.bootstrap
 org.w3c.dom.events
 org.w3c.dom.ls
+org.w3c.dom.views
 org.xml.sax
 org.xml.sax.ext
 org.xml.sax.helpers

src/plugins/pom.xml

@@ -237,8 +237,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.3</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>

src/web/setup/setup-env-check.jspf

@@ -8,19 +8,21 @@
 
 <%  // Check the user's environment for minimum requirements.
 
-    boolean jdk13Installed = false;
+    boolean jreVersionCompatible = false;
     boolean servlet22Installed = false;
     boolean jsp11Installed = false;
     boolean jiveJarsInstalled = false;
     boolean openfireHomeExists = false;
     File openfireHome = null;
 
-    // Check for JDK 1.5
+    // Check for JRE 1.8
     try {
-        ClassUtils.forName("java.util.concurrent.ConcurrentHashMap");
-        jdk13Installed = true;
+        String version = System.getProperty("java.version");
+        int pos = version.indexOf('.');
+        pos = version.indexOf('.', pos+1);
+        jreVersionCompatible = Double.parseDouble ( version.substring ( 0, pos)) >= 1.8;
     }
-    catch (ClassNotFoundException cnfe) {}
+    catch (Throwable t) {}
     // Check for Servlet 2.3:
     try {
         Class c = ClassUtils.forName("javax.servlet.http.HttpSession");
@@ -58,7 +60,7 @@
     }
 
     // If there were no errors, redirect to the main setup page
-    if (!jdk13Installed || !servlet22Installed || !jsp11Installed || !jiveJarsInstalled
+    if (!jreVersionCompatible || !servlet22Installed || !jsp11Installed || !jiveJarsInstalled
             || !openfireHomeExists)
     {
         pageContext.setAttribute( "localizedTitle", LocaleUtils.getLocalizedString("title") );
@@ -86,7 +88,7 @@
 
         <ul>
         <table cellpadding="3" cellspacing="2" border="0">
-        <%  if (jdk13Installed) { %>
+        <%  if ( jreVersionCompatible ) { %>
 
             <tr>
                 <td><img src="../images/check.gif" width="13" height="13" border="0"></td>