From e1387e808e1b4dc3c31f29a01abb5bf2a3d56503 Mon Sep 17 00:00:00 2001
From: Said BOUDJELDA <bmscomp@gmail.com>
Date: Fri, 24 Nov 2023 21:31:31 +0100
Subject: [PATCH 1/4] upgrade testng dependency to version 7.8.0

---
 api/pom.xml                                            |  4 +++-
 .../org/jboss/cdi/api/test/AnnotationLiteralTest.java  |  5 ++---
 api/src/test/java/org/jboss/cdi/api/test/CDITest.java  | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 94405952..8bb82d77 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -128,6 +128,7 @@
 		<atinject.api.version>2.0.1</atinject.api.version>
 		<uel.api.version>5.0.0</uel.api.version>
 		<interceptor.api.version>2.1.0</interceptor.api.version>
+		<testng.version>7.8.0</testng.version>
 	</properties>
 
 	<!-- Configure all dependencies (e.g. testing) -->
@@ -137,7 +138,7 @@
 			<dependency>
 				<groupId>org.testng</groupId>
 				<artifactId>testng</artifactId>
-				<version>6.8.8</version>
+				<version>${testng.version}</version>
 			</dependency>
 
 			<dependency>
@@ -379,6 +380,7 @@
 					<windowtitle>Jakarta Contexts and Dependency Injection API</windowtitle>
 					<header><![CDATA[<br>Jakarta Contexts and Dependency Injection ${project.version}]]>
 					</header>
