Merge remote-tracking branch 'upstream/main' into pr/6381

siyuniu-ms · Feb 22, 2023 · bf171da · bf171da
2 parents e64c3c5 + 5845d98
commit bf171da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...n/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/base/IntegrationTestBase.java b/...n/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/base/IntegrationTestBase.java
@@ -22,17 +22,16 @@
 import org.apache.rocketmq.broker.BrokerController;
 import org.apache.rocketmq.common.BrokerConfig;
 import org.apache.rocketmq.common.namesrv.NamesrvConfig;
-import org.apache.rocketmq.logging.InternalLogger;
-import org.apache.rocketmq.logging.InternalLoggerFactory;
 import org.apache.rocketmq.namesrv.NamesrvController;
 import org.apache.rocketmq.remoting.netty.NettyClientConfig;
 import org.apache.rocketmq.remoting.netty.NettyServerConfig;
 import org.apache.rocketmq.store.config.MessageStoreConfig;
 import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class IntegrationTestBase {
- public static final InternalLogger logger =
- InternalLoggerFactory.getLogger(IntegrationTestBase.class);
+ public static final Logger logger = LoggerFactory.getLogger(IntegrationTestBase.class);
 
  static final String BROKER_NAME_PREFIX = "TestBrokerName_";
  static final AtomicInteger BROKER_INDEX = new AtomicInteger(0);

diff --git a/smoke-tests/images/servlet/build.gradle.kts b/smoke-tests/images/servlet/build.gradle.kts
@@ -33,9 +33,11 @@ val targets = mapOf(
  ),
  "liberty" to listOf(
  ImageTarget(listOf("20.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11"), mapOf("release" to "2020-11-11_0736")),
- // running configure.sh is failing while building the image with Java 19
- ImageTarget(listOf("21.0.0.10"), listOf("hotspot"), listOf("8", "11", "17"), mapOf("release" to "2021-09-20_1900")),
- ImageTarget(listOf("21.0.0.10"), listOf("openj9"), listOf("8", "11", "17"), mapOf("release" to "2021-09-20_1900")),
+ ImageTarget(listOf("21.0.0.12"), listOf("hotspot"), listOf("8", "11", "17"), mapOf("release" to "2021-11-17_1256")),
+ ImageTarget(listOf("21.0.0.12"), listOf("openj9"), listOf("8", "11", "17"), mapOf("release" to "2021-11-17_1256")),
+ // Java 19 is not supported until 22.0.0.10
+ ImageTarget(listOf("22.0.0.12"), listOf("hotspot"), listOf("8", "11", "17", "19"), mapOf("release" to "22.0.0.12")),
+ ImageTarget(listOf("22.0.0.12"), listOf("openj9"), listOf("8", "11", "17"), mapOf("release" to "22.0.0.12")),
  ),
  "payara" to listOf(
  ImageTarget(listOf("5.2020.6"), listOf("hotspot", "openj9"), listOf("8", "11")),