Skip to content

Commit 4670bda

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.0.10' into 'master'
2 parents 9818b02 + fa58583 commit 4670bda

File tree

7 files changed

+50
-11
lines changed

7 files changed

+50
-11
lines changed

‎parent_toplevel/changes.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@
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.0.10" date="2018-01-15">
27+
<action type="update" dev="sseifert">
28+
Update reflow-maven-skin.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to global-parent 19, update mockito.
32+
</action>
33+
</release>
34+
2635
<release version="1.0.8" date="2017-10-19">
2736
<action type="update" dev="sseifert">
2837
Update to global-parent 17, update mockito.

‎parent_toplevel/pom.xml‎

Lines changed: 4 additions & 4 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>17</version>
28+
<version>19</version>
2929
<relativePath />
3030
</parent>
3131

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

3737
<name>Toplevel Parent</name>
@@ -150,7 +150,7 @@
150150
<dependency>
151151
<groupId>org.mockito</groupId>
152152
<artifactId>mockito-core</artifactId>
153-
<version>2.11.0</version>
153+
<version>2.13.0</version>
154154
</dependency>
155155

156156
</dependencies>
@@ -303,7 +303,7 @@
303303
<profiles>
304304
<!-- profile used for building releases and deployment to sonatype/maven central -->
305305
<profile>
306-
<id>release</id>
306+
<id>release-profile</id>
307307
<activation>
308308
<property>
309309
<name>performRelease</name>

‎parent_toplevel/src/site/site.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,14 @@
3535
<skin>
3636
<groupId>io.wcm.maven.skins</groupId>
3737
<artifactId>reflow-maven-skin</artifactId>
38-
<version>1.0.2</version>
38+
<version>1.0.4</version>
3939
</skin>
4040
<custom>
4141
<reflowSkin>
4242
<!-- Make this to 'false' for local development, i.e. file:// URLs -->
4343
<protocolRelativeURLs>false</protocolRelativeURLs>
4444
<smoothScroll>true</smoothScroll>
4545
<theme>default</theme>
46-
<highlightJs>true</highlightJs>
47-
<highlightJsTheme>github</highlightJsTheme>
4846
<absoluteResourceURL>http://devops.wcm.io</absoluteResourceURL>
4947
<skinAttribution>false</skinAttribution>
5048
<brand>

‎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.7-SNAPSHOT</version>
29+
<version>1.0.9-SNAPSHOT</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.7-SNAPSHOT</version>
29+
<version>1.0.9-SNAPSHOT</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

‎public_site/src/site/markdown/ansible.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
For an in-depth overview see this talk:
8+
9+
* [Automate AEM Deployment with Ansible and wcm.io CONGA][aem-ansible-adaptto-2017] - adaptTo() 2017
10+
* [Demo project][aem-ansible-adaptto-2017-demo]
11+
12+
13+
### Ansible roles on GitHub
14+
15+
Each Ansible roles is hosted in it's own repository on GitHub with documentation included in the README files:<br/>
16+
[wcm.io DevOps Ansible roles on GitHub][github-ansible-roles]
17+
18+
[ansible]: https://www.ansible.com/
19+
[conga]: http://devops.wcm.io/conga
20+
[github-ansible-roles]: https://github.com/wcm-io-devops?q=topic%3Aansible-role
21+
[aem-ansible-adaptto-2017]: https://adapt.to/2017/en/schedule/automate-aem-deployment-with-ansible-and-wcm-io-conga.html
22+
[aem-ansible-adaptto-2017-demo]: https://github.com/adaptto/2017-automate-aem-deployment-ansible-conga

‎public_site/src/site/markdown/index.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,21 @@ wcm.io DevOps is an Open Source project which provides tools for configuration m
1010

1111
### Tools
1212

13-
* [AEM Manager for Windows](https://github.com/wcm-io-devops/aem-manager)
14-
* [AEM Manager for Mac OS X](https://github.com/wcm-io-devops/aem-manager-osx)
13+
##### CI/CD and IT Automation
14+
15+
* [Ansible Automation for AEM](ansible.html)
16+
* [Jenkins Pipeline Library for CI/CD](https://github.com/wcm-io-devops/jenkins-pipeline-library)
17+
18+
##### Maven
19+
1520
* [Maven NodeJS Proxy](https://github.com/wcm-io-devops/maven-nodejs-proxy)
1621
* [Maven Eclipse Plugin (Fork)](https://github.com/wcm-io-devops/maven-eclipse-plugin)
1722

23+
##### UI Tools
24+
25+
* [AEM Manager for Windows](https://github.com/wcm-io-devops/aem-manager)
26+
* [AEM Manager for Mac OS X](https://github.com/wcm-io-devops/aem-manager-osx)
27+
1828

1929
### Subprojects
2030

0 commit comments

Comments
 (0)