adding support for java 17

Evolveum · Sep 23, 2021 · 72d5082 · 72d5082
1 parent 03ce167
commit 72d5082
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -146,6 +146,10 @@ private static SpringApplicationBuilder configureApplication(SpringApplicationBu
 
         application.bannerMode(Banner.Mode.LOG);
 
+        // cglib used by wicket unsupport java 15+ so we need use byte buddy generation for wicket
+        // We can remove this after cglib(wicket) fix issue with java 15+ or when wicket will use byte buddy as default
+        System.setProperty("wicket.ioc.useByteBuddy", "true");
+
         return application.sources(MidPointSpringApplication.class);
     }
 

diff --git a/...va/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java b/...va/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
@@ -45,8 +45,7 @@ public Jsr223ScriptEvaluator(String engineName, PrismContext prismContext,
         LOGGER.debug("Script engine for '{}' initialized in {} ms.",
                 engineName, System.currentTimeMillis() - initStartMs);
         if (scriptEngine == null) {
-            SystemException e = new SystemException("The JSR-223 scripting engine for '" + engineName + "' was not found");
-            LOGGER.error(e.getMessage(), e);
+            LOGGER.warn("The JSR-223 scripting engine for '" + engineName + "' was not found");
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -207,7 +207,7 @@
         -->
         <h2.version>1.4.193</h2.version>
         <!-- Spring Boot parent declares most fresh versions for JDBC drivers for all our servers -->
-        <wicket.version>9.3.0</wicket.version>
+        <wicket.version>9.5.0</wicket.version>
         <wicket.chartjs.version>0.1</wicket.chartjs.version>
         <!-- Groovy 3.0.8 is also default for Spring Boot 2.5.0 -->
         <groovy.version>3.0.8</groovy.version>