open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Tomcat Java 16 images (#3463)

This commit is contained in:
Trask Stalnaker 2021-07-01 07:17:38 -07:00 committed by GitHub
parent fc78cd0af3
commit e2aae6fc87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
smoke-tests/matrix/build.gradle
View File

@ -36,9 +36,10 @@ def linuxTargets = [
[version: ["11.0.1"], vm: ["hotspot", "openj9"], jdk: ["11", "15", "16"], war: "servlet-5.0"]
],
"tomcat": [
[version: ["7.0.107"], vm: ["hotspot", "openj9"], jdk: ["8"]],
[version: ["8.5.60", "9.0.40"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]],
[version: ["10.0.4"], vm: ["hotspot", "openj9"], jdk: ["11", "15", "16"], war: "servlet-5.0"]
[version: ["7.0.107"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["8"]],
[version: ["8.5.60", "9.0.40"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["8", "11"]],
[version: ["10.0.4"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["11", "15"], war: "servlet-5.0"],
[version: ["10.0.4"], vm: ["openjdk"], jdk: ["16"], war: "servlet-5.0"]
],
"tomee": [
[version: ["7.0.0"], vm: ["hotspot"], jdk: ["8"]],
@ -67,10 +68,11 @@ def windowsTargets = [
[version: ["11.0.1"], vm: ["hotspot", "openj9"], jdk: ["11", "15", "16"], dockerfile: "jetty-split", args: [sourceVersion: "11.0.1"], war: "servlet-5.0"]
],
"tomcat" : [
[version: ["7.0.107"], vm: ["hotspot", "openj9"], jdk: ["8"], args: [majorVersion: "7"]],
[version: ["8.5.60"], vm: ["hotspot", "openj9"], jdk: ["8", "11"], args: [majorVersion: "8"]],
[version: ["9.0.40"], vm: ["hotspot", "openj9"], jdk: ["8", "11"], args: [majorVersion: "9"]],
[version: ["10.0.4"], vm: ["hotspot", "openj9"], jdk: ["11", "15", "16"], args: [majorVersion: "10"], war: "servlet-5.0"]
[version: ["7.0.107"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["8"], args: [majorVersion: "7"]],
[version: ["8.5.60"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["8", "11"], args: [majorVersion: "8"]],
[version: ["9.0.40"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["8", "11"], args: [majorVersion: "9"]],
[version: ["10.0.4"], vm: ["adoptopenjdk-hotspot", "adoptopenjdk-openj9"], jdk: ["11", "15"], args: [majorVersion: "10"], war: "servlet-5.0"],
[version: ["10.0.4"], vm: ["openjdk"], jdk: ["16"], args: [majorVersion: "10"], war: "servlet-5.0"]
],
"tomee" : [
[version: ["7.0.0"], vm: ["hotspot", "openj9"], jdk: ["8"]],

2
smoke-tests/matrix/src/tomcat.dockerfile
View File

@ -2,6 +2,6 @@ ARG version
ARG jdk
ARG vm
FROM tomcat:${version}-jdk${jdk}-adoptopenjdk-${vm}
FROM tomcat:${version}-jdk${jdk}-${vm}
COPY app.war /usr/local/tomcat/webapps/