diff --git a/docker-compose.yml b/docker-compose.yml index a6f8b68f1..0bd1138ae 100644 --- 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 index e7343b331..f4c2498c1 100644 --- a/pom.xml +++ b/pom.xml @@ -17,10 +17,10 @@ Development 21 - 4.0.2 + 4.1.0 3.12.0 3.47.0 - 11.0.1 + 11.1.0 2.24.2 7.18.1 5.11.3 @@ -42,14 +42,14 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 provided jakarta.el jakarta.el-api - 5.0.1 + 6.0.1 provided @@ -67,13 +67,13 @@ org.jboss.weld.servlet weld-servlet-core - 5.1.3.Final + 6.0.0.CR2 org.hibernate.validator hibernate-validator - 8.0.1.Final + 9.0.0.CR1 @@ -86,12 +86,12 @@ org.omnifaces omnifaces - 4.6 + 5.0-M1 org.primefaces primefaces - 14.0.8 + 15.0.0-RC1 jakarta @@ -345,7 +345,7 @@ org.jboss.weld weld-junit5 - 4.0.3.Final + 5.0.0.Beta1 test @@ -496,7 +496,7 @@ org.codehaus.mojo versions-maven-plugin 2.18.0 - + diff --git a/src/main/java/de/l3s/learnweb/component/LearnwebMenuRenderer.java b/src/main/java/de/l3s/learnweb/component/LearnwebMenuRenderer.java index 263d3b7d2..2a4ae7931 100644 --- 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;