Skip to content

Commit d28129b

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.0.4' into 'master'
2 parents 96ce1f9 + 2e5ede9 commit d28129b

File tree

7 files changed

+37
-15
lines changed

7 files changed

+37
-15
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.esp text eol=lf
77
*.ecma text eol=lf
88
*.hbrs text eol=lf
9+
*.hbs text eol=lf
910
*.htm text eol=lf
1011
*.html text eol=lf
1112
*.java text eol=lf
@@ -35,6 +36,8 @@
3536
*.xsd text eol=lf
3637
*.xsl text eol=lf
3738
*.xslt text eol=lf
39+
*.yml text eol=lf
40+
*.yaml text eol=lf
3841

3942

4043
# Declare windows-specific text files with windows file ending

‎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.4" date="2017-02-09">
27+
<action type="update" dev="sseifert">
28+
Update to global-parent 13, update dependencies.
29+
</action>
30+
<action type="update" dev="sseifert" issue="DOXIASITETOOLS-168">
31+
Replace reflow-velocity-tools to fix problem with site generation.
32+
</action>
33+
</release>
34+
2635
<release version="1.0.2" date="2015-11-12">
2736
<action type="update" dev="sseifert">
2837
Update to global-parent 10, switch from cobertura to jacoco.

‎parent_toplevel/pom.xml‎

Lines changed: 15 additions & 10 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>10</version>
28+
<version>13</version>
2929
<relativePath />
3030
</parent>
3131

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

3737
<name>Toplevel Parent</name>
@@ -94,6 +94,11 @@
9494
<dependencies>
9595

9696
<!-- Testing -->
97+
<dependency>
98+
<groupId>org.hamcrest</groupId>
99+
<artifactId>hamcrest-library</artifactId>
100+
<scope>test</scope>
101+
</dependency>
97102
<dependency>
98103
<groupId>junit</groupId>
99104
<artifactId>junit</artifactId>
@@ -132,6 +137,11 @@
132137
</dependency>
133138

134139
<!-- Testing -->
140+
<dependency>
141+
<groupId>org.hamcrest</groupId>
142+
<artifactId>hamcrest-library</artifactId>
143+
<version>1.3</version>
144+
</dependency>
135145
<dependency>
136146
<groupId>junit</groupId>
137147
<artifactId>junit</artifactId>
@@ -140,12 +150,7 @@
140150
<dependency>
141151
<groupId>org.mockito</groupId>
142152
<artifactId>mockito-core</artifactId>
143-
<version>2.0.13-beta</version>
144-
</dependency>
145-
<dependency>
146-
<groupId>org.hamcrest</groupId>
147-
<artifactId>hamcrest-core</artifactId>
148-
<version>1.3</version>
153+
<version>2.3.7</version>
149154
</dependency>
150155

151156
</dependencies>
@@ -189,9 +194,9 @@
189194
<artifactId>maven-site-plugin</artifactId>
190195
<dependencies>
191196
<dependency>
192-
<groupId>lt.velykis.maven.skins</groupId>
197+
<groupId>io.wcm.maven.skins</groupId>
193198
<artifactId>reflow-velocity-tools</artifactId>
194-
<version>1.1.1</version>
199+
<version>1.0.0</version>
195200
</dependency>
196201
<!-- Reflow skin requires Velocity >= 1.7 -->
197202
<dependency>

‎parent_toplevel/src/site/site.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
</menu>
127127
<menu name="Contribute" inherit="top">
128128
<item name="Contribute" href="http://wcm.io/contribute.html" />
129-
<item name="Manifest" href="http://wcm.io/manifest.html" />
130129
<item name="Issues" href="https://wcm-io.atlassian.net" />
131130
<item name="Wiki" href="https://wcm-io.atlassian.net/wiki/" />
132131
<item name="Mailing Lists" href="http://wcm.io/mailing-lists.html" />

‎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.maven</groupId>
2828
<artifactId>io.wcm.maven.global-parent</artifactId>
29-
<version>10</version>
29+
<version>13</version>
3030
<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.1-SNAPSHOT</version>
29+
<version>1.0.3-SNAPSHOT</version>
3030
<relativePath>../parent_toplevel/pom.xml</relativePath>
3131
</parent>
3232

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

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

66
### Modules
77

8-
Overview of wcm.io DevOps modules by category:
9-
108
* [CONGA - CONfiguration GenerAtor](conga/)
119

1210

11+
### Tools
12+
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)
15+
* [Maven NodeJS Proxy](https://github.com/wcm-io-devops/maven-nodejs-proxy)
16+
* [Maven Eclipse Plugin (Fork)](https://github.com/wcm-io-devops/maven-eclipse-plugin)
17+
18+
1319
### Subprojects
1420

1521
List of [Subprojects](http://wcm.io/subprojects.html) of wcm.io.

0 commit comments

Comments
 (0)