Skip to content

Commit 438ba56

Browse files
committed
Merge branch 'develop' into feature/junit5
2 parents ba2ed9d + 53b9908 commit 438ba56

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

parent_toplevel/changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<action type="update" dev="sseifert">
2828
Switch to JUnit 5 as default test framework.
2929
</action>
30+
</release>
31+
32+
<release version="1.0.10" date="2018-01-15">
3033
<action type="update" dev="sseifert">
3134
Update reflow-maven-skin.
3235
</action>

parent_toplevel/pom.xml

Lines changed: 5 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>19-SNAPSHOT</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.9-SNAPSHOT</version>
34+
<version>1.0.11-SNAPSHOT</version>
3535
<packaging>pom</packaging>
3636

3737
<name>Toplevel Parent</name>
@@ -76,7 +76,7 @@
7676
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
7777
</license>
7878
</licenses>
79-
79+
8080
<properties>
8181

8282
<!-- compiler settings -->
@@ -130,10 +130,10 @@
130130
<scope>test</scope>
131131
</dependency>
132132

133-
</dependencies>
133+
</dependencies>
134134
<dependencyManagement>
135135
<dependencies>
136-
136+
137137
<!-- Logging -->
138138
<dependency>
139139
<groupId>org.slf4j</groupId>

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

0 commit comments

Comments
 (0)