You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2022/03/18 20:25:58 UTC
[sling-site] branch issue/sling-12-released updated (52ed2aa -> d4e4629)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch issue/sling-12-released
in repository https://gitbox.apache.org/repos/asf/sling-site.git.
omit 52ed2aa Update to the latest jbake-maven-plugin version
omit 80cc5e7 Release Feature Model Analyser 1.6.2, Sling Feature Maven Plugin 1.6.2
new 75c6ab3 Include Sling Starter 12 in the downloads page
new 47dbc1e Downloads page: include Docker Images for applications, where available
new ab9c293 Correct Feature Model Launcher rendering
new d4e4629 Add link to Sling 12 javadocs
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (52ed2aa)
\
N -- N -- N refs/heads/issue/sling-12-released (d4e4629)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 14 ++++++++++----
src/main/jbake/content/releases.md | 1 -
src/main/jbake/templates/downloads.tpl | 23 ++++++++++++++++-------
src/main/jbake/templates/menu.tpl | 3 ++-
4 files changed, 28 insertions(+), 13 deletions(-)
[sling-site] 01/04: Include Sling Starter 12 in the downloads page
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch issue/sling-12-released
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit 75c6ab37db3595155c11b9a6513d1bea8ae71fc8
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Mar 18 20:46:00 2022 +0100
Include Sling Starter 12 in the downloads page
Also list the Feature Model Launcher as an application since it is required for the Feature Archives.
---
src/main/jbake/templates/downloads.tpl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl
index 5767e54..c36cc53 100644
--- a/src/main/jbake/templates/downloads.tpl
+++ b/src/main/jbake/templates/downloads.tpl
@@ -17,17 +17,18 @@
// ------------------------------------------------------------------------------------------------
U = new includes.U(config)
def PIPE_SEP = "\\|"
-def launchpadVersion="11"
+def starterVersion="12"
def slingIDETooling=[
"Sling IDE Tooling for Eclipse|eclipse|1.2.2|A p2 update site which can be installed in Eclipse.|sling-ide-tooling"
]
def slingApplication=[
- "Sling Starter Standalone|A self-runnable Sling jar, for experimenting and learning|org.apache.sling.starter|.jar|${launchpadVersion}|Y",
- "Sling Starter WAR|A ready-to run Sling webapp as a war file, for experimenting and learning|org.apache.sling.starter|-webapp.war|${launchpadVersion}|Y",
- "Sling Source Release|The released Sling source code|org.apache.sling.starter|-source-release.zip|${launchpadVersion}|Y",
+ "Sling Starter Feature Archive (Oak-Tar)|A self-container feature archive, for experimenting and learning. Requires the Feature Model Launcher (see below) |org.apache.sling.starter|-oak_mongo_far.far|${starterVersion}|Y",
+ "Sling Starter Feature Archive (Oak-Mongo)|A self-container feature archive, for experimenting and learning. Requires the Feature Model Launcher (see below) |org.apache.sling.starter|-oak_tar_far.far|${starterVersion}|Y",
+ "Sling Starter Source Release|The released Sling Starter source code|org.apache.sling.starter|-source-release.zip|${starterVersion}|Y",
"Sling CMS App|A reference CMS App built on Apache Sling|org.apache.sling.cms.feature|.jar|1.1.0|org.apache.sling.app.cms",
+ "Sling Feature Model Launcher|A tool for launching OSGi applications|org.apache.sling.feature.launcher|1.2.0|.jar|Y",
"Sling Feature Model converter|A CLI tool for converting from content packages to feature model files|org.apache.sling.feature.cpconverter|.zip|1.1.2|Y",
]
@@ -135,7 +136,6 @@ def bundles=[
"Event API|org.apache.sling.event.api|1.0.0|Y|jar",
"Feature Model|org.apache.sling.feature|1.2.30|Y|jar",
"Feature Model Analyser|org.apache.sling.feature.analyser|1.6.0|Y|jar",
- "Feature Model Launcher|org.apache.sling.feature.launcher|1.2.0|Y|jar",
"Feature Model Converter|org.apache.sling.feature.modelconverter|1.0.14|Y|jar",
"Feature Model Content Package Converter|org.apache.sling.feature.cpconverter|1.1.4|Y|jar",
"Feature Model Extension API Regions|org.apache.sling.feature.extension.apiregions|1.5.0|Y|jar",
[sling-site] 04/04: Add link to Sling 12 javadocs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch issue/sling-12-released
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit d4e46298f456d281d4ecb596fdf3836ad89c97ab
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Mar 18 21:25:24 2022 +0100
Add link to Sling 12 javadocs
---
src/main/jbake/templates/menu.tpl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/jbake/templates/menu.tpl b/src/main/jbake/templates/menu.tpl
index 7ada162..c5449e7 100644
--- a/src/main/jbake/templates/menu.tpl
+++ b/src/main/jbake/templates/menu.tpl
@@ -22,6 +22,7 @@ div(class:"container") {
strong("API Docs")
}
ul() {
+ li(){a(href:"${config.site_contextPath}apidocs/sling12/index.html", "Sling 12")}
li(){a(href:"${config.site_contextPath}apidocs/sling11/index.html", "Sling 11")}
li(){a(href:"${config.site_contextPath}apidocs/sling10/index.html", "Sling 10")}
li(){a(href:"${config.site_contextPath}apidocs/sling9/index.html", "Sling 9")}
@@ -88,4 +89,4 @@ div(class:"container") {
}
}
}
-}
\ No newline at end of file
+}
[sling-site] 02/04: Downloads page: include Docker Images for applications, where available
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch issue/sling-12-released
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit 47dbc1eb676eeb86696d2ee0410d4b603a11416e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Mar 18 21:22:22 2022 +0100
Downloads page: include Docker Images for applications, where available
---
src/main/jbake/templates/downloads.tpl | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl
index c36cc53..8a73e0d 100644
--- a/src/main/jbake/templates/downloads.tpl
+++ b/src/main/jbake/templates/downloads.tpl
@@ -24,8 +24,8 @@ def slingIDETooling=[
]
def slingApplication=[
- "Sling Starter Feature Archive (Oak-Tar)|A self-container feature archive, for experimenting and learning. Requires the Feature Model Launcher (see below) |org.apache.sling.starter|-oak_mongo_far.far|${starterVersion}|Y",
- "Sling Starter Feature Archive (Oak-Mongo)|A self-container feature archive, for experimenting and learning. Requires the Feature Model Launcher (see below) |org.apache.sling.starter|-oak_tar_far.far|${starterVersion}|Y",
+ "Sling Starter Feature Archive (Oak-Tar)|A self-container feature archive, for experimenting and learning. Requires the Feature Model Launcher (see below) |org.apache.sling.starter|-oak_mongo_far.far|${starterVersion}|Y|apache/sling:${starterVersion}",
+ "Sling Starter Feature Archive (Oak-Mongo)|A self-container feature archive, for experimenting and learning. Requires the Feature Model Launcher (see below) |org.apache.sling.starter|-oak_tar_far.far|${starterVersion}|Y|apache/sling:${starterVersion}",
"Sling Starter Source Release|The released Sling Starter source code|org.apache.sling.starter|-source-release.zip|${starterVersion}|Y",
"Sling CMS App|A reference CMS App built on Apache Sling|org.apache.sling.cms.feature|.jar|1.1.0|org.apache.sling.app.cms",
"Sling Feature Model Launcher|A tool for launching OSGi applications|org.apache.sling.feature.launcher|1.2.0|.jar|Y",
@@ -363,6 +363,11 @@ def githubLink(artifact,ghflag) {
}
}
+def dockerHubLink(image) {
+ image = image.replaceAll(':.*$', '') // remove version for the link
+ a(href:"https://hub.docker.com/r/${image}", "Docker Image")
+}
+
def tableHead(String [] headers) {
thead() {
tr() {
@@ -418,6 +423,10 @@ layout 'layout/main.tpl', true,
td(data[1])
def artifact = "${data[2]}-${data[4]}${data[3]}"
td(){
+ if (data.size() == 7) {
+ dockerHubLink(data[6])
+ yield(", ")
+ }
downloadLink(artifact, artifact, "", "")
}
}
[sling-site] 03/04: Correct Feature Model Launcher rendering
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch issue/sling-12-released
in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit ab9c2934a08d229a9d95144cd352b6b70a6e310f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Mar 18 21:23:41 2022 +0100
Correct Feature Model Launcher rendering
---
src/main/jbake/templates/downloads.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl
index 8a73e0d..a88419bb 100644
--- a/src/main/jbake/templates/downloads.tpl
+++ b/src/main/jbake/templates/downloads.tpl
@@ -28,7 +28,7 @@ def slingApplication=[
"Sling Starter Feature Archive (Oak-Mongo)|A self-container feature archive, for experimenting and learning. Requires the Feature Model Launcher (see below) |org.apache.sling.starter|-oak_tar_far.far|${starterVersion}|Y|apache/sling:${starterVersion}",
"Sling Starter Source Release|The released Sling Starter source code|org.apache.sling.starter|-source-release.zip|${starterVersion}|Y",
"Sling CMS App|A reference CMS App built on Apache Sling|org.apache.sling.cms.feature|.jar|1.1.0|org.apache.sling.app.cms",
- "Sling Feature Model Launcher|A tool for launching OSGi applications|org.apache.sling.feature.launcher|1.2.0|.jar|Y",
+ "Sling Feature Model Launcher|A tool for launching OSGi applications|org.apache.sling.feature.launcher|.jar|1.2.0|Y",
"Sling Feature Model converter|A CLI tool for converting from content packages to feature model files|org.apache.sling.feature.cpconverter|.zip|1.1.2|Y",
]