Skip to content

Commit df02d1d

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.samples-1.3.0' into 'master'
2 parents 851ed1a + 760da55 commit df02d1d

File tree

70 files changed

+547
-983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+547
-983
lines changed

‎.travis.maven-settings.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<repository>
3333
<id>central</id>
34-
<url>http://repo1.maven.org/maven2/</url>
34+
<url>https://repo1.maven.org/maven2/</url>
3535
<layout>default</layout>
3636
<releases>
3737
<enabled>true</enabled>
@@ -57,7 +57,7 @@
5757

5858
<repository>
5959
<id>wcm-io-apache-intermediate-release</id>
60-
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
60+
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
6161
<layout>default</layout>
6262
<releases>
6363
<enabled>true</enabled>
@@ -83,7 +83,7 @@
8383

8484
<repository>
8585
<id>apache-snapshots</id>
86-
<url>http://repository.apache.org/snapshots</url>
86+
<url>https://repository.apache.org/snapshots</url>
8787
<layout>default</layout>
8888
<releases>
8989
<enabled>false</enabled>
@@ -100,7 +100,7 @@
100100

101101
<pluginRepository>
102102
<id>central</id>
103-
<url>http://repo1.maven.org/maven2/</url>
103+
<url>https://repo1.maven.org/maven2/</url>
104104
<layout>default</layout>
105105
<releases>
106106
<enabled>true</enabled>
@@ -126,7 +126,7 @@
126126

127127
<pluginRepository>
128128
<id>wcm-io-apache-intermediate-release</id>
129-
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
129+
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
130130
<layout>default</layout>
131131
<releases>
132132
<enabled>true</enabled>
@@ -152,7 +152,7 @@
152152

153153
<pluginRepository>
154154
<id>apache-snapshots</id>
155-
<url>http://repository.apache.org/snapshots</url>
155+
<url>https://repository.apache.org/snapshots</url>
156156
<layout>default</layout>
157157
<releases>
158158
<enabled>false</enabled>

‎.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,23 @@
2020
language: java
2121

2222
jdk:
23-
- oraclejdk8
23+
- openjdk8
24+
- openjdk11
2425

2526
# Make sure travis can use container-based infrastructure
2627
sudo: false
2728

2829
install: "mvn -s ./.travis.maven-settings.xml clean"
2930

3031
script:
31-
- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U -Dmaven.javadoc.skip=true install"
32+
- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U install"
3233
# Remove wcm.io artefacts from repository before cache
3334
- rm -rf $HOME/.m2/repository/io/wcm
3435

35-
# exlude release tags like xyz-1.0.0 or xyz-1
36+
# exclude release tags like xyz.xyz-1.0.0 or xyz-xyz-1
3637
branches:
3738
except:
38-
- /^.*\-\d+(\.\d+\.\d+)?(\..*|\-.*)?$/
39+
- /^.+(\.|\-).+\-\d+(\.\d+\.\d+)?(\..*|\-.*)?$/
3940

