Skip to content

Commit

Permalink
Downgrade to java 11 in tomcat to avoid error when setting XMLGrammar…
Browse files Browse the repository at this point in the history
…PoolImpl.

Use default CodeQL configuration and java 8 compatible libraries.
Logback, Mockito and Checkstyle for java 8.
  • Loading branch information
sebr72 committed Jul 11, 2023
1 parent 434e269 commit 05848b7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 50 deletions.
45 changes: 0 additions & 45 deletions .github/workflows/codeql.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
jar.dependsOn(checkstyleMain)

checkstyle {
toolVersion = "10.7.0" // com.puppycrawl.tools:checkstyle
toolVersion = "9.3" // com.puppycrawl.tools:checkstyle
configFile = file("$rootProject.rootDir/checkstyle_checks.xml")
configProperties = ['basedir': project.rootDir.path]
ignoreFailures = true
Expand Down Expand Up @@ -77,7 +77,7 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
dependencies {
testCompile(
"junit:junit:4.13.2",
'org.mockito:mockito-core:5.1.1',
'org.mockito:mockito-core:4.11.0',
)
}

Expand Down
2 changes: 1 addition & 1 deletion core/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mapfish_print_builder AS builder

FROM tomcat:9.0.62-jdk17-openjdk-slim-bullseye AS runner
FROM tomcat:9.0.62-jdk11-openjdk-slim-bullseye AS runner
LABEL maintainer="Camptocamp <[email protected]>"

RUN perl -0777 -i -pe 's/(<Valve className="org.apache.catalina.valves.AccessLogValve"[^>]*>)/<Valve className="ch.qos.logback.access.tomcat.LogbackValve" quiet="true"\/>/s' "${CATALINA_HOME}/conf/server.xml" \
Expand Down
4 changes: 2 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ dependencies {
"org.slf4j:slf4j-api:2.0.7",
"org.slf4j:jcl-over-slf4j:2.0.7",
"org.slf4j:jul-to-slf4j:2.0.7",
"ch.qos.logback:logback-classic:1.4.7",
"ch.qos.logback:logback-access:1.4.7",
"ch.qos.logback:logback-classic:1.3.7",
"ch.qos.logback:logback-access:1.3.7",
'org.json:json:20220924',
'org.yaml:snakeyaml:2.0',
'com.github.spullara.cli-parser:cli-parser:1.1.6',
Expand Down

0 comments on commit 05848b7

Please sign in to comment.