This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new fdc7e9ac0 [OPENMEETINGS-2734] updated to java17 fdc7e9ac0 is described below commit fdc7e9ac04a8a87b7776c4f8005bbba7fd59217d Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Tue May 17 22:47:36 2022 +0700 [OPENMEETINGS-2734] updated to java17 --- README.md | 4 ++-- openmeetings-server/src/site/xdoc/BuildInstructions.xml | 2 +- openmeetings-server/src/site/xdoc/ReleaseGuide.xml | 2 +- openmeetings-server/src/site/xdoc/WebsiteGuide.xml | 2 +- openmeetings-server/src/site/xdoc/installation.xml | 4 ++-- .../{Application_iw.properties.xml => Application_he.properties.xml} | 0 .../{Application_in.properties.xml => Application_id.properties.xml} | 0 openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +- openmeetings-web/src/main/webapp/languages/languages.xml | 4 ++-- pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8d6316476..9848c28ae 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Along with the developer mailing list archive: System Requirements =================== -You need a platform that supports [Java SE 11](https://www.oracle.com/java/technologies/javase-downloads.html). +You need a platform that supports [Java SE 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html). Building and running @@ -32,7 +32,7 @@ Building and running To build from source code: - Requirements: - Sources compilation require `Java SE 11`, [Apache Maven 3.5.0 or later](https://maven.apache.org/). + Sources compilation require `Java SE 17`, [Apache Maven 3.5.0 or later](https://maven.apache.org/). - To build the OpenMeetings project run mvn in the root directory: `mvn clean install -PallModules` - To run the OpenMeetings project: diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml index 08048517c..0acde5705 100644 --- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml +++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml @@ -32,7 +32,7 @@ <div> <p>To build a binary release of OpenMeetings you need: </p> <ul> - <li>Oracle JDK11</li> + <li>Oracle JDK17</li> <li>Apache Maven (minimum) 3.5.0</li> <li>Git</li> </ul> diff --git a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml index 62b117ed1..79aba0e0d 100644 --- a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml +++ b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml @@ -26,7 +26,7 @@ <div> <p>To build a binary release of OpenMeetings you need: </p> <ul> - <li>JDK11</li> + <li>JDK17</li> <li>Apache Maven 3.5.0</li> <li>Git Command line client</li> <li>A text editor</li> diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml index b54591058..74d5e0bac 100644 --- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml +++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml @@ -24,7 +24,7 @@ <subsection name="Required tools"> <div> <ul> - <li>JDK11</li> + <li>JDK17</li> <li>Apache Maven (3.5.0 or later)</li> </ul> </div> diff --git a/openmeetings-server/src/site/xdoc/installation.xml b/openmeetings-server/src/site/xdoc/installation.xml index eaa33dc3a..da35f1d56 100644 --- a/openmeetings-server/src/site/xdoc/installation.xml +++ b/openmeetings-server/src/site/xdoc/installation.xml @@ -38,7 +38,7 @@ </li> <li class="step download os"> <div><a href="downloads.html" rel="nofollow">Download latest .zip (.tar.gz)</a></div> - <div class="small">Java 11 required</div> + <div class="small">Java 17 required</div> </li> <li class="step unpack"> <div>Unpack + run bin/startup.bat (.sh)</div> @@ -66,7 +66,7 @@ </script> </div> <p> - <i>Note: Openmeetings requires JRE 11, JRE 6/7/8 are NOT compatible!</i><br /> + <i>Note: Openmeetings requires JRE 17, JRE 6/7/8/11 are NOT compatible!</i><br /> <i> Since Version 2.0 you can also install OpenMeetings from command line. Just cd to the unpacked archive and type ./admin.sh or admin.bat, please see diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml similarity index 100% rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml similarity index 100% rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml index 0e64c1891..e44aa1609 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml @@ -21,7 +21,7 @@ <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.hazelcast.com/schema/config" - xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-5.0.xsd" + xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-5.1.xsd" > <map name="ONLINE_USERS_KEY"> <near-cache> diff --git a/openmeetings-web/src/main/webapp/languages/languages.xml b/openmeetings-web/src/main/webapp/languages/languages.xml index bc1593ae1..601352d91 100644 --- a/openmeetings-web/src/main/webapp/languages/languages.xml +++ b/openmeetings-web/src/main/webapp/languages/languages.xml @@ -34,7 +34,7 @@ <lang id="13" code="ko" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">korean</lang> <lang id="14" code="ar" tip="ادخل الرمز هنا" rangeStart="1" rangeEnd="9">عربي</lang> <lang id="15" code="ja" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">japanese</lang> - <lang id="16" code="in" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">indonesian</lang> + <lang id="16" code="id" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">indonesian</lang> <lang id="17" code="hu" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">hungarian</lang> <lang id="18" code="tr" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">turkish</lang> <lang id="19" code="uk" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">ukrainian</lang> @@ -46,7 +46,7 @@ <lang id="25" code="pl" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">polish</lang> <lang id="26" code="el" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">greek</lang> <lang id="27" code="nl" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">dutch</lang> - <lang id="28" code="iw" tip="Only capital Latin letters A-Z" rangeStart="א" rangeEnd="ת">hebrew</lang> + <lang id="28" code="he" tip="Only capital Latin letters A-Z" rangeStart="א" rangeEnd="ת">hebrew</lang> <lang id="29" code="ca" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">catalan</lang> <lang id="30" code="bg" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">bulgarian</lang> <lang id="31" code="da" tip="Only capital Latin letters A-Z" rangeStart="A" rangeEnd="Z">danish</lang> diff --git a/pom.xml b/pom.xml index 5b1496395..105c03225 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <logback.console></logback.console> <db>h2</db> <autoModuleName>apache.openmeetings.parent</autoModuleName> - <jdk.version>11</jdk.version> + <jdk.version>17</jdk.version> <!-- plugin versions --> <maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version> <maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version>