Skip to content

Commit

Permalink
build: upgrade to Jetty 12 (#317)
Browse files Browse the repository at this point in the history
  • Loading branch information
@berezovskyi
berezovskyi authored Nov 16, 2024
1 parent 634ae4b commit a0fe2cb
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 16 deletions.
8 changes: 4 additions & 4 deletions src/refimpl-tests/src/test/groovy/OslcSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 3 additions & 1 deletion src/server-am/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/server-am/src/main/resources/simplelogger.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 3 additions & 1 deletion src/server-cm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/server-cm/src/main/resources/simplelogger.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 3 additions & 1 deletion src/server-qm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/server-qm/src/main/resources/simplelogger.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 3 additions & 1 deletion src/server-rm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions src/server-rm/src/main/resources/simplelogger.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit a0fe2cb

Please sign in to comment.