Skip to content

Commit 6fd2dee

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 08c4563 + 0fcf2b4 commit 6fd2dee

File tree

23 files changed

+548
-96
lines changed

23 files changed

+548
-96
lines changed

‎build-deploy.sh

+59-49
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020
# Call with "help" parameter to display syntax information
2121

2222
# defaults
23-
SLING_URL="http://localhost:4502"
24-
SLING_USER="admin"
25-
SLING_PASSWORD="admin"
23+
MAVEN_PROFILES="fast"
24+
SLING_URL=""
25+
SLING_USER=""
26+
SLING_PASSWORD=""
2627
JVM_ARGS=""
2728

2829
# display pause message only when script was executed via double-click on windows
@@ -42,10 +43,11 @@ help_message_exit() {
4243
echo " Syntax <parameters> <commands>"
4344
echo ""
4445
echo " Parameters:"
45-
echo " --sling.url=${SLING_URL}"
46-
echo " --sling.user=${SLING_USER}"
47-
echo " --sling.password=${SLING_PASSWORD}"
48-
echo " --jvm.args=${JVM_ARGS}"
46+
echo " --maven.profiles=${MAVEN_PROFILES} or -P${MAVEN_PROFILES}"
47+
echo " --sling.url=${SLING_URL} or -Dsling.url=${SLING_URL}"
48+
echo " --sling.user=${SLING_USER} or -Dsling.user=${SLING_USER}"
49+
echo " --sling.password=${SLING_PASSWORD} or -Dsling.password=${SLING_PASSWORD}"
50+
echo " --jvm.args=${JVM_ARGS} or -Djvm.args=${JVM_ARGS}"
4951
echo ""
5052
echo " Commands:"
5153
echo " build - Clean and install maven project"
@@ -61,6 +63,10 @@ parse_parameters() {
6163
for i in "$@"
6264
do
6365
case $i in
66+
--maven\.profiles=*|-P*)
67+
MAVEN_PROFILES="${i#*=}"
68+
shift # past argument=value
69+
;;
6470
--sling\.url=*|-Dsling\.url=*)
6571
SLING_URL="${i#*=}"
6672
shift # past argument=value
@@ -112,25 +118,25 @@ parse_parameters() {
112118
}
113119

