From a83acd50c53859ae3b7e5ab5358e2fc04ddedce1 Mon Sep 17 00:00:00 2001 From: starksm64 Date: Tue, 26 Oct 2021 16:12:15 -0500 Subject: [PATCH 1/4] Correct the readme url in 2021-10-25-pages-here.md Update the root readme Signed-off-by: starksm64 --- README.md | 9 +++++++-- docs/_posts/2021-10-25-pages-here.md | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8e02853fc..8987cb24a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ -# Check out the [cdi-spec.org](http://cdi-spec.org) for more info on CDI 2.0 and CDI 1.2 + +# GitHub Pages +The latest news for CDI 4.x can be found in the [GitHub pages](https://eclipse-ee4j.github.io/cdi/) Sources in GIT ==== -Master contains the work-in-progress on CDI 3.0 specification +Master contains the work-in-progress on CDI 4.0 specification + +# Legacy Releases +Check out the [cdi-spec.org](http://cdi-spec.org) for more info on CDI 2.0 and CDI 1.2 diff --git a/docs/_posts/2021-10-25-pages-here.md b/docs/_posts/2021-10-25-pages-here.md index 0186d5a94..83bad4eb4 100644 --- a/docs/_posts/2021-10-25-pages-here.md +++ b/docs/_posts/2021-10-25-pages-here.md @@ -8,5 +8,4 @@ author: starksm # CDI GitHub Pages -The GitHub pages for Jakarta CDI has arrived. See the https://github.com/eclipse-ee4j/cdi/tree/master/docs/README.md[README.md] file for how to build the pages site locally, and how to create a blog entry. - +The GitHub pages for Jakarta CDI has arrived. See the [README.md](https://github.com/eclipse-ee4j/cdi/tree/master/docs/README.md) file for how to build the pages site locally, and how to create a blog entry. \ No newline at end of file From 3cd3501bceebd96f88b585a2ffe5e67d8a8b14c1 Mon Sep 17 00:00:00 2001 From: starksm64 Date: Wed, 17 Nov 2021 15:57:33 -0600 Subject: [PATCH 2/4] Update asciidoc plugin and config for #558 Signed-off-by: starksm64 --- spec/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/pom.xml b/spec/pom.xml index 9c91d6aec..b54997849 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -14,8 +14,8 @@ CDI Specification documentation - 1.5.6 - 1.5.0-alpha.14 + 2.2.1 + 1.6.0 asl2 @@ -190,10 +190,10 @@ cdi-spec.asciidoc - coderay ${license-file} ${revremark} + coderay From 6580fb4979561e69168178fefafdf5f6dc2a3ef4 Mon Sep 17 00:00:00 2001 From: starksm64 Date: Thu, 18 Nov 2021 07:49:54 -0600 Subject: [PATCH 3/4] Add explicit asciidoctorj version and dependency, update sourceDirectory and imagesdir Signed-off-by: starksm64 --- spec/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/pom.xml b/spec/pom.xml index b54997849..f0bdc1695 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -15,6 +15,7 @@ 2.2.1 + 2.5.2 1.6.0 asl2 @@ -156,6 +157,11 @@ asciidoctor-maven-plugin ${asciidoctor-maven.version} + + org.asciidoctor + asciidoctorj + ${asciidoctorj.version} + org.asciidoctor asciidoctorj-pdf @@ -189,10 +195,12 @@ + src/main/asciidoc cdi-spec.asciidoc ${license-file} ${revremark} + images coderay From 2ba1495dfe7f0c289236d091353473e1389d9eb0 Mon Sep 17 00:00:00 2001 From: starksm64 Date: Thu, 18 Nov 2021 07:59:33 -0600 Subject: [PATCH 4/4] Correct the revnumber and revdate Signed-off-by: starksm64 --- spec/src/main/asciidoc/cdi-spec.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/src/main/asciidoc/cdi-spec.asciidoc b/spec/src/main/asciidoc/cdi-spec.asciidoc index 12a61d413..2ad8322d4 100644 --- a/spec/src/main/asciidoc/cdi-spec.asciidoc +++ b/spec/src/main/asciidoc/cdi-spec.asciidoc @@ -1,8 +1,8 @@ = Jakarta Contexts and Dependency Injection :author: Jakarta Contexts and Dependency Injection Spec Project lead by Antoine Sabot-Durand :email: cdi-dev@eclipse.org -:revnumber: 3.0 -:revdate: July 30 2020 +:revnumber: 4.0 +:revdate: November 18 2021 :revremark: Draft :version-label!: :sectanchors: