Skip to content

Commit fce934a

Browse files
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.1.2' into 'master'
2 parents 86b23da + f34e58c commit fce934a

File tree

11 files changed

+215
-34
lines changed

11 files changed

+215
-34
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@
2020
language: java
2121

2222
jdk:
23-
- oraclejdk8
23+
- oraclejdk8
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

parent_toplevel/changes.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,31 @@
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.1.2" date="2019-03-14">
27+
<action type="update" dev="sseifert">
28+
Update to global-parent 25.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to reflow-maven-skin 1.0.6.
32+
</action>
33+
<action type="update" dev="sseifert">
34+
Allow HTML markup in CDATA sections in changes reports.
35+
</action>
36+
<action type="update" dev="sseifert">
37+
Update dependencies.
38+
</action>
39+
</release>
40+
2641
<release version="1.1.0" date="2018-07-11">
2742
<action type="update" dev="sseifert">
2843
Switch to JUnit 5 as default test framework.
2944
</action>
3045
<action type="update" dev="sseifert">
3146
Update to global-parent 20.
3247
</action>
48+
<action type="update" dev="sseifert">
49+
Update to reflow-maven-skin 1.0.6.
50+
</action>
3351
<action type="update" dev="sseifert">
3452
Update dependencies.
3553
</action>

parent_toplevel/pom.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.maven</groupId>
2727
<artifactId>io.wcm.maven.global-parent</artifactId>
28-
<version>20</version>
28+
<version>25</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops</groupId>
3333
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
34-
<version>1.1.0</version>
34+
<version>1.1.2</version>
3535
<packaging>pom</packaging>
3636

3737
<name>Toplevel Parent</name>
@@ -160,18 +160,19 @@
160160
<dependency>
161161
<groupId>org.mockito</groupId>
162162
<artifactId>mockito-core</artifactId>
163-
<version>2.19.0</version>
163+
<version>2.25.0</version>
164164
</dependency>
165165
<dependency>
166166
<groupId>org.mockito</groupId>
167167
<artifactId>mockito-junit-jupiter</artifactId>
168-
<version>2.19.0</version>
168+
<version>2.25.0</version>
169169
</dependency>
170170
<!-- Import all JUnit 5 dependencies -->
171171
<dependency>
172172
<groupId>org.junit</groupId>
173173
<artifactId>junit-bom</artifactId>
174-
<version>5.2.0</version>
174+
<!-- Stick with JUnit 5.3.2 until Eclipse Inifinittest plugin supports newer versions -->
175+
<version>5.3.2</version>
175176
<type>pom</type>
176177
<scope>import</scope>
177178
</dependency>
@@ -320,6 +321,15 @@
320321
</reportSets>
321322
</plugin>
322323

324+
<plugin>
325+
<groupId>org.apache.maven.plugins</groupId>
326+
<artifactId>maven-changes-plugin</artifactId>
327+
<configuration>
328+
<!-- Allow HTML markup in CDATA sections in changes reports -->
329+
<escapeHTML>false</escapeHTML>
330+
</configuration>
331+
</plugin>
332+
323333
</plugins>
324334
</reporting>
325335

parent_toplevel/src/site/site.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<skin>
3636
<groupId>io.wcm.maven.skins</groupId>
3737
<artifactId>reflow-maven-skin</artifactId>
38-
<version>1.0.4</version>
38+
<version>1.0.6</version>
3939
</skin>
4040
<custom>
4141
<reflowSkin>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.0.11-SNAPSHOT</version>
29+
<version>1.1.0</version>
3030
<relativePath>parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

