You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/04/22 07:50:22 UTC
[openmeetings] branch master updated: no jira: build is green under java17
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 abeef2dfa no jira: build is green under java17
abeef2dfa is described below
commit abeef2dfa6b80aabd26c19460745e60837102356
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Apr 22 14:50:07 2022 +0700
no jira: build is green under java17
---
.../src/test/java/org/apache/openmeetings/util/TestDateTime.java | 5 ++++-
pom.xml | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
index b77755c0a..397d06cd5 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
@@ -83,8 +83,11 @@ class TestDateTime {
.setLanguage("fr")
.setRegion("CA")
.build();
+ final String result = Runtime.version().feature() < 17
+ ? "yy-MM-dd HH [h] mm" // java 11
+ : "y-MM-dd HH [h] mm"; // java 17
String format = AbstractOmDateTimePicker.getDateTimeFormat(loc);
- assertEquals("yy-MM-dd HH [h] mm", AbstractOmDateTimePicker.patch(format));
+ assertEquals(result, AbstractOmDateTimePicker.patch(format));
format = AbstractOmDateTimePicker.getDateTimeFormat(Locale.ENGLISH);
assertEquals(format, AbstractOmDateTimePicker.patch(format));
}
diff --git a/pom.xml b/pom.xml
index d1a31d4b2..e0c2a8022 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
<wagon-maven-plugin.version>2.0.2</wagon-maven-plugin.version>
- <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
+ <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
<replacer.version>1.5.3</replacer.version>
<xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
@@ -1239,7 +1239,7 @@
<excludes>
<exclude/>
</excludes>
- <argLine>@{argLine} --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED</argLine>
+ <argLine>@{argLine} --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/sun.security.x509=A [...]
</configuration>
</plugin>
<plugin>