Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Nov 30, 2023
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31587f0
- Cleanup in prep for the 4.1.0-M1 release
starksm64 Nov 30, 2023
3401020
+ Externalize the spec date, revision and status
starksm64 Nov 30, 2023
aefb569
+ Include the api version and build timestamp in the javadoc overview…
starksm64 Nov 30, 2023
3090f7c
+ Fix the javadoc errors on Java SE 17, 21
starksm64 Nov 30, 2023
3b07372
+ Add dependenbot updates for el and bundle plugin
starksm64 Nov 30, 2023
4ebb22b
+ Update interceptors to 2.2.0-M1
starksm64 Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.2.0-RC1 here?

Or, if you have the powers, it would be great to have jakartaee/interceptors#103 merged and another RC / milestone / whatever released.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, that would be great. I tried bumping that PR months ago but didn't get response.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interceptors PR has been merged for the next release. The annotation.api.version should be 3.0.0-M1for EE 11.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went to do a release of interceptors and see there already is a 2.2.0-M1, so I guess you were talking about 2.2.0-RC1 being for interceptors. If this has been release we will have to stick with that, otherwise I'll redo it. Right now CDI does not build with that version so it does not appear to have made it to central, but it could be syncing.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

I was thinking we should bump the interceptor.api.version here, too. I don't know what would be the correct version string of the next Interceptors release (2.2.0-M1 or 2.2.0-RC2 I guess), but I'm pretty sure we'll need that too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Emily-Jiang Yes, there is some problem with the check plugin that needs to be update. We also need to update the parent pom version. Do you want me to look at getting the release out?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See this PR, jakartaee/interceptors#105

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @starksm64 ! I merged your PR and kicked off the Interceptor build 2.2.0-M1. It was done successfully. However, I could not push it out to maven central as I am unable to see the stage repo id from Sonatype. I need to request an access for that. Can you please release it to maven central and then you can update the dependency to that spec in CDI pom.xml?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Emily-Jiang Ok, doing it now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It built for me locally as I see the 2.2.0-M1 in https://repo1.maven.org/maven2/jakarta/interceptor/jakarta.interceptor-api/. We will see if the build CI is seeing the update as well.

<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
</properties>

<!-- Configure all dependencies (e.g. testing) -->
Expand All @@ -137,7 +138,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
<version>7.7.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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: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>
Expand Down
1 change: 1 addition & 0 deletions api/src/main/javadoc/overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 13 additions & 3 deletions el/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -126,7 +136,7 @@
</header>
<bottom><![CDATA[
Comments to: <a href="mailto:cdi-dev@eclipse.org">cdi-dev@eclipse.org</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>
Expand Down
14 changes: 12 additions & 2 deletions lang-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 2 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -46,9 +46,7 @@

<maven-bundle-plugin.version>5.1.2</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>
Expand Down
30 changes: 13 additions & 17 deletions spec/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
6 changes: 3 additions & 3 deletions spec/src/main/asciidoc/cdi-spec.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
= Jakarta Contexts and Dependency Injection
:author: Jakarta Contexts and Dependency Injection Specification Project
:email: cdi-dev@eclipse.org
:revnumber: 4.1
:revdate: May 24 2023
:revremark: Draft
:revnumber: {revnumber}
:revdate: {revdate}
:revremark: {revremark}
:version-label!:
:sectanchors:
:doctype: book
Expand Down
2 changes: 1 addition & 1 deletion spec/src/main/asciidoc/license-asl2.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion spec/src/main/asciidoc/license-final.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down