Skip to content

Commit 5b23868

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.1.6' into 'master'
2 parents 4c1a446 + 70cd4a7 commit 5b23868

File tree

13 files changed

+48
-39
lines changed

13 files changed

+48
-39
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>
@@ -44,7 +44,7 @@
4444

4545
<repository>
4646
<id>wcm-io-apache-intermediate-release</id>
47-
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
47+
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
4848
<layout>default</layout>
4949
<releases>
5050
<enabled>true</enabled>
@@ -70,7 +70,7 @@
7070

7171
<repository>
7272
<id>apache-snapshots</id>
73-
<url>http://repository.apache.org/snapshots</url>
73+
<url>https://repository.apache.org/snapshots</url>
7474
<layout>default</layout>
7575
<releases>
7676
<enabled>false</enabled>
@@ -87,7 +87,7 @@
8787

8888
<pluginRepository>
8989
<id>central</id>
90-
<url>http://repo1.maven.org/maven2/</url>
90+
<url>https://repo1.maven.org/maven2/</url>
9191
<layout>default</layout>
9292
<releases>
9393
<enabled>true</enabled>
@@ -100,7 +100,7 @@
100100

101101
<pluginRepository>
102102
<id>wcm-io-apache-intermediate-release</id>
103-
<url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
103+
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
104104
<layout>default</layout>
105105
<releases>
106106
<enabled>true</enabled>
@@ -126,7 +126,7 @@
126126

127127
<pluginRepository>
128128
<id>apache-snapshots</id>
129-
<url>http://repository.apache.org/snapshots</url>
129+
<url>https://repository.apache.org/snapshots</url>
130130
<layout>default</layout>
131131
<releases>
132132
<enabled>false</enabled>

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
language: java
2121

2222
jdk:
23-
- oraclejdk8
23+
- openjdk8
2424
- openjdk11
2525