114120
welcome_message() {
115-
echo -e "********************************************************************\e[96m"
121+
echo "********************************************************************"
116122
if ([ "$BUILD" = true ] && [ "$DEPLOY" = true ]) || [ "$HELP" = true ]; then
117-
echo " ___ _ _ ___ _ ___ _ ___ ___ ___ _ _____ __"
118-
echo " | _ ) | | |_ _| | | \ _| |_ | \| __| _ \ | / _ \ \ / /"
119-
echo " | _ \ |_| || || |__| |) | |_ _| | |) | _|| _/ |_| (_) \ V /"
120-
echo " |___/\___/|___|____|___/ |_| |___/|___|_| |____\___/ |_|"
123+
echo -e "\e[96m ___ _ _ ___ _ ___ _ ___ ___ ___ _ _____ __\e[0m"
124+
echo -e "\e[96m | _ ) | | |_ _| | | \ _| |_ | \| __| _ \ | / _ \ \ / /\e[0m"
125+
echo -e "\e[96m | _ \ |_| || || |__| |) | |_ _| | |) | _|| _/ |_| (_) \ V /\e[0m"
126+
echo -e "\e[96m |___/\___/|___|____|___/ |_| |___/|___|_| |____\___/ |_|\e[0m"
121127
elif [ "$BUILD" = true ]; then
122-
echo " ___ _ _ ___ _ ___ "
123-
echo " | _ ) | | |_ _| | | \\"
124-
echo " | _ \ |_| || || |__| |) |"
125-
echo " |___/\___/|___|____|___/"
128+
echo -e "\e[96m ___ _ _ ___ _ ___ \e[0m"
129+
echo -e "\e[96m | _ ) | | |_ _| | | \\ \e[0m"
130+
echo -e "\e[96m | _ \ |_| || || |__| |) |\e[0m"
131+
echo -e "\e[96m |___/\___/|___|____|___/\e[0m"
126132
elif [ "$DEPLOY" = true ]; then
127-
echo " ___ ___ ___ _ _____ __"
128-
echo " | \| __| _ \ | / _ \ \ / /"
129-
echo " | |) | _|| _/ |_| (_) \ V /"
130-
echo " |___/|___|_| |____\___/ |_|"
133+
echo -e "\e[96m ___ ___ ___ _ _____ __\e[0m"
134+
echo -e "\e[96m | \| __| _ \ | / _ \ \ / /\e[0m"
135+
echo -e "\e[96m | |) | _|| _/ |_| (_) \ V /\e[0m"
136+
echo -e "\e[96m |___/|___|_| |____\___/ |_|\e[0m"
131137
fi
132-
echo -e "\e[0m"
133-
echo -e " Destination: \e[1m${SLING_URL}\e[0m"
138+
echo ""
139+
echo -e " Profiles: \e[1m${MAVEN_PROFILES}\e[0m"
134140
echo ""
135141
echo "********************************************************************"
136142
}
@@ -156,8 +162,15 @@ execute_build() {
156162
echo -e "*** \e[1mBuild application\e[0m ***"
157163
echo ""
158164

159-
mvn ${JVM_ARGS} \
160-
-Pfast clean install eclipse:eclipse
165+
MAVEN_ARGS=""
166+
if [ -n "$JVM_ARGS" ]; then
167+
MAVEN_ARGS+="${JVM_ARGS} "
168+
fi
169+
if [ -n "${MAVEN_PROFILES}" ]; then
170+
MAVEN_ARGS+="--activate-profiles ${MAVEN_PROFILES} "
171+
fi
172+
173+
mvn $MAVEN_ARGS clean install eclipse:eclipse
161174

162175
if [ "$?" -ne "0" ]; then
163176
exit_with_error "*** BUILD FAILED ***"
@@ -171,17 +184,30 @@ execute_deploy() {
171184
echo -e "*** \e[1mDeploy to AEM\e[0m ***"
172185
echo ""
173186

187+
MAVEN_ARGS=""
188+
if [ -n "$JVM_ARGS" ]; then
189+
MAVEN_ARGS+="${JVM_ARGS} "
190+
fi
191+
if [ -n "${MAVEN_PROFILES}" ]; then
192+
MAVEN_ARGS+="--activate-profiles=${MAVEN_PROFILES} "
193+
fi
194+
if [ -n "${SLING_URL}" ]; then
195+
MAVEN_ARGS+="-Dsling.url=${SLING_URL} "
196+
fi
197+
if [ -n "${SLING_USER}" ]; then
198+
MAVEN_ARGS+="-Dsling.user=${SLING_USER} "
199+
fi
200+
if [ -n "${SLING_PASSWORD}" ]; then
201+
MAVEN_ARGS+="-Dsling.password=${SLING_PASSWORD} "
202+
fi
203+
174204
if [ "$DEPLOY_CORE_COMPONENTS" = true ]; then
175205
echo ""
176206
echo "Deploy Core Components..."
177207
echo ""
178-
mvn -f examples/content-packages/examples-libs \
208+
mvn $MAVEN_ARGS -f examples/content-packages/examples-libs \
179209
-Dvault.fileList='${project.build.directory}/dependency/core.wcm.components.all.zip' \
180210
-Dvault.force=true \
181-
${JVM_ARGS} \
182-
-Dsling.url=${SLING_URL} \
183-
-Dsling.user=${SLING_USER} \
184-
-Dsling.password=${SLING_PASSWORD} \
185211
wcmio-content-package:install
186212

187213
if [ "$?" -ne "0" ]; then
@@ -192,13 +218,9 @@ execute_deploy() {
192218
echo ""
193219
echo "Deploy Core Components examples..."
194220
echo ""
195-
mvn -f examples/content-packages/examples-libs \
221+
mvn $MAVEN_ARGS -f examples/content-packages/examples-libs \
196222
-Dvault.fileList='${project.build.directory}/dependency/core.wcm.components.examples.ui.config.zip,${project.build.directory}/dependency/core.wcm.components.examples.ui.apps.zip,${project.build.directory}/dependency/core.wcm.components.examples.ui.content.zip' \
197223
-Dvault.force=true \
198-
${JVM_ARGS} \
199-
-Dsling.url=${SLING_URL} \
200-
-Dsling.user=${SLING_USER} \
201-
-Dsling.password=${SLING_PASSWORD} \
202224
wcmio-content-package:install
203225

204226
if [ "$?" -ne "0" ]; then
@@ -208,11 +230,7 @@ execute_deploy() {
208230
echo ""
209231
echo "Deploy wcm.io Libraries ..."
210232
echo ""
211-
mvn -f examples/content-packages/examples-libs \
212-
${JVM_ARGS} \
213-
-Dsling.url=${SLING_URL} \
214-
-Dsling.user=${SLING_USER} \
215-
-Dsling.password=${SLING_PASSWORD} \
233+
mvn $MAVEN_ARGS -f examples/content-packages/examples-libs \
216234
wcmio-content-package:install
217235

218236
if [ "$?" -ne "0" ]; then
@@ -222,11 +240,7 @@ execute_deploy() {
222240
echo ""
223241
echo "Deploy wcm.io WCM Core Components examples application..."
224242
echo ""
225-
mvn -f examples/content-packages/examples \
226-
${JVM_ARGS} \
227-
-Dsling.url=${SLING_URL} \
228-
-Dsling.user=${SLING_USER} \
229-
-Dsling.password=${SLING_PASSWORD} \
243+
mvn $MAVEN_ARGS -f examples/content-packages/examples \
230244
wcmio-content-package:install
231245

232246
if [ "$?" -ne "0" ]; then
@@ -236,11 +250,7 @@ execute_deploy() {
236250
echo ""
237251
echo "Deploy wcm.io WCM Core Components examples content..."
238252
echo ""
239-
mvn -f examples/content-packages/examples-sample-content \
240-
${JVM_ARGS} \
241-
-Dsling.url=${SLING_URL} \
242-
-Dsling.user=${SLING_USER} \
243-
-Dsling.password=${SLING_PASSWORD} \
253+
mvn $MAVEN_ARGS -f examples/content-packages/examples-sample-content \
244254
wcmio-content-package:install
245255

246256
if [ "$?" -ne "0" ]; then

‎build-deploy_aem65.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# #%L
33
# wcm.io
44
# %%
5-
# Copyright (C) 2020 wcm.io
5+
# Copyright (C) 2022 wcm.io
66
# %%
77
# Licensed under the Apache License, Version 2.0 (the "License");
88
# you may not use this file except in compliance with the License.
@@ -17,21 +17,20 @@
1717
# limitations under the License.
1818
# #L%
1919

20-
21-
SLING_URL="http://localhost:45025"
20+
MAVEN_PROFILES="fast,aem65"
2221

2322
if [[ $0 == *":\\"* ]]; then
2423
DISPLAY_PAUSE_MESSAGE=true
2524
fi
2625

2726
# install AEM 6.5 with service pack
2827
mvn --non-recursive wcmio-content-package:install \
29-
-Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.12.0 \
30-
-Dvault.delayAfterInstallSec=30 \
31-
-Dsling.url=${SLING_URL}
28+
--activate-profiles=${MAVEN_PROFILES} \
29+
-Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.13.0 \
30+
-Dvault.delayAfterInstallSec=30
3231

3332
if [ "$?" -ne "0" ]; then
3433
exit
3534
fi
3635

37-
./build-deploy.sh --sling.url=${SLING_URL} --display.pause.message=${DISPLAY_PAUSE_MESSAGE} "$@"
36+
./build-deploy.sh --maven.profiles=${MAVEN_PROFILES} --display.pause.message=${DISPLAY_PAUSE_MESSAGE} "$@"

‎bundles/core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.11.0-2.19.0</version>
28+
<version>1.12.0-2.20.0</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.wcm.core.components</artifactId>
34-
<version>1.11.0-2.19.0</version>
34+
<version>1.12.0-2.20.0</version>
3535
<packaging>jar</packaging>
3636

3737
<name>WCM Core Components</name>

‎bundles/core/src/main/webapp/app-root/components/tableofcontents/v1/README.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Table of Contents (v1)
2+
====
3+
Component written in HTL and HTTP Request Filter that renders a table of contents(TOC) to help navigate the page content.
4+
5+
Extends the [Table of Contents AEM Sites Core Component][extends-component]
6+
7+
## Resource Type
8+
```
9+
wcm-io/wcm/core/components/tableofcontents/v1/tableofcontents
10+
```
11+
12+
## Enhanced Features
13+
14+
* No enhancements - inherits all features from its [super component][extends-component]
15+
16+
[extends-component]: https://github.com/adobe/aem-core-wcm-components/tree/master/content/src/content/jcr_root/apps/core/wcm/components/tableofcontents/v1/tableofcontents

‎bundles/core/src/main/webapp/app-root/components/tableofcontents/v1/tableofcontents,.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"jcr:primaryType": "cq:Component",
3+
"jcr:title": "wcm.io Table of Contents (v1)",
4+
"componentGroup": ".wcmio-core-wcm",
5+
"sling:resourceSuperType": "core/wcm/components/tableofcontents/v1/tableofcontents",
6+
"cq:isContainer": true
7+
}

‎changes.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,19 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26-
<release version="1.11.0-2.19.0" date="not released">
26+
<release version="1.12.0-2.20.0" date="2022-06-23">
27+
<action type="add" dev="sseifert">
28+
Add Table of Contents (v1).
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to AEM WCM Core Components 2.20.0.
32+
</action>
33+
<action type="update" dev="sseifert">
34+
Switch to AEM 6.5.13 as minimum version.
35+
</action>
36+
</release>
37+
38+
<release version="1.11.0-2.19.0" date="2022-05-12">
2739
<action type="add" dev="sseifert">
2840
Add Quick Search (v2).
2941
</action>

‎examples/bundles/examples-core/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.11.0-2.19.0</version>
28+
<version>1.12.0-2.20.0</version>
2929
<relativePath>../../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
34-
<version>1.11.0-2.19.0</version>
34+
<version>1.12.0-2.20.0</version>
3535
<packaging>jar</packaging>
3636

3737
<name>WCM Core Components Examples Core</name>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.wcm</groupId>
4646
<artifactId>io.wcm.wcm.core.components</artifactId>
47-
<version>1.11.0-2.19.0</version>
47+
<version>1.12.0-2.20.0</version>
4848
<scope>compile</scope>
4949
</dependency>
5050

‎examples/content-packages/examples-libs/pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.wcm.core.components.parent</artifactId>
28-
<version>1.11.0-2.19.0</version>
28+
<version>1.12.0-2.20.0</version>
2929
<relativePath>../../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.wcm.core.components.examples-libs</artifactId>
34-
<version>1.11.0-2.19.0</version>
34+
<version>1.12.0-2.20.0</version>
3535
<packaging>content-package</packaging>
3636

3737
<name>WCM Core Components Examples wcm.io Libraries</name>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.wcm</groupId>
4444
<artifactId>io.wcm.wcm.core.components</artifactId>
45-
<version>1.11.0-2.19.0</version>
45+
<version>1.12.0-2.20.0</version>
4646
<scope>compile</scope>
4747
</dependency>
4848

@@ -143,7 +143,7 @@
143143
<dependency>
144144
<groupId>io.wcm</groupId>
145145
<artifactId>io.wcm.caconfig.editor</artifactId>
146-
<version>1.11.0</version>
146+
<version>1.12.0</version>
147147
</dependency>
148148
<dependency>
149149
<groupId>io.wcm</groupId>
@@ -173,12 +173,12 @@
173173
<dependency>
174174
<groupId>io.wcm</groupId>
175175
<artifactId>io.wcm.handler.media</artifactId>
176-
<version>1.14.2</version>
176+
<version>1.14.4</version>
177177
</dependency>
178178
<dependency>
179179
<groupId>io.wcm</groupId>
180180
<artifactId>io.wcm.handler.richtext</artifactId>
181-
<version>1.5.8</version>
181+
<version>1.6.0</version>
182182
</dependency>
183183
<dependency>
184184
<groupId>io.wcm</groupId>
@@ -188,7 +188,7 @@
188188
<dependency>
189189
<groupId>io.wcm</groupId>
190190
<artifactId>io.wcm.wcm.ui.granite</artifactId>
191-
<version>1.9.2</version>
191+
<version>1.9.6</version>
192192
</dependency>
193193

194194
</dependencies>

0 commit comments

Comments
 (0)