diff --git a/api/pom.xml b/api/pom.xml index 94405952..fc018c0d 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -124,10 +124,11 @@ - 2.1.0 + 3.0.0-M1 2.0.1 - 5.0.0 - 2.1.0 + 5.0.1 + 2.2.0-M1 + MMMM dd, yyyy @@ -137,7 +138,7 @@ org.testng testng - 6.8.8 + 7.7.0 @@ -274,6 +275,14 @@ src/main/resources + + src/main/javadoc + true + + overview.html + + ${project.build.directory}/javadoc + @@ -323,13 +332,24 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-surefire-plugin @@ -370,18 +390,18 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} true Jakarta Contexts and Dependency Injection API Jakarta Contexts and Dependency Injection API false + ${project.build.directory}/javadoc/overview.html Jakarta Contexts and Dependency Injection API
Jakarta Contexts and Dependency Injection ${project.version}]]>
cdi-dev@eclipse.org.
-Copyright © 2018,2022 Eclipse Foundation.
+Copyright © 2018,2023 Eclipse Foundation.
Use is subject to license terms.]]> diff --git a/api/src/main/javadoc/overview.html b/api/src/main/javadoc/overview.html index 35ee3a4b..6c0319bb 100644 --- a/api/src/main/javadoc/overview.html +++ b/api/src/main/javadoc/overview.html @@ -1,6 +1,7 @@ +Version: ${project.version}, ${maven.build.timestamp}

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 index a724101c..89d31555 100644 --- a/el/pom.xml +++ b/el/pom.xml @@ -106,17 +106,27 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} true Jakarta CDI EL integration API @@ -126,7 +136,7 @@ cdi-dev@eclipse.org.
-Copyright © 2018,2020 Eclipse Foundation.
+Copyright © 2018,2023 Eclipse Foundation.
Use is subject to license terms.]]> diff --git a/lang-model/pom.xml b/lang-model/pom.xml index dc3b9086..dc905c86 100644 --- a/lang-model/pom.xml +++ b/lang-model/pom.xml @@ -72,17 +72,27 @@ org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.version} ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} true Jakarta CDI Language Model diff --git a/pom.xml b/pom.xml index f196ef19..f09700c8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise @@ -44,11 +44,9 @@ 11 - 5.1.2 + 5.1.9 3.8.1 - 3.2.0 - 3.3.0 - 3.0.0-M5 + 3.2.2 https://jakarta.oss.sonatype.org/ ${sonatypeOssDistMgmtNexusUrl}content/repositories/staging/ diff --git a/spec/pom.xml b/spec/pom.xml index 02b9de90..a00c29e2 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -14,13 +14,14 @@ CDI Specification documentation - 2.2.1 - 2.5.2 - 1.6.0 + 2.2.4 + 2.5.10 + 2.3.9 asl2 - Draft + Draft(M1) + 4.1 MMMM dd, yyyy ${maven.build.timestamp} @@ -67,12 +68,13 @@ + tck ${project.build.directory}/generated-docs/cdi-spec.html - 2.0.3.Final - https://repo1.maven.org/maven2/org/jboss/cdi/tck/cdi-tck-impl/${tck.version}/cdi-tck-impl-${tck.version}-audit-cdi.xml - https://repo1.maven.org/maven2/org/jboss/cdi/tck/cdi-tck-impl/${tck.version}/cdi-tck-impl-${tck.version}-coverage-cdi.html + 4.0.12 + https://repo1.maven.org/maven2/jakarta/enterprise/cdi-tck-core-impl/${tck.version}/cdi-tck-core-impl-${tck.version}-audit-cdi.xml + https://repo1.maven.org/maven2/jakarta/enterprise/cdi-tck-core-impl/${tck.version}/cdi-tck-impl-${tck.version}-coverage-cdi.html @@ -87,7 +89,7 @@ maven-resources-plugin - 2.7 + 3.3.1 copy-resources @@ -109,7 +111,7 @@ org.codehaus.mojo exec-maven-plugin - 1.3.2 + 3.1.1 package @@ -199,20 +201,14 @@ cdi-spec.asciidoc ${license-file} + ${revnumber} ${revremark} + ${revisiondate} images coderay - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0-M1 - - true - - diff --git a/spec/src/main/asciidoc/cdi-spec.asciidoc b/spec/src/main/asciidoc/cdi-spec.asciidoc index 9f977403..6f5be6c1 100644 --- 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: cdi-dev@eclipse.org -: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 index c01ed412..684bb5e5 100644 --- 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 index affd1c0d..ba45debf 100644 --- 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.