[jackrabbit-oak] branch trunk updated: OAK-9427: EOL 1.4 - Oak site

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1eecb92  OAK-9427: EOL 1.4 - Oak site
     new c37f1d4  Merge branch 'trunk' of github.com:apache/jackrabbit-oak into trunk
1eecb92 is described below

commit 1eecb927b5a0638a58541c476b40e929713dc3ce
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Sep 13 11:10:36 2021 +0100

    OAK-9427: EOL 1.4 - Oak site
---
 oak-doc/src/site/markdown/release-schedule.md | 2 --
 oak-doc/src/site/markdown/roadmap.md          | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/oak-doc/src/site/markdown/release-schedule.md b/oak-doc/src/site/markdown/release-schedule.md
index 7cf7718..1003ffe 100644
--- a/oak-doc/src/site/markdown/release-schedule.md
+++ b/oak-doc/src/site/markdown/release-schedule.md
@@ -26,8 +26,6 @@ according to needs
 - 1.22: every 13 weeks (~4 / year)
 - 1.8: every 13 weeks (~4 / year)
 - 1.6: every 26 weeks (~2 / year)
-- 1.4: every 26 weeks (~2 / year)
-- 1.2: every 52 weeks (1 / year)
 
 ## Strategies
 
diff --git a/oak-doc/src/site/markdown/roadmap.md b/oak-doc/src/site/markdown/roadmap.md
old mode 100755
new mode 100644
index 93bf991..61cd2c6
--- a/oak-doc/src/site/markdown/roadmap.md
+++ b/oak-doc/src/site/markdown/roadmap.md
@@ -33,14 +33,12 @@ We currently support the following maintenance branches:
 * [Oak 1.22](https://github.com/apache/jackrabbit-oak/tree/1.22/) ([download](https://jackrabbit.apache.org/jcr/downloads.html#oak1.22)) - from Java 8 up to Java 13
 * [Oak 1.8](https://github.com/apache/jackrabbit-oak/tree/1.8/) ([download](https://jackrabbit.apache.org/jcr/downloads.html#oak1.8)) - from Java 8 up to Java 13
 * [Oak 1.6](https://github.com/apache/jackrabbit-oak/tree/1.6/) ([download](https://jackrabbit.apache.org/jcr/downloads.html#oak1.6)) - recommended version for Java 7 (Java 8 and later since 1.6.21) - "end of life" planned for Spring 2022
-* [Oak 1.4](https://github.com/apache/jackrabbit-oak/tree/1.4/) ([download](https://jackrabbit.apache.org/jcr/downloads.html#oak1.4)) - recommended version for Java 7 (Java 8 and later since 1.4.27) - "end of life" planned for Spring 2021
-
-Users of 1.4 and 1.6 should consider upgrading to the newest stable branch applicable for the Java version in use.
 
 End of life
 -----------
 The following branches have reached "end of life":
 
 * [Oak 1.10](https://github.com/apache/jackrabbit-oak/tree/1.10/)
+* [Oak 1.4](https://github.com/apache/jackrabbit-oak/tree/1.4/)
 * [Oak 1.2](https://github.com/apache/jackrabbit-oak/tree/1.2/)
 * [Oak 1.0](https://github.com/apache/jackrabbit-oak/tree/1.0/)