2626
# Make sure travis can use container-based infrastructure

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<img src="http://wcm.io/images/[email protected]"/> wcm.io DevOps Tooling
1+
<img src="https://wcm.io/images/[email protected]"/> wcm.io DevOps Tooling
22
======
33
[![Build Status](https://travis-ci.org/wcm-io-devops/devops-tooling.png?branch=develop)](https://travis-ci.org/wcm-io-devops/devops-tooling)
44

‎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.1.6" date="2019-06-26">
27+
<action type="update" dev="sseifert">
28+
Switch wcm.io domains to HTTPS.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to reflow-maven-skin 1.0.8.
32+
</action>
33+
</release>
34+
2635
<release version="1.1.4" date="2019-05-08">
2736
<action type="update" dev="sseifert">
2837
Update to global-parent 26.

‎parent_toplevel/pom.xml‎

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

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

3737
<name>Toplevel Parent</name>
@@ -49,7 +49,7 @@
4949

5050
<organization>
5151
<name>wcm.io DevOps</name>
52-
<url>http://devops.wcm.io</url>
52+
<url>https://devops.wcm.io</url>
5353
</organization>
5454

5555
<issueManagement>
@@ -66,7 +66,7 @@
6666
<developer>
6767
<name>wcm.io Community</name>
6868
<organization>wcm.io</organization>
69-
<organizationUrl>http://wcm.io</organizationUrl>
69+
<organizationUrl>https://wcm.io</organizationUrl>
7070
</developer>
7171
</developers>
7272

@@ -85,7 +85,7 @@
8585

8686
<!-- site settings -->
8787
<site.url.module.prefix>tooling/parent_toplevel</site.url.module.prefix>
88-
<site.url>http://devops.wcm.io</site.url>
88+
<site.url>https://devops.wcm.io</site.url>
8989
<site.deploy.id>ssh-wcm.io</site.deploy.id>
9090
<site.deploy.url />
9191

‎parent_toplevel/src/site/site.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
2626

2727
<bannerLeft>
28-
<name><![CDATA[<img src="http://wcm.io/images/[email protected]"/> wcm.io DevOps]]></name>
29-
<href>http://devops.wcm.io</href>
28+
<name><![CDATA[<img src="https://wcm.io/images/[email protected]"/> wcm.io DevOps]]></name>
29+
<href>https://devops.wcm.io</href>
3030
</bannerLeft>
3131

3232
<publishDate position="bottom" format="yyyy-MM-dd" />
@@ -35,20 +35,20 @@
3535
<skin>
3636
<groupId>io.wcm.maven.skins</groupId>
3737
<artifactId>reflow-maven-skin</artifactId>
38-
<version>1.0.6</version>
38+
<version>1.0.8</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-
<absoluteResourceURL>http://devops.wcm.io</absoluteResourceURL>
46+
<absoluteResourceURL>https://devops.wcm.io</absoluteResourceURL>
4747
<skinAttribution>false</skinAttribution>
4848
<brand>
4949
<!-- Brand text in top-left part of the site -->
5050
<name>wcm.io DevOps</name>
51-
<href>http://devops.wcm.io</href>
51+
<href>https://devops.wcm.io</href>
5252
</brand>
5353
<slogan>Tools for Configuration Management and Deployment</slogan>
5454
<titleTemplate>%2$s | %1$s</titleTemplate>
@@ -107,26 +107,26 @@
107107
</links>
108108

109109
<breadcrumbs>
110-
<item name="wcm.io DevOps" href="http://devops.wcm.io" />
110+
<item name="wcm.io DevOps" href="https://devops.wcm.io" />
111111
</breadcrumbs>
112112

113113
<menu name="Main" inherit="top">
114-
<item name="Home" href="http://devops.wcm.io" />
115-
<item name="Platforms" href="http://devops.wcm.io/platforms.html" />
116-
<item name="Maven Repositories" href="http://devops.wcm.io/maven.html" />
114+
<item name="Home" href="https://devops.wcm.io" />
115+
<item name="Platforms" href="https://devops.wcm.io/platforms.html" />
116+
<item name="Maven Repositories" href="https://devops.wcm.io/maven.html" />
117117
<item name="GitHub project" href="http://github.com/wcm-io-devops" />
118-
<item name="Subprojects" href="http://wcm.io/subprojects.html" />
119-
<item name="License" href="http://devops.wcm.io/license.html" />
120-
<item name="Imprint" href="http://wcm.io/imprint.html" />
118+
<item name="Subprojects" href="https://wcm.io/subprojects.html" />
119+
<item name="License" href="https://devops.wcm.io/license.html" />
120+
<item name="Imprint" href="https://wcm.io/imprint.html" />
121121
</menu>
122122
<menu name="Categories" inherit="top">
123-
<item name="CONGA - CONfiguration GenerAtor" href="http://devops.wcm.io/conga/"/>
123+
<item name="CONGA - CONfiguration GenerAtor" href="https://devops.wcm.io/conga/"/>
124124
</menu>
125125
<menu name="Contribute" inherit="top">
126-
<item name="Contribute" href="http://wcm.io/contribute.html" />
126+
<item name="Contribute" href="https://wcm.io/contribute.html" />
127127
<item name="Issues" href="https://wcm-io.atlassian.net" />
128128
<item name="Wiki" href="https://wcm-io.atlassian.net/wiki/" />
129-
<item name="Mailing Lists" href="http://wcm.io/mailing-lists.html" />
129+
<item name="Mailing Lists" href="https://wcm.io/mailing-lists.html" />
130130
<item name="Continuous Integration" href="https://travis-ci.org/wcm-io-devops" />
131131
<item name="Fork on GitHub" href="http://github.com/wcm-io-devops" />
132132
</menu>

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

‎public_site/src/site/markdown/ansible-aem/ansible-debugging.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ When you are using Ansible 2.5+ you can use the Playbook Debugger<br/>
129129
https://docs.ansible.com/ansible/2.5/user_guide/playbooks_debugger.html
130130
131131
132-
[ansible-aem]: http://devops.wcm.io/ansible-aem/
132+
[ansible-aem]: https://devops.wcm.io/ansible-aem/

‎public_site/src/site/markdown/ansible-aem/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ The Ansible roles are published on Ansibe Galaxy:
2828

2929
[ansible]: https://www.ansible.com/
3030
[ansible-debugging]: ansible-debugging.html
31-
[conga]: http://devops.wcm.io/conga
32-
[aem-configmgmt-archetype]: http://wcm.io/tooling/maven/archetypes/aem-confmgmt/
31+
[conga]: https://devops.wcm.io/conga
32+
[aem-configmgmt-archetype]: https://wcm.io/tooling/maven/archetypes/aem-confmgmt/
3333
[ansible-galaxy-roles]: https://galaxy.ansible.com/wcm_io_devops
3434
[github-ansible-roles]: https://github.com/wcm-io-devops?q=topic%3Aansible-role
3535
[adaptto-talk-2017-aem-ansible]: https://adapt.to/2017/en/schedule/automate-aem-deployment-with-ansible-and-wcm-io-conga.html

0 commit comments

Comments
 (0)