TCK Tracking: Jakarta EE 10 Core Profile #6799

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
helidon-io · Jun 26, 2023 · 2fdbf2c · 2fdbf2c
1 parent 823bfd9
commit 2fdbf2c
Show file tree

Hide file tree

Showing 51 changed files with 1,870 additions and 56 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -39,6 +39,7 @@
         <version.lib.activemq>5.16.0</version.lib.activemq>
         <version.lib.animal-sniffer>1.18</version.lib.animal-sniffer>
         <version.lib.annotation-api>1.3.5</version.lib.annotation-api>
+        <version.lib.ant>1.10.13</version.lib.ant>
         <version.lib.brave-opentracing>1.0.0</version.lib.brave-opentracing>
         <version.lib.reactivestreams>1.0.4</version.lib.reactivestreams>
         <version.lib.commons-logging>1.2</version.lib.commons-logging>
@@ -76,7 +77,7 @@
         <version.lib.jakarta.jaxrs-api>3.1.0</version.lib.jakarta.jaxrs-api>
         <version.lib.jakarta.jms-api>3.0.0</version.lib.jakarta.jms-api>
         <version.lib.jakarta.jsonb-api>3.0.0</version.lib.jakarta.jsonb-api>
-        <version.lib.jakarta.jsonp-api>2.1.1</version.lib.jakarta.jsonp-api>
+        <version.lib.jakarta.jsonp-api>2.1.0</version.lib.jakarta.jsonp-api>
         <version.lib.jakarta.persistence-api>3.1.0</version.lib.jakarta.persistence-api>
         <version.lib.jakarta.transaction-api>2.0.0</version.lib.jakarta.transaction-api>
         <version.lib.jakarta.validation-api>3.0.0</version.lib.jakarta.validation-api>
@@ -105,6 +106,9 @@
         <version.lib.micronaut.sql>4.4.0</version.lib.micronaut.sql>
         <!-- FIXME upgrade to 3.1 when it is released in Maven -->
         <version.lib.microprofile-config>3.0.1</version.lib.microprofile-config>
+        <version.lib.microprofile-core-profile>10.0.1</version.lib.microprofile-core-profile>
+        <version.lib.microprofile-cdi-tck>4.0.10</version.lib.microprofile-cdi-tck>
+        <version.lib.microprofile-restfull-tck>3.1.3</version.lib.microprofile-restfull-tck>
         <!-- FIXME upgrade to 4.1 when it is released in Maven -->
         <version.lib.microprofile-fault-tolerance-api>4.0</version.lib.microprofile-fault-tolerance-api>
         <version.lib.microprofile-graphql>2.0</version.lib.microprofile-graphql>
@@ -140,7 +144,7 @@
         <version.lib.opentracing.grpc>0.2.1</version.lib.opentracing.grpc>
         <version.lib.opentracing.tracerresolver>0.1.8</version.lib.opentracing.tracerresolver>
         <version.lib.perfmark-api>0.25.0</version.lib.perfmark-api>
-        <version.lib.parsson>1.0.2</version.lib.parsson>
+        <version.lib.parsson>1.1.2</version.lib.parsson>
         <version.lib.postgresql>42.4.3</version.lib.postgresql>
         <version.lib.prometheus>0.9.0</version.lib.prometheus>
         <version.lib.slf4j>2.0.0</version.lib.slf4j>
@@ -680,6 +684,26 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>jakarta.ee.tck.coreprofile</groupId>
+                <artifactId>core-profile-tck-impl</artifactId>
+                <version>${version.lib.microprofile-core-profile}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>cdi-tck-core-impl</artifactId>
+                <version>${version.lib.microprofile-cdi-tck}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>cdi-tck-api</artifactId>
+                <version>${version.lib.microprofile-cdi-tck}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ws.rs</groupId>
+                <artifactId>jakarta-restful-ws-tck</artifactId>
+                <version>${version.lib.microprofile-restfull-tck}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.microprofile.opentracing</groupId>
                 <artifactId>microprofile-opentracing-api</artifactId>
