Merge pull request #24904 from arjantijms/8.0

Merge master into 8.0

Author: arjantijms

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionPool.java

@@ -89,7 +89,7 @@
         <tyrus.version>2.2.0-M1</tyrus.version>
 
         <!-- Jakarta Concurrency -->
-        <jakarta.concurrent-api.version>3.1.0-RC2</jakarta.concurrent-api.version>
+        <jakarta.concurrent-api.version>3.1.0</jakarta.concurrent-api.version>
         <concurro.version>3.1.0-M3</concurro.version>
 
         <!-- Jakarta Interceptors -->
@@ -98,7 +98,7 @@
         <!-- Jakarta Security + Authentication/Authorization -->
         <!-- APIs -->
         <jakarta.security-api.version>4.0.0-M2</jakarta.security-api.version>
-        <jakarta.authorization-api.version>3.0.0-M4</jakarta.authorization-api.version>
+        <jakarta.authorization-api.version>3.0.0</jakarta.authorization-api.version>
         <jakarta.authentication-api.version>3.1.0-M1</jakarta.authentication-api.version>
         <!-- Implementations -->
         <soteria.version>4.0.0-M3</soteria.version>
@@ -763,7 +763,7 @@
                         <dependency>
                             <groupId>org.codehaus.plexus</groupId>
                             <artifactId>plexus-utils</artifactId>
-                            <version>4.0.0</version>
+                            <version>4.0.1</version>
                         </dependency>
                     </dependencies>
                 </plugin>

appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/ConnectionPoolTest.java

@@ -152,7 +152,7 @@
             <plugin>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>4.0.2</version>
                 <executions>
                     <execution>
                         <id>jaxws-generate</id>

appserver/pom.xml

@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.9.0</version>
+            <version>7.10.1</version>
         </dependency>
     </dependencies>
 

appserver/tests/application/pom.xml

@@ -53,28 +53,14 @@
                 <artifactId>cdi-tck-lang-model</artifactId>
                 <version>${cdi.tck-4-0.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-lite-extension-translator</artifactId>
-                <version>${weld.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-core-test-common</artifactId>
-                <version>${weld.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-core-impl</artifactId>
-                <version>${weld.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-lite-extension-translator</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -84,57 +70,19 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-core-test-common</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-core-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>cdi-tck-lang-model</artifactId>
             <scope>test</scope>
         </dependency>
 
-           <dependency>
-            <groupId>org.jboss.weld.module</groupId>
-            <artifactId>weld-web</artifactId>
-            <version>${weld.version}</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>cdi-tck-api</artifactId>
-            <version>${cdi.tck-4-0.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.el</groupId>
-                    <artifactId>jakarta.el-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-            <scope>test</scope>
-        </dependency>     
-
         <!--
             The Arquillian connector that starts GlassFish and deploys archives to it.
         -->
@@ -143,7 +91,6 @@
             <artifactId>arquillian-glassfish-server-managed</artifactId>
             <version>1.4</version>
         </dependency>
-
     </dependencies>
 
 
@@ -211,6 +158,9 @@
                         <glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
                         <glassfish.enableAssertions>:org.jboss.cdi...</glassfish.enableAssertions>
                     </systemPropertyVariables>
+                    <includes>
+                        <include>CDILangModelTCKRunner.java</include>
+                    </includes>
                 </configuration>
             </plugin>
 

appserver/tests/appserv-tests/lib/pom.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -15,28 +15,29 @@
  */
 package org.glassfish.tck.cdi.lang.model;
 
-import static org.glassfish.tck.cdi.lang.model.LangModelVerifierBuildCompatibleExtension.langModelVerifierBuildCompatibleExtensionPassed;
-import static org.jboss.shrinkwrap.api.BeanDiscoveryMode.ALL;
-import static org.junit.Assert.assertTrue;
+import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.cdi.lang.model.tck.LangModelVerifier;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.BeansXml;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension;
-import jakarta.enterprise.inject.spi.Extension;
+import static java.lang.System.Logger.Level.INFO;
+import static org.glassfish.tck.cdi.lang.model.LangModelVerifierBuildCompatibleExtension.langModelVerifierBuildCompatibleExtensionPassed;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(Arquillian.class)
 public class CDILangModelTCKRunner {
 
+    private static final System.Logger LOG = System.getLogger(CDILangModelTCKRunner.class.getName());
+
     @Deployment
     public static WebArchive deploy() {
-        WebArchive archive= ShrinkWrap.create(WebArchive.class)
+        WebArchive archive = ShrinkWrap.create(WebArchive.class)
 
                 // The package we are testing
                 .addPackage(LangModelVerifier.class.getPackage())
@@ -45,17 +46,11 @@ public static WebArchive deploy() {
                 .addClass(LangModelVerifierBuildCompatibleExtension.class)
                 .addAsServiceProvider(BuildCompatibleExtension.class, LangModelVerifierBuildCompatibleExtension.class)
 
-                // The cleanup extension that vetoes all classes that we're testing, since they are only
-                // meant for the lang model verifier and shouldn't be processed afterwards.
-                .addClass(CleanupExtension.class)
-                .addAsServiceProvider(Extension.class, CleanupExtension.class)
+                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
 
-                .addAsWebInfResource(new BeansXml(ALL), "beans.xml");
-
-        System.out.println(archive.toString(true));
+        LOG.log(INFO, archive.toString(true));
 
         return archive;
-
     }
 
     @Test

appserver/tests/tck/cdi/cdi-model/pom.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -15,23 +15,27 @@
  */
 package org.glassfish.tck.cdi.lang.model;
 
-import org.jboss.cdi.lang.model.tck.LangModelVerifier;
-
 import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension;
 import jakarta.enterprise.inject.build.compatible.spi.ClassConfig;
+import jakarta.enterprise.inject.build.compatible.spi.Discovery;
 import jakarta.enterprise.inject.build.compatible.spi.Enhancement;
+import jakarta.enterprise.inject.build.compatible.spi.ScannedClasses;
+
+import org.jboss.cdi.lang.model.tck.LangModelVerifier;
 
 public class LangModelVerifierBuildCompatibleExtension implements BuildCompatibleExtension {
 
-    public static boolean langModelVerifierBuildCompatibleExtensionCalled;
     public static boolean langModelVerifierBuildCompatibleExtensionPassed;
 
+    @Discovery
+    public void discovery(ScannedClasses scannedClasses) {
+        scannedClasses.add(LangModelVerifier.class.getName());
+    }
+
     @Enhancement(types = LangModelVerifier.class)
     public void configure(ClassConfig classConfig) {
-        langModelVerifierBuildCompatibleExtensionCalled = true;
         LangModelVerifier.verify(classConfig.info());
         // If there's an error, the verify() method will throw an exception
         langModelVerifierBuildCompatibleExtensionPassed = true;
     }
-
 }

appserver/tests/tck/cdi/cdi-model/src/test/java/org/glassfish/tck/cdi/lang/model/CDILangModelTCKRunner.java

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+    Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@ Usage:
 
 Run full TCK:
 
-mvn clean clean
+mvn clean install
 
 
 Run all tests in test class
@@ -65,7 +65,7 @@ mvn clean install -Dgroups=security
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <tck.version>3.1.1</tck.version>
+        <tck.version>3.1.5</tck.version>
 
         <glassfish.version>${project.version}</glassfish.version>
         <glassfish.root>${project.build.directory}</glassfish.root>