Skip to content

Commit e65b896

Browse files
stefanseifertstefanseifert
committed
Merge branch 'feature/junit5' into develop
2 parents 53b9908 + 0ad43f0 commit e65b896

4 files changed

Lines changed: 43 additions & 14 deletions

File tree

‎parent_toplevel/changes.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
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="not released">
27+
<action type="update" dev="sseifert">
28+
Switch to JUnit 5 as default test framework.
29+
</action>
30+
</release>
31+
2632
<release version="1.0.10" date="2018-01-15">
2733
<action type="update" dev="sseifert">
2834
Update reflow-maven-skin.

‎parent_toplevel/pom.xml‎

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm.maven</groupId>
2727
<artifactId>io.wcm.maven.global-parent</artifactId>
28-
<version>19</version>
28+
<version>20-SNAPSHOT</version>
2929
<relativePath />
3030
</parent>
3131

@@ -100,15 +100,30 @@
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+
<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>
112127

113128
</dependencies>
114129
<dependencyManagement>
@@ -118,17 +133,17 @@
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>

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

0 commit comments

Comments
 (0)