@@ -778,6 +802,11 @@
                 <artifactId>slf4j-jdk14</artifactId>
                 <version>${version.lib.slf4j}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant</artifactId>
+                <version>${version.lib.ant}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>
@@ -949,6 +978,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.weld</groupId>
+                <artifactId>weld-porting-package-tck</artifactId>
+                <version>${version.lib.weld}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss</groupId>
                 <artifactId>jboss-transaction-spi-jakarta</artifactId>

diff --git a/...llian/src/main/java/io/helidon/microprofile/arquillian/HelidonContainerConfiguration.java b/...llian/src/main/java/io/helidon/microprofile/arquillian/HelidonContainerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
  * is empty)</li>
  * <li>replaceConfigSourcesWithMp: (Optional) defaults to false: whether to replace config sources with microprofile if it
  * exists</li>
+ * <li>inWebContainer: defaults to false: sets web app context root, load WEB-INF/beans.xml and find any jakarta.ws.rs.core.Application in the webapp classes</li>
  * </ul>
  */
 public class HelidonContainerConfiguration implements ContainerConfiguration {
@@ -45,6 +46,7 @@ public class HelidonContainerConfiguration implements ContainerConfiguration {
     private boolean deleteTmp = true;
     private boolean useRelativePath = false;
     private boolean useParentClassloader = true;
+    private boolean inWebContainer = false;
     private final List<Consumer<ConfigBuilder>> builderConsumers = new ArrayList<>();
 
     /**
@@ -104,6 +106,14 @@ public void setUseParentClassloader(boolean useParentClassloader) {
         this.useParentClassloader = useParentClassloader;
     }
 
+    public boolean isInWebContainer() {
+        return inWebContainer;
+    }
+
+    public void setInWebContainer(boolean inWebContainer) {
+        this.inWebContainer = inWebContainer;
+    }
+
     @Override
     public void validate() throws ConfigurationException {
         if ((port <= 0) || (port > Short.MAX_VALUE)) {

diff --git a/...rquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonContainerExtension.java b/...rquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonContainerExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package io.helidon.microprofile.arquillian;
 
 import java.lang.reflect.Method;
-import java.util.Optional;
 
 import jakarta.enterprise.context.control.RequestContextController;
 import jakarta.enterprise.context.spi.CreationalContext;
@@ -29,6 +28,7 @@
 import org.jboss.arquillian.core.spi.LoadableExtension;
 import org.jboss.arquillian.test.spi.TestEnricher;
 import org.jboss.arquillian.testenricher.cdi.CDIInjectionEnricher;
+import org.testng.annotations.Test;
 
 /**
  * An arquillian LoadableExtension defining the {@link HelidonDeployableContainer}.
@@ -44,6 +44,8 @@ class HelidonContainerExtension implements LoadableExtension {
      */
     static class HelidonCDIInjectionEnricher extends CDIInjectionEnricher {
 
+        private static final String ARQUILLIAN_DATA_PROVIDER = "ARQUILLIAN_DATA_PROVIDER";
+        private static final Object[] EMPTY = new Object[0];
         private BeanManager beanManager;
         private RequestContextController requestContextController;
 
@@ -78,11 +80,11 @@ public RequestContextController getRequestContextController() {
 
         @Override
         public Object[] resolve(Method method) {
-            return Optional.ofNullable(method.getAnnotation(org.testng.annotations.Test.class))
-                           .filter(test -> !test.dataProvider().isEmpty())
-                           // Don't resolve TestNG data providers parameters as cdi beans
-                           .map(unused -> new Object[0])
-                           .orElseGet(() -> super.resolve(method));
+            Test test = method.getAnnotation(org.testng.annotations.Test.class);
+            if (test != null && !ARQUILLIAN_DATA_PROVIDER.equals(test.dataProvider())) {
+                return EMPTY;
+            }
+            return super.resolve(method);
         }
 
         private static CDI<Object> cdi() {