4041
# Cache Maven Repository
4142
cache:

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<img src="http://wcm.io/images/favicon-16@2x.png"/> wcm.io Samples
1+
<img src="https://wcm.io/images/favicon-16@2x.png"/> wcm.io Samples
22
======
33
[![Build Status](https://travis-ci.org/wcm-io/wcm-io-samples.png?branch=develop)](https://travis-ci.org/wcm-io/wcm-io-samples)
44

55
Sample projects and applications to demonstrate and test wcm.io features.
66

7-
Documentation: http://wcm.io/samples/<br/>
7+
Documentation: https://wcm.io/samples/<br/>
88
Issues: https://wcm-io.atlassian.net/browse/WSAM<br/>
99
Wiki: https://wcm-io.atlassian.net/wiki/<br/>
1010
Continuous Integration: https://travis-ci.org/wcm-io/wcm-io-samples/
1111

1212

1313
### Build and deploy samples from source
1414

15-
If you want to build wcm.io from sources make sure you have configured all [Maven Repositories](http://wcm.io/maven.html) in your settings.xml.
15+
If you want to build wcm.io from sources make sure you have configured all [Maven Repositories](https://wcm.io/maven.html) in your settings.xml.
1616

1717
See [Travis Maven settings.xml](https://github.com/wcm-io/wcm-io-samples/blob/master/.travis.maven-settings.xml) for an example with a full configuration.
1818

@@ -24,5 +24,5 @@ See [Travis Maven settings.xml](https://github.com/wcm-io/wcm-io-samples/blob/ma
2424

2525
### System requirements
2626

27-
- AEM 6.1 or higher
27+
- AEM 6.3 or higher
2828
- JDK 1.8

‎build-deploy-publish.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# #%L
33
# wcm.io
44
# %%
5-
# Copyright (C) 2017 wcm.io
5+
# Copyright (C) 2017 - 2019 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.
@@ -19,11 +19,12 @@
1919

2020
# Call with "help" parameter to display syntax information
2121

22-
SLING_URL="http://localhost:4503"
22+
MAVEN_PROFILES="fast,publish"
2323
CONGA_NODE="aem-publish"
2424

2525
if [[ $0 == *":\\"* ]]; then
2626
DISPLAY_PAUSE_MESSAGE=true
2727
fi
2828

29-
./build-deploy.sh --sling.url=${SLING_URL} --conga.node=${CONGA_NODE} --display.pause.message=${DISPLAY_PAUSE_MESSAGE} "$@"
29+
./build-deploy.sh --maven.profiles=${MAVEN_PROFILES} --conga.node=${CONGA_NODE} --display.pause.message=${DISPLAY_PAUSE_MESSAGE} "$@"
30+

‎build-deploy.sh

Lines changed: 60 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# #%L
33
# wcm.io
44
# %%
5-
# Copyright (C) 2017 wcm.io
5+
# Copyright (C) 2017 - 2019 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.
@@ -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
CONGA_ENVIRONMENT="development"
2728
CONGA_NODE="aem-author"
2829
JVM_ARGS=""
@@ -43,12 +44,13 @@ help_message_exit() {
4344
echo " Syntax <parameters> <commands>"
4445
echo ""
4546
echo " Parameters:"
46-
echo " --sling.url=${SLING_URL}"
47-
echo " --sling.user=${SLING_USER}"
48-
echo " --sling.password=${SLING_PASSWORD}"
49-
echo " --conga.environment=${CONGA_ENVIRONMENT}"
50-
echo " --conga.node=${CONGA_NODE}"
51-
echo " --jvm.args=${JVM_ARGS}"
47+
echo " --maven.profiles=${MAVEN_PROFILES} or -P${MAVEN_PROFILES}"
48+
echo " --sling.url=${SLING_URL} or -Dsling.url=${SLING_URL}"
49+
echo " --sling.user=${SLING_USER} or -Dsling.user=${SLING_USER}"
50+
echo " --sling.password=${SLING_PASSWORD} or -Dsling.password=${SLING_PASSWORD}"
51+
echo " --conga.environment=${CONGA_ENVIRONMENT} or -Dconga.environment=${CONGA_ENVIRONMENT}"
52+
echo " --conga.node=${CONGA_NODE} or -Dconga.node=${CONGA_NODE}"
53+
echo " --jvm.args=${JVM_ARGS} or -Djvm.args=${JVM_ARGS}"
5254
echo ""
5355
echo " Commands:"
5456
echo " build - Clean and install maven project"
@@ -64,6 +66,10 @@ parse_parameters() {
6466
for i in "$@"
6567
do
6668
case $i in
69+
--maven\.profiles=*|-P*)
70+
MAVEN_PROFILES="${i#*=}"
71+
shift # past argument=value
72+
;;
6773
--sling\.url=*|-Dsling\.url=*)
6874
SLING_URL="${i#*=}"
6975
shift # past argument=value
@@ -137,19 +143,22 @@ welcome_message() {
137143
echo " |___/|___|_| |____\___/ |_|"
138144
fi
139145
echo -e "\e[0m"
140-
echo -e " Destination: \e[1m${SLING_URL}\e[0m (\e[1m${CONGA_NODE}\e[0m)"
146+
echo -e " Destination: \e[1m${CONGA_NODE}\e[0m (${MAVEN_PROFILES})"
141147
echo ""
142148
echo "********************************************************************"
143149
}
144150

145151
completion_message() {
152+
ELAPSED_TIME=$(($SECONDS - $START_TIME))
153+
TOTAL_TIME="($(($ELAPSED_TIME/60)):$(printf "%02d" $(($ELAPSED_TIME%60))) min)"
154+
146155
echo ""
147156
if [ "$BUILD" = true ] && [ "$DEPLOY" = true ]; then
148-
echo -e "*** \e[1mBuild+Deploy complete\e[0m ***"
157+
echo -e "*** \e[1mBuild+Deploy complete\e[0m $TOTAL_TIME ***"
149158
elif [ "$BUILD" = true ]; then
150-
echo -e "*** \e[1mBuild complete\e[0m ***"
159+
echo -e "*** \e[1mBuild complete\e[0m $TOTAL_TIME ***"
151160
elif [ "$DEPLOY" = true ]; then
152-
echo -e "*** \e[1mDeploy complete\e[0m ***"
161+
echo -e "*** \e[1mDeploy complete\e[0m $TOTAL_TIME ***"
153162
fi
154163
echo ""
155164

@@ -163,9 +172,18 @@ execute_build() {
163172
echo -e "*** \e[1mBuild application\e[0m ***"
164173
echo ""
165174

166-
mvn ${JVM_ARGS} \
167-
-Dconga.environments=${CONGA_ENVIRONMENT} \
168-
-Pfast clean install eclipse:eclipse
175+
MAVEN_ARGS=""
176+
if [ -n "$JVM_ARGS" ]; then
177+
MAVEN_ARGS+="${JVM_ARGS} "
178+
fi
179+
if [ -n "${MAVEN_PROFILES}" ]; then
180+
MAVEN_ARGS+="--activate-profiles ${MAVEN_PROFILES} "
181+
fi
182+
if [ -n "${CONGA_ENVIRONMENT}" ]; then
183+
MAVEN_ARGS+="-Dconga.environments=${CONGA_ENVIRONMENT} "
184+
fi
185+
186+
mvn $MAVEN_ARGS clean install eclipse:eclipse
169187

170188
if [ "$?" -ne "0" ]; then
171189
exit_with_error "*** BUILD FAILED ***"
@@ -179,14 +197,27 @@ execute_deploy() {
179197
echo -e "*** \e[1mDeploy to AEM\e[0m ***"
180198
echo ""
181199

182-
mvn -f config-definition \
183-
${JVM_ARGS} \
184-
-Dconga.environments=${CONGA_ENVIRONMENT} \
185-
-Dconga.nodeDirectory=target/configuration/${CONGA_ENVIRONMENT}/${CONGA_NODE} \
186-
-Dsling.url=${SLING_URL} \
187-
-Dsling.user=${SLING_USER} \
188-
-Dsling.password=${SLING_PASSWORD} \
189-
conga-aem:package-install
200+
MAVEN_ARGS=""
201+
if [ -n "$JVM_ARGS" ]; then
202+
MAVEN_ARGS+="${JVM_ARGS} "
203+
fi
204+
if [ -n "${MAVEN_PROFILES}" ]; then
205+
MAVEN_ARGS+="--activate-profiles=${MAVEN_PROFILES} "
206+
fi
207+
if [ -n "${CONGA_ENVIRONMENT}" ] && [ -n "${CONGA_NODE}" ]; then
208+
MAVEN_ARGS+="-Dconga.environments=${CONGA_ENVIRONMENT} -Dconga.nodeDirectory=target/configuration/${CONGA_ENVIRONMENT}/${CONGA_NODE} "
209+
fi
210+
if [ -n "${SLING_URL}" ]; then
211+
MAVEN_ARGS+="-Dsling.url=${SLING_URL} "
212+
fi
213+
if [ -n "${SLING_USER}" ]; then
214+
MAVEN_ARGS+="-Dsling.user=${SLING_USER} "
215+
fi
216+
if [ -n "${SLING_PASSWORD}" ]; then
217+
MAVEN_ARGS+="-Dsling.password=${SLING_PASSWORD} "
218+
fi
219+
220+
mvn $MAVEN_ARGS -f config-definition conga-aem:package-install
190221

191222
if [ "$?" -ne "0" ]; then
192223
exit_with_error "*** DEPLOY FAILED ***"
@@ -214,6 +245,8 @@ exit_with_error() {
214245

215246
####
216247

248+
START_TIME=$SECONDS
249+
217250
parse_parameters "$@"
218251
welcome_message
219252
if [ "$HELP" = true ]; then
@@ -226,3 +259,4 @@ if [ "$DEPLOY" = true ]; then
226259
execute_deploy
227260
fi
228261
completion_message
262+

‎bundles/clientlibs/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.samples</groupId>
2727
<artifactId>io.wcm.samples.parent</artifactId>
28-
<version>1.2.2</version>
28+
<version>1.3.0</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.samples</groupId>
3333
<artifactId>io.wcm.samples.clientlibs</artifactId>
34-
<version>1.2.2</version>
34+
<version>1.3.0</version>
3535
<packaging>bundle</packaging>
3636

3737
<name>Sample Application Clientlibs</name>
@@ -47,7 +47,7 @@
4747
<configuration>
4848
<instructions>
4949
<Sling-Initial-Content>
50-
SLING-INF/clientlibs-root;overwrite:=true;ignoreImportProviders:=xml;path:=/etc/clientlibs/wcm-io-samples
50+
SLING-INF/clientlibs-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/wcm-io-samples/clientlibs
5151
</Sling-Initial-Content>
5252
</instructions>
5353
</configuration>

‎bundles/clientlibs/src/main/webapp/clientlibs-root/wcm-io-samples.all.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
"default:none",
1212
"min:gcc;compilationLevel=whitespace"
1313
],
14-
"longCacheKey": "${project.version}-${buildNumber}"
14+
"longCacheKey": "${project.version}-${buildNumber}",
15+
"allowProxy": true
1516
}

‎bundles/clientlibs/src/main/webapp/clientlibs-root/wcm-io-samples.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"jcr:primaryType": "cq:ClientLibraryFolder",
33
"categories": [
44
"wcm-io-samples.app"
5-
]
5+
],
6+
"allowProxy": true
67
}

‎bundles/clientlibs/src/main/webapp/clientlibs-root/wcm-io-samples.lib.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"jcr:primaryType": "cq:ClientLibraryFolder",
33
"categories": [
44
"wcm-io-samples.lib"
5-
]
5+
],
6+
"allowProxy": true
67
}

0 commit comments

Comments
 (0)