build: upgrade to Jetty 12 (#317)

berezovskyi · web-flow · commit a0fe2cb7250d · 2024-11-16T11:16:57.000+01:00
diff --git a/src/refimpl-tests/src/test/groovy/OslcSpec.groovy b/src/refimpl-tests/src/test/groovy/OslcSpec.groovy
@@ -25,16 +25,16 @@ class OslcSpec extends Specification {
     static private ComposeContainer environment =
             new ComposeContainer(composeFile)
                      .withExposedService(RM_SVC, RM_PORT,
-                             Wait.forLogMessage(".*main: Started Server@.*", 1)
+                             Wait.forLogMessage(".*main: Started oejs.Server@.*", 1)
                                      .withStartupTimeout(Duration.ofSeconds(STARTUP_TIMEOUT)))
                      .withExposedService(CM_SVC, CM_PORT,
-                             Wait.forLogMessage(".*main: Started Server@.*", 1)
+                             Wait.forLogMessage(".*main: Started oejs.Server@.*", 1)
                                      .withStartupTimeout(Duration.ofSeconds(STARTUP_TIMEOUT)))
                      .withExposedService(QM_SVC, QM_PORT,
-                             Wait.forLogMessage(".*main: Started Server@.*", 1)
+                             Wait.forLogMessage(".*main: Started oejs.Server@.*", 1)
                                      .withStartupTimeout(Duration.ofSeconds(STARTUP_TIMEOUT)))
                      .withExposedService(AM_SVC, AM_PORT,
-                             Wait.forLogMessage(".*main: Started Server@.*", 1)
+                             Wait.forLogMessage(".*main: Started oejs.Server@.*", 1)
                                      .withStartupTimeout(Duration.ofSeconds(STARTUP_TIMEOUT)))
                     .withLocalCompose(true)
 //                    .withEnv(System.getenv())
diff --git a/src/server-am/Dockerfile b/src/server-am/Dockerfile
@@ -1,5 +1,7 @@
-FROM docker.io/library/jetty:11-jre17
+FROM docker.io/library/jetty:12-jre21-eclipse-temurin
 # WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
 # $JETTY_BASE must be correct before starting Jetty
 
 COPY target/*.war /var/lib/jetty/webapps/ROOT.war
+
+RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl
diff --git a/src/server-am/src/main/resources/simplelogger.properties b/src/server-am/src/main/resources/simplelogger.properties
@@ -7,7 +7,7 @@ org.slf4j.simpleLogger.showThreadName
 
 # Key levels
 org.slf4j.simpleLogger.defaultLogLevel                                                 = INFO
-org.slf4j.simpleLogger.log.co.oslc.refimpl                                             = TRACE
+org.slf4j.simpleLogger.log.co.oslc.refimpl                                             = DEBUG
 org.slf4j.simpleLogger.log.org.eclipse.lyo                                             = DEBUG
 
 # Timestamps
@@ -23,6 +23,6 @@ org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.ordfm.ResourcePa
 org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper        = INFO
 org.slf4j.simpleLogger.log.io.swagger.v3                                               = WARN
 org.slf4j.simpleLogger.log.org.glassfish                                               = INFO
-org.slf4j.simpleLogger.log.org.jboss.weld                                              = TRACE
+org.slf4j.simpleLogger.log.org.jboss.weld                                              = DEBUG
 org.slf4j.simpleLogger.log.org.apache.jena                                             = INFO
 org.slf4j.simpleLogger.log.Jena                                                        = INFO
diff --git a/src/server-cm/Dockerfile b/src/server-cm/Dockerfile
@@ -1,5 +1,7 @@
-FROM docker.io/library/jetty:11-jre17
+FROM docker.io/library/jetty:12-jre21-eclipse-temurin
 # WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
 # $JETTY_BASE must be correct before starting Jetty
 
 COPY target/*.war /var/lib/jetty/webapps/ROOT.war
+
+RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl
diff --git a/src/server-cm/src/main/resources/simplelogger.properties b/src/server-cm/src/main/resources/simplelogger.properties
@@ -7,7 +7,7 @@ org.slf4j.simpleLogger.showThreadName
 
 # Key levels
 org.slf4j.simpleLogger.defaultLogLevel                                                 = INFO
-org.slf4j.simpleLogger.log.co.oslc.refimpl                                             = TRACE
+org.slf4j.simpleLogger.log.co.oslc.refimpl                                             = DEBUG
 org.slf4j.simpleLogger.log.org.eclipse.lyo                                             = DEBUG
 
 # Timestamps
@@ -23,6 +23,6 @@ org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.ordfm.ResourcePa
 org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper        = INFO
 org.slf4j.simpleLogger.log.io.swagger.v3                                               = WARN
 org.slf4j.simpleLogger.log.org.glassfish                                               = INFO
-org.slf4j.simpleLogger.log.org.jboss.weld                                              = TRACE
+org.slf4j.simpleLogger.log.org.jboss.weld                                              = DEBUG
 org.slf4j.simpleLogger.log.org.apache.jena                                             = INFO
 org.slf4j.simpleLogger.log.Jena                                                        = INFO
diff --git a/src/server-qm/Dockerfile b/src/server-qm/Dockerfile
@@ -1,5 +1,7 @@
-FROM docker.io/library/jetty:11-jre17
+FROM docker.io/library/jetty:12-jre21-eclipse-temurin
 # WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
 # $JETTY_BASE must be correct before starting Jetty
 
 COPY target/*.war /var/lib/jetty/webapps/ROOT.war
+
+RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl
diff --git a/src/server-qm/src/main/resources/simplelogger.properties b/src/server-qm/src/main/resources/simplelogger.properties
@@ -7,7 +7,7 @@ org.slf4j.simpleLogger.showThreadName
 
 # Key levels
 org.slf4j.simpleLogger.defaultLogLevel                                                 = INFO
-org.slf4j.simpleLogger.log.co.oslc.refimpl                                             = TRACE
+org.slf4j.simpleLogger.log.co.oslc.refimpl                                             = DEBUG
 org.slf4j.simpleLogger.log.org.eclipse.lyo                                             = DEBUG
 
 # Timestamps
@@ -23,6 +23,6 @@ org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.ordfm.ResourcePa
 org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper        = INFO
 org.slf4j.simpleLogger.log.io.swagger.v3                                               = WARN
 org.slf4j.simpleLogger.log.org.glassfish                                               = INFO
-org.slf4j.simpleLogger.log.org.jboss.weld                                              = TRACE
+org.slf4j.simpleLogger.log.org.jboss.weld                                              = DEBUG
 org.slf4j.simpleLogger.log.org.apache.jena                                             = INFO
 org.slf4j.simpleLogger.log.Jena                                                        = INFO
diff --git a/src/server-rm/Dockerfile b/src/server-rm/Dockerfile
@@ -1,5 +1,7 @@
-FROM docker.io/library/jetty:11-jre17
+FROM docker.io/library/jetty:12-jre21-eclipse-temurin
 # WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
 # $JETTY_BASE must be correct before starting Jetty
 
 COPY target/*.war /var/lib/jetty/webapps/ROOT.war
+
+RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl
diff --git a/src/server-rm/src/main/resources/simplelogger.properties b/src/server-rm/src/main/resources/simplelogger.properties
@@ -7,7 +7,7 @@ org.slf4j.simpleLogger.showThreadName
 
 # Key levels
 org.slf4j.simpleLogger.defaultLogLevel                                                 = INFO
-org.slf4j.simpleLogger.log.co.oslc.refimpl                                             = TRACE
+org.slf4j.simpleLogger.log.co.oslc.refimpl                                             = DEBUG
 org.slf4j.simpleLogger.log.org.eclipse.lyo                                             = DEBUG
 
 # Timestamps
@@ -23,6 +23,6 @@ org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.ordfm.ResourcePa
 org.slf4j.simpleLogger.log.org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper        = INFO
 org.slf4j.simpleLogger.log.io.swagger.v3                                               = WARN
 org.slf4j.simpleLogger.log.org.glassfish                                               = INFO
-org.slf4j.simpleLogger.log.org.jboss.weld                                              = TRACE
+org.slf4j.simpleLogger.log.org.jboss.weld                                              = DEBUG
 org.slf4j.simpleLogger.log.org.apache.jena                                             = INFO
 org.slf4j.simpleLogger.log.Jena                                                        = INFO
