Update smoke tests servers and add jdk21 (#8452)
This commit is contained in:
Lauri Tulmin
GitHub
parent
bff80c3f8d
commit
c660a80c32
|
|
@ -0,0 +1,3 @@
|
|||
plugins {
|
||||
id("otel.javaagent-instrumentation")
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
/*
|
||||
* Copyright The OpenTelemetry Authors
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
package io.opentelemetry.javaagent.instrumentation.payara;
|
||||
|
||||
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
|
||||
import static java.util.Collections.singletonList;
|
||||
|
||||
import com.google.auto.service.AutoService;
|
||||
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
|
||||
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
|
||||
import java.util.List;
|
||||
import net.bytebuddy.matcher.ElementMatcher;
|
||||
|
||||
@AutoService(InstrumentationModule.class)
|
||||
public class PayaraInstrumentationModule extends InstrumentationModule {
|
||||
|
||||
public PayaraInstrumentationModule() {
|
||||
super("payara");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
|
||||
return hasClassesNamed("fish.payara.opentracing.OpenTracingService");
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TypeInstrumentation> typeInstrumentations() {
|
||||
return singletonList(new StandardWrapperInstrumentation());
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
/*
|
||||
* Copyright The OpenTelemetry Authors
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
package io.opentelemetry.javaagent.instrumentation.payara;
|
||||
|
||||
import static net.bytebuddy.matcher.ElementMatchers.named;
|
||||
|
||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
||||
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
|
||||
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
|
||||
import net.bytebuddy.asm.AsmVisitorWrapper;
|
||||
import net.bytebuddy.description.field.FieldDescription;
|
||||
import net.bytebuddy.description.field.FieldList;
|
||||
import net.bytebuddy.description.method.MethodList;
|
||||
import net.bytebuddy.description.type.TypeDescription;
|
||||
import net.bytebuddy.implementation.Implementation;
|
||||
import net.bytebuddy.matcher.ElementMatcher;
|
||||
import net.bytebuddy.pool.TypePool;
|
||||
import org.objectweb.asm.ClassVisitor;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
public class StandardWrapperInstrumentation implements TypeInstrumentation {
|
||||
@Override
|
||||
public ElementMatcher<TypeDescription> typeMatcher() {
|
||||
return named("org.apache.catalina.core.StandardWrapper");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void transform(TypeTransformer transformer) {
|
||||
transformer.applyTransformer(
|
||||
(builder, typeDescription, classLoader, javaModule, protectionDomain) ->
|
||||
builder.visit(
|
||||
new AsmVisitorWrapper() {
|
||||
@Override
|
||||
public int mergeWriter(int flags) {
|
||||
return flags | ClassWriter.COMPUTE_MAXS;
|
||||
}
|
||||
|
||||
@Override
|
||||
@CanIgnoreReturnValue
|
||||
public int mergeReader(int flags) {
|
||||
return flags;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ClassVisitor wrap(
|
||||
TypeDescription instrumentedType,
|
||||
ClassVisitor classVisitor,
|
||||
Implementation.Context implementationContext,
|
||||
TypePool typePool,
|
||||
FieldList<FieldDescription.InDefinedShape> fields,
|
||||
MethodList<?> methods,
|
||||
int writerFlags,
|
||||
int readerFlags) {
|
||||
return new StandardWrapperClassVisitor(classVisitor);
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
private static class StandardWrapperClassVisitor extends ClassVisitor {
|
||||
|
||||
StandardWrapperClassVisitor(ClassVisitor cv) {
|
||||
super(Opcodes.ASM7, cv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MethodVisitor visitMethod(
|
||||
int access, String name, String descriptor, String signature, String[] exceptions) {
|
||||
MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
|
||||
if ("service".equals(name)
|
||||
&& ("(Ljakarta/servlet/ServletRequest;Ljakarta/servlet/ServletResponse;Ljakarta/servlet/Servlet;)V"
|
||||
.equals(descriptor)
|
||||
|| "(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/Servlet;)V"
|
||||
.equals(descriptor))) {
|
||||
mv =
|
||||
new MethodVisitor(api, mv) {
|
||||
@Override
|
||||
public void visitMethodInsn(
|
||||
int opcode, String owner, String name, String descriptor, boolean isInterface) {
|
||||
// Make call to activeSpan return null to prevent payara from closing our server
|
||||
// span
|
||||
// https://github.com/payara/Payara/blob/0369a7a9f724217e313d965902c03e06ea73f266/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapper.java#L1576
|
||||
if ("activeSpan".equals(name)
|
||||
&& "io/opentracing/Tracer".equals(owner)
|
||||
&& "()Lio/opentracing/Span;".equals(descriptor)) {
|
||||
mv.visitInsn(Opcodes.POP);
|
||||
mv.visitInsn(Opcodes.ACONST_NULL);
|
||||
} else {
|
||||
super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
return mv;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -395,6 +395,7 @@ hideFromDependabot(":instrumentation:oracle-ucp-11.2:testing")
|
|||
hideFromDependabot(":instrumentation:oshi:javaagent")
|
||||
hideFromDependabot(":instrumentation:oshi:library")
|
||||
hideFromDependabot(":instrumentation:oshi:testing")
|
||||
hideFromDependabot(":instrumentation:payara:javaagent")
|
||||
hideFromDependabot(":instrumentation:play:play-mvc:play-mvc-2.4:javaagent")
|
||||
hideFromDependabot(":instrumentation:play:play-mvc:play-mvc-2.6:javaagent")
|
||||
hideFromDependabot(":instrumentation:play:play-ws:play-ws-1.0:javaagent")
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ abstract class AppServerTest extends SmokeTest {
|
|||
@Override
|
||||
protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
|
||||
String platformSuffix = windows ? "-windows" : ""
|
||||
String extraTag = "20230418.4737426282"
|
||||
String extraTag = "20230509.4927948452"
|
||||
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
|
||||
return getTargetImagePrefix() + ":" + fullSuffix
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,18 +15,15 @@ abstract class JettyJpmsSmokeTest extends JettySmokeTest {
|
|||
}
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "11")
|
||||
@AppServer(version = "11.0.15", jdk = "11")
|
||||
class Jetty11JpmsJdk11 extends JettyJpmsSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "17")
|
||||
@AppServer(version = "11.0.15", jdk = "17")
|
||||
class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "19")
|
||||
class Jetty11JpmsJdk19 extends JettyJpmsSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "20")
|
||||
@AppServer(version = "11.0.15", jdk = "20")
|
||||
class Jetty11JpmsJdk20 extends JettyJpmsSmokeTest {
|
||||
}
|
||||
@AppServer(version = "11.0.15", jdk = "21")
|
||||
class Jetty11JpmsJdk21 extends JettyJpmsSmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,94 +19,94 @@ abstract class JettySmokeTest extends AppServerTest {
|
|||
}
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "8")
|
||||
@AppServer(version = "9.4.51", jdk = "8")
|
||||
class Jetty9Jdk8 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "11")
|
||||
@AppServer(version = "9.4.51", jdk = "11")
|
||||
class Jetty9Jdk11 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "17")
|
||||
@AppServer(version = "9.4.51", jdk = "17")
|
||||
class Jetty9Jdk17 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "19")
|
||||
class Jetty9Jdk19 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "20")
|
||||
@AppServer(version = "9.4.51", jdk = "20")
|
||||
class Jetty9Jdk20 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "8-openj9")
|
||||
@AppServer(version = "9.4.51", jdk = "21")
|
||||
class Jetty9Jdk21 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.51", jdk = "8-openj9")
|
||||
class Jetty9Jdk8Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "11-openj9")
|
||||
@AppServer(version = "9.4.51", jdk = "11-openj9")
|
||||
class Jetty9Jdk11Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "17-openj9")
|
||||
@AppServer(version = "9.4.51", jdk = "17-openj9")
|
||||
class Jetty9Jdk17Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.4.39", jdk = "18-openj9")
|
||||
@AppServer(version = "9.4.51", jdk = "18-openj9")
|
||||
class Jetty9Jdk18Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "11")
|
||||
@AppServer(version = "10.0.15", jdk = "11")
|
||||
class Jetty10Jdk11 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "17")
|
||||
@AppServer(version = "10.0.15", jdk = "17")
|
||||
class Jetty10Jdk17 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "19")
|
||||
class Jetty10Jdk19 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "20")
|
||||
@AppServer(version = "10.0.15", jdk = "20")
|
||||
class Jetty10Jdk20 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "11-openj9")
|
||||
@AppServer(version = "10.0.15", jdk = "21")
|
||||
class Jetty10Jdk21 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.15", jdk = "11-openj9")
|
||||
class Jetty10Jdk11Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "17-openj9")
|
||||
@AppServer(version = "10.0.15", jdk = "17-openj9")
|
||||
class Jetty10Jdk17Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.7", jdk = "18-openj9")
|
||||
@AppServer(version = "10.0.15", jdk = "18-openj9")
|
||||
class Jetty10Jdk18Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "11")
|
||||
@AppServer(version = "11.0.15", jdk = "11")
|
||||
class Jetty11Jdk11 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "17")
|
||||
@AppServer(version = "11.0.15", jdk = "17")
|
||||
class Jetty11Jdk17 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "19")
|
||||
class Jetty11Jdk19 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "20")
|
||||
@AppServer(version = "11.0.15", jdk = "20")
|
||||
class Jetty11Jdk20 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "11-openj9")
|
||||
@AppServer(version = "11.0.15", jdk = "21")
|
||||
class Jetty11Jdk21 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.15", jdk = "11-openj9")
|
||||
class Jetty11Jdk11Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "17-openj9")
|
||||
@AppServer(version = "11.0.15", jdk = "17-openj9")
|
||||
class Jetty11Jdk17Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "11.0.7", jdk = "18-openj9")
|
||||
@AppServer(version = "11.0.15", jdk = "18-openj9")
|
||||
class Jetty11Jdk18Openj9 extends JettySmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,22 @@ abstract class LibertySmokeTest extends AppServerTest {
|
|||
}
|
||||
}
|
||||
|
||||
@AppServer(version = "20.0.0.12", jdk = "8")
|
||||
class Liberty20Jdk8 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "20.0.0.12", jdk = "8-openj9")
|
||||
class Liberty20Jdk8Openj9 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "20.0.0.12", jdk = "11")
|
||||
class Liberty20Jdk11 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "20.0.0.12", jdk = "11-openj9")
|
||||
class Liberty20Jdk11Openj9 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.12", jdk = "8")
|
||||
class Liberty21Jdk8 extends LibertySmokeTest {
|
||||
}
|
||||
|
|
@ -55,8 +71,8 @@ class Liberty22Jdk11 extends LibertySmokeTest {
|
|||
class Liberty22Jdk17 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "22.0.0.12", jdk = "19")
|
||||
class Liberty22Jdk19 extends LibertySmokeTest {
|
||||
@AppServer(version = "22.0.0.12", jdk = "20")
|
||||
class Liberty22Jdk20 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "22.0.0.12", jdk = "8-openj9")
|
||||
|
|
@ -70,7 +86,7 @@ class Liberty22Jdk11Openj9 extends LibertySmokeTest {
|
|||
@AppServer(version = "22.0.0.12", jdk = "17-openj9")
|
||||
class Liberty22Jdk17Openj9 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
|
||||
@AppServer(version = "23.0.0.3", jdk = "8")
|
||||
class Liberty23Jdk8 extends LibertySmokeTest {
|
||||
}
|
||||
|
|
@ -83,8 +99,8 @@ class Liberty23Jdk11 extends LibertySmokeTest {
|
|||
class Liberty23Jdk17 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "23.0.0.3", jdk = "19")
|
||||
class Liberty23Jdk19 extends LibertySmokeTest {
|
||||
@AppServer(version = "23.0.0.3", jdk = "20")
|
||||
class Liberty23Jdk20 extends LibertySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "23.0.0.3", jdk = "8-openj9")
|
||||
|
|
|
|||
|
|
@ -69,3 +69,19 @@ class Payara52021Jdk8Openj9 extends PayaraSmokeTest {
|
|||
@AppServer(version = "5.2021.8", jdk = "11-openj9")
|
||||
class Payara52021Jdk11Openj9 extends PayaraSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "6.2023.4", jdk = "11")
|
||||
class Payara6Jdk11 extends PayaraSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "6.2023.4", jdk = "11-openj9")
|
||||
class Payara6Jdk11Openj9 extends PayaraSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "6.2023.4", jdk = "17")
|
||||
class Payara6Jdk17 extends PayaraSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "6.2023.4", jdk = "17-openj9")
|
||||
class Payara6Jdk17Openj9 extends PayaraSmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,110 +27,102 @@ class Tomcat7Jdk8 extends TomcatSmokeTest {
|
|||
class Tomcat7Jdk8Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "8")
|
||||
@AppServer(version = "8.5.88", jdk = "8")
|
||||
class Tomcat8Jdk8 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "11")
|
||||
@AppServer(version = "8.5.88", jdk = "11")
|
||||
class Tomcat8Jdk11 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "17")
|
||||
@AppServer(version = "8.5.88", jdk = "17")
|
||||
class Tomcat8Jdk17 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "19")
|
||||
class Tomcat8Jdk19 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "20")
|
||||
@AppServer(version = "8.5.88", jdk = "20")
|
||||
class Tomcat8Jdk20 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "8-openj9")
|
||||
@AppServer(version = "8.5.88", jdk = "21")
|
||||
class Tomcat8Jdk21 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.88", jdk = "8-openj9")
|
||||
class Tomcat8Jdk8Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "11-openj9")
|
||||
@AppServer(version = "8.5.88", jdk = "11-openj9")
|
||||
class Tomcat8Jdk11Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "17-openj9")
|
||||
@AppServer(version = "8.5.88", jdk = "17-openj9")
|
||||
class Tomcat8Jdk17Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.5.72", jdk = "18-openj9")
|
||||
@AppServer(version = "8.5.88", jdk = "18-openj9")
|
||||
class Tomcat8Jdk18Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "8")
|
||||
@AppServer(version = "9.0.74", jdk = "8")
|
||||
class Tomcat9Jdk8 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "11")
|
||||
@AppServer(version = "9.0.74", jdk = "11")
|
||||
class Tomcat9Jdk11 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "17")
|
||||
@AppServer(version = "9.0.74", jdk = "17")
|
||||
class Tomcat9Jdk17 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "19")
|
||||
class Tomcat9Jdk19 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "20")
|
||||
@AppServer(version = "9.0.74", jdk = "20")
|
||||
class Tomcat9Jdk20 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "8-openj9")
|
||||
@AppServer(version = "9.0.74", jdk = "21")
|
||||
class Tomcat9Jdk21 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.74", jdk = "8-openj9")
|
||||
class Tomcat9Jdk8Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "11-openj9")
|
||||
@AppServer(version = "9.0.74", jdk = "11-openj9")
|
||||
class Tomcat9Jdk11Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "17-openj9")
|
||||
@AppServer(version = "9.0.74", jdk = "17-openj9")
|
||||
class Tomcat9Jdk17Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.54", jdk = "18-openj9")
|
||||
@AppServer(version = "9.0.74", jdk = "18-openj9")
|
||||
class Tomcat9Jdk18Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "8")
|
||||
class Tomcat10Jdk8 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "11")
|
||||
@AppServer(version = "10.1.8", jdk = "11")
|
||||
class Tomcat10Jdk11 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "17")
|
||||
@AppServer(version = "10.1.8", jdk = "17")
|
||||
class Tomcat10Jdk17 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "19")
|
||||
class Tomcat10Jdk19 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "20")
|
||||
@AppServer(version = "10.1.8", jdk = "20")
|
||||
class Tomcat10Jdk20 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "8-openj9")
|
||||
class Tomcat10Jdk8Openj9 extends TomcatSmokeTest {
|
||||
@AppServer(version = "10.1.8", jdk = "21")
|
||||
class Tomcat10Jdk21 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "11-openj9")
|
||||
@AppServer(version = "10.1.8", jdk = "11-openj9")
|
||||
class Tomcat10Jdk11Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "17-openj9")
|
||||
@AppServer(version = "10.1.8", jdk = "17-openj9")
|
||||
class Tomcat10Jdk17Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "10.0.12", jdk = "18-openj9")
|
||||
@AppServer(version = "10.1.8", jdk = "18-openj9")
|
||||
class Tomcat10Jdk18Openj9 extends TomcatSmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,74 +44,66 @@ class Tomee71Jdk8 extends TomeeSmokeTest {
|
|||
class Tomee71Jdk8Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "8")
|
||||
@AppServer(version = "8.0.14", jdk = "8")
|
||||
class Tomee8Jdk8 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "11")
|
||||
@AppServer(version = "8.0.14", jdk = "11")
|
||||
class Tomee8Jdk11 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "17")
|
||||
@AppServer(version = "8.0.14", jdk = "17")
|
||||
class Tomee8Jdk17 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "19")
|
||||
class Tomee8Jdk19 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "20")
|
||||
@AppServer(version = "8.0.14", jdk = "20")
|
||||
class Tomee8Jdk20 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "8-openj9")
|
||||
@AppServer(version = "8.0.14", jdk = "21")
|
||||
class Tomee8Jdk21 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.14", jdk = "8-openj9")
|
||||
class Tomee8Jdk8Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "11-openj9")
|
||||
@AppServer(version = "8.0.14", jdk = "11-openj9")
|
||||
class Tomee8Jdk11Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "17-openj9")
|
||||
@AppServer(version = "8.0.14", jdk = "17-openj9")
|
||||
class Tomee8Jdk17Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "8.0.8", jdk = "18-openj9")
|
||||
@AppServer(version = "8.0.14", jdk = "18-openj9")
|
||||
class Tomee8Jdk18Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "8")
|
||||
class Tomee9Jdk8 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "11")
|
||||
@AppServer(version = "9.0.0", jdk = "11")
|
||||
class Tomee9Jdk11 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "17")
|
||||
@AppServer(version = "9.0.0", jdk = "17")
|
||||
class Tomee9Jdk17 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "19")
|
||||
class Tomee9Jdk19 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "20")
|
||||
@AppServer(version = "9.0.0", jdk = "20")
|
||||
class Tomee9Jdk20 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "8-openj9")
|
||||
class Tomee9Jdk8Openj9 extends TomeeSmokeTest {
|
||||
@AppServer(version = "9.0.0", jdk = "21")
|
||||
class Tomee9Jdk21 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "11-openj9")
|
||||
@AppServer(version = "9.0.0", jdk = "11-openj9")
|
||||
class Tomee9Jdk11Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "17-openj9")
|
||||
@AppServer(version = "9.0.0", jdk = "17-openj9")
|
||||
class Tomee9Jdk17Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "9.0.0-M7", jdk = "18-openj9")
|
||||
@AppServer(version = "9.0.0", jdk = "18-openj9")
|
||||
class Tomee9Jdk18Openj9 extends TomeeSmokeTest {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ abstract class WildflyJdk8SmokeTest extends WildflySmokeTest {
|
|||
}
|
||||
|
||||
@AppServer(version = "13.0.0.Final", jdk = "8")
|
||||
class Wildfly13Jdk8 extends WildflyJdk8SmokeTest {
|
||||
class Wildfly13Jdk8 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "13.0.0.Final", jdk = "8-openj9")
|
||||
|
|
@ -61,7 +61,7 @@ class Wildfly13Jdk8Openj9 extends WildflySmokeTest {
|
|||
}
|
||||
|
||||
@AppServer(version = "17.0.1.Final", jdk = "8")
|
||||
class Wildfly17Jdk8 extends WildflyJdk8SmokeTest {
|
||||
class Wildfly17Jdk8 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "17.0.1.Final", jdk = "11")
|
||||
|
|
@ -72,14 +72,50 @@ class Wildfly17Jdk11 extends WildflySmokeTest {
|
|||
class Wildfly17Jdk17 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "17.0.1.Final", jdk = "19")
|
||||
class Wildfly17Jdk19 extends WildflyJdk8SmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "17.0.1.Final", jdk = "20")
|
||||
class Wildfly17Jdk20 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "17.0.1.Final", jdk = "21")
|
||||
class Wildfly17Jdk21 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "8")
|
||||
class Wildfly21Jdk8 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "11")
|
||||
class Wildfly21Jdk11 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "17")
|
||||
class Wildfly21Jdk17 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "20")
|
||||
class Wildfly21Jdk20 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "21")
|
||||
class Wildfly21Jdk21 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "28.0.0.Final", jdk = "11")
|
||||
class Wildfly28Jdk11 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "28.0.0.Final", jdk = "17")
|
||||
class Wildfly28Jdk17 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "28.0.0.Final", jdk = "20")
|
||||
class Wildfly28Jdk20 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "28.0.0.Final", jdk = "21")
|
||||
class Wildfly28Jdk21 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "17.0.1.Final", jdk = "8-openj9")
|
||||
class Wildfly17Jdk8Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
|
@ -96,26 +132,6 @@ class Wildfly17Jdk17Openj9 extends WildflySmokeTest {
|
|||
class Wildfly17Jdk18Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "8")
|
||||
class Wildfly21Jdk8 extends WildflyJdk8SmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "11")
|
||||
class Wildfly21Jdk11 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "17")
|
||||
class Wildfly21Jdk17 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "19")
|
||||
class Wildfly21Jdk19 extends WildflyJdk8SmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "20")
|
||||
class Wildfly21Jdk20 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "21.0.0.Final", jdk = "8-openj9")
|
||||
class Wildfly21Jdk8Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
|
@ -132,38 +148,14 @@ class Wildfly21Jdk17Openj9 extends WildflySmokeTest {
|
|||
class Wildfly21Jdk18Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "8")
|
||||
class Wildfly25Jdk8 extends WildflyJdk8SmokeTest {
|
||||
@AppServer(version = "28.0.0.Final", jdk = "11-openj9")
|
||||
class Wildfly28Jdk11Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "11")
|
||||
class Wildfly25Jdk11 extends WildflySmokeTest {
|
||||
@AppServer(version = "28.0.0.Final", jdk = "17-openj9")
|
||||
class Wildfly28Jdk17Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "17")
|
||||
class Wildfly25Jdk17 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "19")
|
||||
class Wildfly25Jdk19 extends WildflyJdk8SmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "20")
|
||||
class Wildfly25Jdk20 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "8-openj9")
|
||||
class Wildfly25Jdk8Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "11-openj9")
|
||||
class Wildfly25Jdk11Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "17-openj9")
|
||||
class Wildfly25Jdk17Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
||||
@AppServer(version = "25.0.1.Final", jdk = "18-openj9")
|
||||
class Wildfly25Jdk18Openj9 extends WildflySmokeTest {
|
||||
@AppServer(version = "28.0.0.Final", jdk = "18-openj9")
|
||||
class Wildfly28Jdk18Openj9 extends WildflySmokeTest {
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue