- Cleanup in prep for the 4.1.0-M1 release (#710)

- Cleanup in prep for the 4.1.0-M1 release + Update to use latest parent pom for common plugin versions and sbom generation + Use parent pom version where appropriate + Update other plugin versions + Restore source attachment which was lost somewhere + Update copyright dates + Externalize the spec date, revision and status + Include the api version and build timestamp in the javadoc overview page + Fix the javadoc errors on Java SE 17, 21 + Add dependenbot updates for el and bundle plugin + Update interceptors to 2.2.0-M1 --------- Signed-off-by: Scott M Stark <[email protected]>
jakartaee · Nov 30, 2023 · ee5f6b7 · ee5f6b7
1 parent 5240957
commit ee5f6b7
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 39 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -124,10 +124,11 @@
 
 
 	<properties>
-		<annotation.api.version>2.1.0</annotation.api.version>
+		<annotation.api.version>3.0.0-M1</annotation.api.version>
 		<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>
+		<uel.api.version>5.0.1</uel.api.version>
+		<interceptor.api.version>2.2.0-M1</interceptor.api.version>
+		<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
 	</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>7.7.0</version>
 			</dependency>
 
 			<dependency>
@@ -274,6 +275,14 @@
 			<resource>
 				<directory>src/main/resources</directory>
 			</resource>
+			<resource>
+				<directory>src/main/javadoc</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>overview.html</include>
+				</includes>
+				<targetPath>${project.build.directory}/javadoc</targetPath>
+			</resource>
 		</resources>
 		<testResources>
 			<testResource>
@@ -323,13 +332,24 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven-jar-plugin.version}</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -370,18 +390,18 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven-javadoc-plugin.version}</version>
 				<configuration>
 					<docfilessubdirs>true</docfilessubdirs>
 					<description>Jakarta Contexts and Dependency Injection API</description>
 					<doctitle>Jakarta Contexts and Dependency Injection API</doctitle>
 					<detectJavaApiLink>false</detectJavaApiLink>
+					<overview>${project.build.directory}/javadoc/overview.html</overview>
 					<windowtitle>Jakarta Contexts and Dependency Injection API</windowtitle>
 					<header><![CDATA[<br>Jakarta Contexts and Dependency Injection ${project.version}]]>
 					</header>
 					<bottom><![CDATA[
 Comments to: <a href="mailto:[email protected]">[email protected]</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>

diff --git a/api/src/main/javadoc/overview.html b/api/src/main/javadoc/overview.html
@@ -1,6 +1,7 @@
 <html>
 
 <body>
+<b>Version: ${project.version}, ${maven.build.timestamp}</b>
 
 <p>Contexts and Dependency Injection (CDI) defines a set of 
 complementary services that help improve the structure of application

diff --git a/el/pom.xml b/el/pom.xml
@@ -106,17 +106,27 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven-jar-plugin.version}</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven-javadoc-plugin.version}</version>
 				<configuration>
 					<docfilessubdirs>true</docfilessubdirs>
 					<description>Jakarta CDI EL integration API</description>
@@ -126,7 +136,7 @@
 					</header>
 					<bottom><![CDATA[
 Comments to: <a href="mailto:[email protected]">[email protected]</a>.<br>
-Copyright &#169; 2018,2020 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>

diff --git a/lang-model/pom.xml b/lang-model/pom.xml
@@ -72,17 +72,27 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>${maven-jar-plugin.version}</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven-javadoc-plugin.version}</version>
 				<configuration>
 					<docfilessubdirs>true</docfilessubdirs>
 					<description>Jakarta CDI Language Model</description>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.ee4j</groupId>
 		<artifactId>project</artifactId>
-		<version>1.0.6</version>
+		<version>1.0.9</version>
 	</parent>
 
 	<groupId>jakarta.enterprise</groupId>
@@ -44,11 +44,9 @@
 
 		<maven.compiler.release>11</maven.compiler.release>
 
-		<maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
+		<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-		<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
-		<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
 
 		<sonatypeOssDistMgmtNexusUrl>https://jakarta.oss.sonatype.org/</sonatypeOssDistMgmtNexusUrl>
 		<sonatypeOssDistMgmtStagingUrl>${sonatypeOssDistMgmtNexusUrl}content/repositories/staging/</sonatypeOssDistMgmtStagingUrl>

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -14,13 +14,14 @@
 	<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>
 		<!-- asl2 for non-final releases, or final for EFSL -->
 		<license-file>asl2</license-file>
 		<!-- Draft for non-final releases, or Final for spec release -->
-		<revremark>Draft</revremark>
+		<revremark>Draft(M1)</revremark>
+		<revnumber>4.1</revnumber> <!-- major.minor only -->
 		<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
 		<revisiondate>${maven.build.timestamp}</revisiondate>
 	</properties>
@@ -67,12 +68,13 @@
 		</profile>
 
 		<profile>
+			<!-- TODO post M1 as this fails to build with updated TCK source -->
 			<id>tck</id>
 			<properties>
 				<path.to.cdi.spec>${project.build.directory}/generated-docs/cdi-spec.html</path.to.cdi.spec>
-				<tck.version>2.0.3.Final</tck.version>
-				<tck.audit.url>https://repo1.maven.org/maven2/org/jboss/cdi/tck/cdi-tck-impl/${tck.version}/cdi-tck-impl-${tck.version}-audit-cdi.xml</tck.audit.url>
-				<tck.coverage.url>https://repo1.maven.org/maven2/org/jboss/cdi/tck/cdi-tck-impl/${tck.version}/cdi-tck-impl-${tck.version}-coverage-cdi.html
+				<tck.version>4.0.12</tck.version>
+				<tck.audit.url>https://repo1.maven.org/maven2/jakarta/enterprise/cdi-tck-core-impl/${tck.version}/cdi-tck-core-impl-${tck.version}-audit-cdi.xml</tck.audit.url>
+				<tck.coverage.url>https://repo1.maven.org/maven2/jakarta/enterprise/cdi-tck-core-impl/${tck.version}/cdi-tck-impl-${tck.version}-coverage-cdi.html
 				</tck.coverage.url>
 			</properties>
 			<dependencies>
@@ -87,7 +89,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-resources-plugin</artifactId>
-						<version>2.7</version>
+						<version>3.3.1</version>
 						<executions>
 							<execution>
 								<id>copy-resources</id>
@@ -109,7 +111,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.3.2</version>
+						<version>3.1.1</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -199,20 +201,14 @@
 					<sourceDocumentName>cdi-spec.asciidoc</sourceDocumentName>
 					<attributes>
 						<license>${license-file}</license>
+						<revnumber>${revnumber}</revnumber>
 						<revremark>${revremark}</revremark>
+						<revdate>${revisiondate}</revdate>
 						<imagesdir>images</imagesdir>
 						<source-highlighter>coderay</source-highlighter>
 					</attributes>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>3.0.0-M1</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/spec/src/main/asciidoc/cdi-spec.asciidoc b/spec/src/main/asciidoc/cdi-spec.asciidoc
@@ -1,9 +1,9 @@
 = Jakarta Contexts and Dependency Injection
 :author: Jakarta Contexts and Dependency Injection Specification Project
 :email: [email protected]
-:revnumber: 4.1
-:revdate: May 24 2023
-:revremark: Draft
+:revnumber: {revnumber}
+:revdate: {revdate}
+:revremark: {revremark}
 :version-label!:
 :sectanchors:
 :doctype: book

diff --git a/spec/src/main/asciidoc/license-asl2.asciidoc b/spec/src/main/asciidoc/license-asl2.asciidoc
@@ -11,7 +11,7 @@ Specification Lead:  Red Hat, Inc.
 
 Release: {revdate}
 
-Copyright 2017,2022 Red Hat, Inc.
+Copyright 2017,2023 Red Hat, Inc.
 100 East Davie Street, Raleigh, NC 27601, U.S.A.
 
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/spec/src/main/asciidoc/license-final.asciidoc b/spec/src/main/asciidoc/license-final.asciidoc
@@ -14,7 +14,7 @@ Release: {revdate}
 
 === Final license
 
-Copyright 2018,2022 Eclipse Foundation.
+Copyright 2018,2023 Eclipse Foundation.
 
 This specification is licensed under the Eclipse Foundation Specification License 1.0; this specification is based on material that is licensed under the Apache License, version 2.0.