public_site/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.devops</groupId>
2828
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
29-
<version>1.0.11-SNAPSHOT</version>
29+
<version>1.1.1-SNAPSHOT</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
## Debugging Ansible Automation for AEM
2+
3+
Hints for debugging the [Automation for AEM][ansible-aem].
4+
5+
6+
### Ansible verbose mode
7+
8+
Ansible Commands support the verbose flag
9+
10+
```
11+
-v # simple verbose output
12+
-vv # more verbose
13+
-vvv # even more verbose
14+
-vvvv # connection debugging
15+
-vvvvv # even more verbose, and so on
16+
```
17+
18+
Which each added "v" the verbosity increases (and the readability decreases).
19+
20+
It is recommened to write the output to a file like:
21+
22+
```
23+
ansible-playbook playbook-setup-prod.yml | tee ansible.log
24+
```
25+
26+
### Use \-\-skip-tags
27+
28+
If you want to speed up debugging and want to skip the tasks/roles that are working use the parameter
29+
30+
```
31+
--skip-tags aem-cms,aem-dispatcher
32+
```
33+
34+
When working with the Conga Ansible IT Automation it is recommended to skip the compile process of the wcm_io_devops.conga_maven role to save time
35+
36+
```
37+
--skip-tags conga-maven-compile
38+
```
39+
40+
For more information refer to: https://docs.ansible.com/ansible/2.6/user_guide/playbooks_tags.html
41+
42+
### Use \-\-start-at-task
43+
44+
If you want to start the playbook at a particula task you can use the --start-at-task option:
45+
46+
```
47+
ansible-playbook playbook-setup-prod.yml --start-at-task="Download AEM quickstart."
48+
```
49+
50+
### Execute interactively
51+
52+
If you want to inspect the result of each task you can run the playbook with the --step option:
53+
54+
```
55+
ansible-playbook playbook-setup-prod.yml --step
56+
```
57+
58+
This will cause Ansible to stop on each task if it should execute that task.
59+
60+
### Enable debug logs
61+
62+
Ansible is for example hiding the Maven log output. When an error occurs the log-output will be shown.
63+
64+
#### wcm_io_devops.conga_aem_packages
65+
66+
This role supports the logging of the current maven output to a file which then can be "tailed".
67+
68+
Refer to:
69+
70+
* https://github.com/wcm-io-devops/ansible-conga-aem-packages and
71+
* https://github.com/wcm-io-devops/ansible-conga-aem-packages/blob/master/defaults/main.yml#L27-L31
72+
73+
For more information.
74+
75+
## Advanced Debugging
76+
77+
### Manipulating Roles
78+
79+
Ansible looks per default in the following pathes to search for roles
80+
81+
* `roles` directory, relative to the playbook file.
82+
* By default, in `/etc/ansible/roles`
83+
84+
This behavior becomes handy when you want to debug a role in your current project.
85+
86+
#### Example for wcm_io_devops.conga_aem_packages role
87+
88+
_Prepare role for local manipulation_
89+
```
90+
# switch into the ansible playbook dir
91+
mkdir roles && cd roles
92+
git clone https://github.com/wcm-io-devops/ansible-conga-aem-packages.git && git checkout 1.0.0
93+
```
94+
95+
With this setup the role "wcm_io_devops.conga_aem_packages" will be loaded from the roles directory.
96+
97+
You can then start manipulating the role e.g. by adding debug statements, manual inputs and fail statements to avoid continuing of the play.
98+
99+
_Example: Output content of conga_config and continue_
100+
101+
```yaml
102+
- name: Debug conga_config
103+
debug:
104+
msg:
105+
- conga_config
106+
- "{{ conga_config }}"
107+
108+
- fail:
109+
msg: do not continue
110+
```
111+
112+
_Example: Wait for user input_
113+
114+
```yaml
115+
- name: "Wait for user input"
116+
prompt: "Continue?"
117+
```
118+
119+
Links:
120+
121+
* https://docs.ansible.com/ansible/2.6/modules/fail_module.html
122+
* https://docs.ansible.com/ansible/2.6/modules/debug_module.html
123+
* https://docs.ansible.com/ansible/2.6/user_guide/playbooks_prompts.html
124+
125+
126+
### Playbook Debugger
127+
128+
When you are using Ansible 2.5+ you can use the Playbook Debugger<br/>
129+
https://docs.ansible.com/ansible/2.5/user_guide/playbooks_debugger.html
130+
131+
132+
[ansible-aem]: http://devops.wcm.io/ansible-aem/
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
## Ansible Automation for AEM
2+
3+
wcm.io DevOps provides a set of [Ansible][ansible] roles to automate infrastructure setup and configuration management for Adobe Experience Manager (AEM).
4+
5+
The Ansible roles are optimized to be used together with [CONGA][conga], but some can also be used standalone.
6+
7+
A good starting point for setting up AEM projects for deployment automation with CONGA and Ansible is using the<br/>
8+
[wcm.io Maven Archetype for AEM Configuration Management][aem-configmgmt-archetype].
9+
10+
If anything goes wrong, have a look at [Debugging Ansible Automation for AEM][ansible-debugging].
11+
12+
13+
### Roles on Ansible Galaxy
14+
15+
The Ansible roles are published on Ansibe Galaxy:
16+
17+
* [wcm.io DevOps Ansible roles on Ansible Galaxy][ansible-galaxy-roles]
18+
* [wcm.io DevOps Ansible roles on GitHub][github-ansible-roles]
19+
20+
21+
### Further Resources
22+
23+
* [adaptTo() 2017 Talk: Automate AEM Deployment with Ansible and wcm.io CONGA][adaptto-talk-2017-aem-ansible]
24+
* [adaptTo() 2018 Talk: Maven Archetypes for AEM][adaptto-talk-2018-aem-archetypes] - about AEM project archetypes including Ansible/CONGA-based cloud deployment
25+
* [Debugging Ansible Automation for AEM][ansible-debugging]
26+
27+
28+
29+
[ansible]: https://www.ansible.com/
30+
[ansible-debugging]: ansible-debugging.html
31+
[conga]: http://devops.wcm.io/conga
32+
[aem-configmgmt-archetype]: http://wcm.io/tooling/maven/archetypes/aem-confmgmt/
33+
[ansible-galaxy-roles]: https://galaxy.ansible.com/wcm_io_devops
34+
[github-ansible-roles]: https://github.com/wcm-io-devops?q=topic%3Aansible-role
35+
[adaptto-talk-2017-aem-ansible]: https://adapt.to/2017/en/schedule/automate-aem-deployment-with-ansible-and-wcm-io-conga.html
36+
[adaptto-talk-2018-aem-archetypes]: https://adapt.to/2018/en/schedule/maven-archetypes-for-aem.html

public_site/src/site/markdown/ansible.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

public_site/src/site/markdown/index.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@ wcm.io DevOps is an Open Source project which provides tools for configuration m
66
### Modules
77

88
* [CONGA - CONfiguration GenerAtor](conga/)
9+
* [CONGA Plugin for Apache Sling](conga/plugins/sling)
10+
* [CONGA Plugin for Adobe Experience Manager (AEM)](conga/plugins/aem)
11+
* [CONGA Plugin for Ansible](conga/plugins/ansible)
12+
* [CONGA Definitions for Adobe Experience Manager (AEM)](conga/definitions/aem)
913

1014

1115
### Tools
1216

1317
##### CI/CD and IT Automation
1418

15-
* [Ansible Automation for AEM](ansible.html)
19+
* [Ansible Automation for AEM](ansible-aem/)
1620
* [Jenkins Pipeline Library for CI/CD](https://github.com/wcm-io-devops/jenkins-pipeline-library)
1721

1822
##### Maven
1923

2024
* [Maven NodeJS Proxy](https://github.com/wcm-io-devops/maven-nodejs-proxy)
21-
* [Maven Eclipse Plugin (Fork)](https://github.com/wcm-io-devops/maven-eclipse-plugin)
25+
* [Eclipse Maven Plugin](https://github.com/wcm-io-devops/maven-eclipse-plugin)
2226

2327
##### UI Tools
2428

0 commit comments

Comments
 (0)