Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch back to jdk 11 to avoid error when setting XMLGrammarPoolImpl #2968

Merged
merged 1 commit into from
Jul 11, 2023
+5 −50
Merged

Switch back to jdk 11 to avoid error when setting XMLGrammarPoolImpl #2968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions .github/workflows/codeql.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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