+					<!--suppress UnresolvedMavenProperty -->
 					<bottom><![CDATA[
 Comments to: <a href="mailto:cdi-dev@eclipse.org">cdi-dev@eclipse.org</a>.<br>
 Copyright &#169; 2018,2022 Eclipse Foundation.<br>
diff --git a/api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java b/api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java
index 70652fd6..aa914b22 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/AnnotationLiteralTest.java
@@ -1,7 +1,6 @@
 package org.jboss.cdi.api.test;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.BeforeDestroyed;
@@ -77,8 +76,8 @@ public void testNonbindingLiteral() {
 
     @Test
     public void testTypedLiteral() {
-        assertTrue(Typed.Literal.INSTANCE.value().length == 0);
-        assertTrue(Typed.Literal.of(new Class[] { String.class }).value()[0] == String.class);
+        assertEquals(Typed.Literal.INSTANCE.value().length,  0);
+        assertEquals(Typed.Literal.of(new Class[] { String.class }).value()[0], String.class);
     }
 
     @SuppressWarnings("serial")
diff --git a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
index 00bfd4b7..323c75ec 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
@@ -53,7 +53,7 @@ public void setUp() throws Exception {
     }
 
     @Test(expectedExceptions = IllegalStateException.class)
-    public void testWithoutServiceFile() throws Exception {
+    public void testWithoutServiceFile() throws IllegalStateException {
         CDI.current();
     }
 
@@ -96,7 +96,7 @@ public void testWithTwoGoodCDIProvider() throws Exception {
         fw.write('\n');
         fw.write(DummyCDIProvider.class.getName());
         fw.close();
-        Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
+        Assert.assertEquals(DummyCDIProvider.DummyCDI.class, CDI.current().getClass());
     }
 
 
@@ -107,7 +107,7 @@ public void testWithTwoGoodCDIProviderReverse() throws Exception {
         fw.write('\n');
         fw.write(DummyCDIProvider2.class.getName());
         fw.close();
-        Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
+        Assert.assertEquals(DummyCDIProvider.DummyCDI.class, CDI.current().getClass());
     }
 
     @Test
@@ -117,7 +117,7 @@ public void testWithTwoCDIProviderOneWithNullCDIAndOneGood() throws Exception {
         fw.write('\n');
         fw.write(DummyCDIProvider2.class.getName());
         fw.close();
-        Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider2.DummyCDI2.class));
+        Assert.assertEquals(DummyCDIProvider2.DummyCDI2.class, CDI.current().getClass());
     }
 
 
@@ -130,7 +130,7 @@ public void testWithThreeCDIProviderOneWithNullCDIAndOthersGood() throws Excepti
         fw.write('\n');
         fw.write(DummyCDIProvider.class.getName());
         fw.close();
-        Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
+        Assert.assertEquals(DummyCDIProvider.DummyCDI.class, CDI.current().getClass());
     }
 
 

From e2951c7d9d70210850974452dc623c64d117484f Mon Sep 17 00:00:00 2001
From: Said BOUDJELDA <bmscomp@gmail.com>
Date: Sat, 25 Nov 2023 21:02:49 +0100
Subject: [PATCH 2/4] update copyrithy year

---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index 8bb82d77..81fbb87b 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -383,7 +383,7 @@
 					<!--suppress UnresolvedMavenProperty -->
 					<bottom><![CDATA[
 Comments to: <a href="mailto:cdi-dev@eclipse.org">cdi-dev@eclipse.org</a>.<br>
-Copyright &#169; 2018,2022 Eclipse Foundation.<br>
+Copyright &#169; 2018,2023 Eclipse Foundation.<br>
 Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
 					</bottom>
 				</configuration>

From 828bf4d9e8762da7aac6428a95e1e410d8dbebc6 Mon Sep 17 00:00:00 2001
From: Said BOUDJELDA <bmscomp@gmail.com>
Date: Sat, 25 Nov 2023 21:17:05 +0100
Subject: [PATCH 3/4] update some dependencies

---
 spec/pom.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/spec/pom.xml b/spec/pom.xml
index 02b9de90..998013eb 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -14,9 +14,13 @@
 	<description>CDI Specification documentation</description>
 
 	<properties>
-		<asciidoctor-maven.version>2.2.1</asciidoctor-maven.version>
-		<asciidoctorj.version>2.5.2</asciidoctorj.version>
-		<asciidoctorj-pdf.version>1.6.0</asciidoctorj-pdf.version>
+		<asciidoctor-maven.version>2.2.4</asciidoctor-maven.version>
+		<asciidoctorj.version>2.5.10</asciidoctorj.version>
+		<asciidoctorj-pdf.version>2.3.9</asciidoctorj-pdf.version>
+		<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+		<tck-spec-mapper.version>1.0.0.Alpha2</tck-spec-mapper.version>
+		<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+		<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
 		<!-- asl2 for non-final releases, or final for EFSL -->
 		<license-file>asl2</license-file>
 		<!-- Draft for non-final releases, or Final for spec release -->
@@ -79,7 +83,7 @@
 				<dependency>
 					<groupId>org.jboss</groupId>
 					<artifactId>tck-spec-mapper</artifactId>
-					<version>1.0.0.Alpha2</version>
+					<version>${tck-spec-mapper.version}</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>
@@ -87,7 +91,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-resources-plugin</artifactId>
-						<version>2.7</version>
+						<version>${maven-resources-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>copy-resources</id>
@@ -109,7 +113,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.3.2</version>
+						<version>${exec-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -208,7 +212,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>3.0.0-M1</version>
+				<version>${maven-deploy-plugin.version}</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>

From 569cb10cb6a36c4f1120fadb8dfe3b93aafbf145 Mon Sep 17 00:00:00 2001
From: Said BOUDJELDA <bmscomp@gmail.com>
Date: Mon, 27 Nov 2023 13:34:38 +0100
Subject: [PATCH 4/4] restore the order of equals

---
 api/src/test/java/org/jboss/cdi/api/test/CDITest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
index 323c75ec..bb37ead8 100644
--- a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
+++ b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
@@ -96,7 +96,7 @@ public void testWithTwoGoodCDIProvider() throws Exception {
         fw.write('\n');
         fw.write(DummyCDIProvider.class.getName());
         fw.close();
-        Assert.assertEquals(DummyCDIProvider.DummyCDI.class, CDI.current().getClass());
+        Assert.assertEquals(CDI.current().getClass(), DummyCDIProvider.DummyCDI.class);
     }
 
 
@@ -107,7 +107,7 @@ public void testWithTwoGoodCDIProviderReverse() throws Exception {
         fw.write('\n');
         fw.write(DummyCDIProvider2.class.getName());
         fw.close();
-        Assert.assertEquals(DummyCDIProvider.DummyCDI.class, CDI.current().getClass());
+        Assert.assertEquals(CDI.current().getClass(), DummyCDIProvider.DummyCDI.class);
     }
 
     @Test
@@ -117,7 +117,7 @@ public void testWithTwoCDIProviderOneWithNullCDIAndOneGood() throws Exception {
         fw.write('\n');
         fw.write(DummyCDIProvider2.class.getName());
         fw.close();
-        Assert.assertEquals(DummyCDIProvider2.DummyCDI2.class, CDI.current().getClass());
+        Assert.assertEquals(CDI.current().getClass(), DummyCDIProvider2.DummyCDI2.class);
     }
 
 
@@ -130,7 +130,7 @@ public void testWithThreeCDIProviderOneWithNullCDIAndOthersGood() throws Excepti
         fw.write('\n');
         fw.write(DummyCDIProvider.class.getName());
         fw.close();
-        Assert.assertEquals(DummyCDIProvider.DummyCDI.class, CDI.current().getClass());
+        Assert.assertEquals(CDI.current().getClass(), DummyCDIProvider.DummyCDI.class);
     }