WIP

Signed-off-by: Oleh Astappiev <[email protected]>
l3s-learnweb · Dec 15, 2024 · 8c2f9cb · 8c2f9cb
1 parent 7914670
commit 8c2f9cb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   webapp:
-    image: tomcat:10.1-jdk17
+    image: tomcat:11
     restart: always
     volumes:
       - "./target/Learnweb.war:/usr/local/tomcat/webapps/ROOT.war"
@@ -18,7 +18,7 @@ services:
       LEARNWEB_DATASOURCE_USERNAME: "learnweb"
       LEARNWEB_DATASOURCE_PASSWORD: "cm&dY@FSM7sCtSxZ"
   mariadb:
-    image: mariadb:10.11
+    image: mariadb:10
     restart: always
     ports:
       - "3306:3306"

diff --git a/pom.xml b/pom.xml
@@ -17,10 +17,10 @@
         <jakarta.faces.project_stage>Development</jakarta.faces.project_stage>
 
         <maven.compiler.release>21</maven.compiler.release>
-        <maven.dependency.myfaces.version>4.0.2</maven.dependency.myfaces.version>
+        <maven.dependency.myfaces.version>4.1.0</maven.dependency.myfaces.version>
         <maven.dependency.imageio.version>3.12.0</maven.dependency.imageio.version>
         <maven.dependency.jdbi3.version>3.47.0</maven.dependency.jdbi3.version>
-        <maven.dependency.flyway.version>11.0.1</maven.dependency.flyway.version>
+        <maven.dependency.flyway.version>11.1.0</maven.dependency.flyway.version>
         <maven.dependency.log4j.version>2.24.2</maven.dependency.log4j.version>
         <maven.dependency.sentry.version>7.18.1</maven.dependency.sentry.version>
         <maven.dependency.junit.version>5.11.3</maven.dependency.junit.version>
@@ -42,14 +42,14 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>6.0.0</version>
+            <version>6.1.0</version>
             <scope>provided</scope>
         </dependency>
         <!-- Jakarta EL API (provided by Tomcat) -->
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
-            <version>5.0.1</version>
+            <version>6.0.1</version>
             <scope>provided</scope>
         </dependency>
         <!-- Jakarta Faces API & Impl -->
@@ -67,13 +67,13 @@
         <dependency>
             <groupId>org.jboss.weld.servlet</groupId>
             <artifactId>weld-servlet-core</artifactId>
-            <version>5.1.3.Final</version>
+            <version>6.0.0.CR2</version>
         </dependency>
         <!-- Jakarta Validator API & Impl -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>8.0.1.Final</version>
+            <version>9.0.0.CR1</version>
         </dependency>
         <!-- Jakarta Mail API & Impl -->
         <dependency>
@@ -86,12 +86,12 @@
         <dependency>
             <groupId>org.omnifaces</groupId>
             <artifactId>omnifaces</artifactId>
-            <version>4.6</version>
+            <version>5.0-M1</version>
         </dependency>
         <dependency>
             <groupId>org.primefaces</groupId>
             <artifactId>primefaces</artifactId>
-            <version>14.0.8</version>
+            <version>15.0.0-RC1</version>
             <classifier>jakarta</classifier>
         </dependency>
         <!-- Optional dependency of PrimeFaces (required for DataExporter (PDF)) -->
@@ -345,7 +345,7 @@
         <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-junit5</artifactId>
-            <version>4.0.3.Final</version>
+            <version>5.0.0.Beta1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -496,15 +496,15 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
                 <version>2.18.0</version>
-                <configuration>
+                <!--<configuration>
                     <processUnboundPlugins>true</processUnboundPlugins>
                     <ruleSet>
                         <ignoreVersion>
                             <type>regex</type>
                             <version>(?i).*[-_\.](alpha|beta|rc|m)[-_\.]?\d*</version>
                         </ignoreVersion>
                     </ruleSet>
-                </configuration>
+                </configuration>-->
             </plugin>
             <!-- Provides commands to check a dependency tree -->
             <plugin>

diff --git a/src/main/java/de/l3s/learnweb/component/LearnwebMenuRenderer.java b/src/main/java/de/l3s/learnweb/component/LearnwebMenuRenderer.java
@@ -31,6 +31,15 @@
 @FacesRenderer(componentFamily = "de.l3s.learnweb.component", rendererType = "de.l3s.learnweb.component.LearnwebMenuRenderer")
 public class LearnwebMenuRenderer extends BaseMenuRenderer {
 
+    @Override
+    protected void encodePlaceholder(FacesContext context, AbstractMenu menu) throws IOException {
+        ResponseWriter writer = context.getResponseWriter();
+        writer.startElement("div", menu);
+        writer.writeAttribute("id", menu.getClientId(context), "id");
+        writer.writeAttribute("class", "ui-menu-placeholder", "styleClass");
+        writer.endElement("div");
+    }
+
     @Override
     protected void encodeMarkup(FacesContext context, AbstractMenu abstractMenu) throws IOException {
         LearnwebMenu menu = (LearnwebMenu) abstractMenu;