Skip to content

Commit 86b23da

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.1.0' into 'master'
2 parents 4670bda + abd5229 commit 86b23da

File tree

4 files changed

+55
-20
lines changed

4 files changed

+55
-20
lines changed

‎parent_toplevel/changes.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
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.0" date="2018-07-11">
27+
<action type="update" dev="sseifert">
28+
Switch to JUnit 5 as default test framework.
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Update to global-parent 20.
32+
</action>
33+
<action type="update" dev="sseifert">
34+
Update dependencies.
35+
</action>
36+
</release>
37+
2638
<release version="1.0.10" date="2018-01-15">
2739
<action type="update" dev="sseifert">
2840
Update reflow-maven-skin.

‎parent_toplevel/pom.xml‎

Lines changed: 41 additions & 18 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</version>
28+
<version>20</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops</groupId>
3333
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
34-
<version>1.0.10</version>
34+
<version>1.1.0</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 -->
@@ -100,35 +100,50 @@
100100
<scope>test</scope>
101101
</dependency>
102102
<dependency>
103-
<groupId>junit</groupId>
104-
<artifactId>junit</artifactId>
103+
<groupId>org.mockito</groupId>
104+
<artifactId>mockito-core</artifactId>
105105
<scope>test</scope>
106106
</dependency>
107107
<dependency>
108108
<groupId>org.mockito</groupId>
109-
<artifactId>mockito-core</artifactId>
109+
<artifactId>mockito-junit-jupiter</artifactId>
110110
<scope>test</scope>
111111
</dependency>
112-
113-
</dependencies>
112+
<dependency>
113+
<groupId>org.junit.jupiter</groupId>
114+
<artifactId>junit-jupiter-api</artifactId>
115+
<scope>test</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.junit.jupiter</groupId>
119+
<artifactId>junit-jupiter-params</artifactId>
120+
<scope>test</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.junit.jupiter</groupId>
124+
<artifactId>junit-jupiter-engine</artifactId>
125+
<scope>test</scope>
126+
</dependency>
127+
128+
</dependencies>
114129
<dependencyManagement>
115130
<dependencies>
116-
131+
117132
<!-- Logging -->
118133
<dependency>
119134
<groupId>org.slf4j</groupId>
120135
<artifactId>slf4j-api</artifactId>
121-
<version>1.7.12</version>
136+
<version>1.7.25</version>
122137
</dependency>
123138
<dependency>
124139
<groupId>org.slf4j</groupId>
125140
<artifactId>slf4j-log4j12</artifactId>
126-
<version>1.7.12</version>
141+
<version>1.7.25</version>
127142
</dependency>
128143
<dependency>
129144
<groupId>org.slf4j</groupId>
130145
<artifactId>slf4j-simple</artifactId>
131-
<version>1.7.12</version>
146+
<version>1.7.25</version>
132147
</dependency>
133148
<dependency>
134149
<groupId>log4j</groupId>
@@ -143,14 +158,22 @@
143158
<version>1.3</version>
144159
</dependency>
145160
<dependency>
146-
<groupId>junit</groupId>
147-
<artifactId>junit</artifactId>
148-
<version>4.12</version>
161+
<groupId>org.mockito</groupId>
162+
<artifactId>mockito-core</artifactId>
163+
<version>2.19.0</version>
149164
</dependency>
150165
<dependency>
151166
<groupId>org.mockito</groupId>
152-
<artifactId>mockito-core</artifactId>
153-
<version>2.13.0</version>
167+
<artifactId>mockito-junit-jupiter</artifactId>
168+
<version>2.19.0</version>
169+
</dependency>
170+
<!-- Import all JUnit 5 dependencies -->
171+
<dependency>
172+
<groupId>org.junit</groupId>
173+
<artifactId>junit-bom</artifactId>
174+
<version>5.2.0</version>
175+
<type>pom</type>
176+
<scope>import</scope>
154177
</dependency>
155178

156179
</dependencies>
@@ -290,7 +313,7 @@
290313
<report>index</report>
291314
<report>dependencies</report>
292315
<report>scm</report>
293-
<report>license</report>
316+
<report>licenses</report>
294317
<report>summary</report>
295318
</reports>
296319
</reportSet>

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

0 commit comments

Comments
 (0)