Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d098ab4

Browse files
committed
Fully replaced TestNG, Mockito and FESTAssert with Spock
I also upgraded all dependency versions to the latest ones and increased the required Maven version from 2 to 3.
1 parent 0124c12 commit d098ab4

File tree

12 files changed

+440
-1345
lines changed

12 files changed

+440
-1345
lines changed

‎NOTICE‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ specific language governing permissions and limitations
1616
under the License.
1717

1818
Lists of 9 third-party dependencies.
19-
(Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.0.7 - http://logback.qos.ch)
20-
(Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Core Module (ch.qos.logback:logback-core:1.0.7 - http://logback.qos.ch)
21-
(Apache License, Version 2.0) TestNG (org.testng:testng:6.8 - http://testng.org)
22-
(Apache License, Version 2.0) JCommander (com.beust:jcommander:1.27 - http://beust.com/jcommander)
23-
(Apache License, Version 2.0) FEST Fluent Assertions (Core) (org.easytesting:fest-assert-core:2.0M8 - http://fest.easytesting.org/assert)
24-
(Apache License, Version 2.0) FEST Util (org.easytesting:fest-util:1.2.3 - http://fest.easytesting.org)
25-
(MIT License) Mockito (org.mockito:mockito-all:1.9.0 - http://www.mockito.org)
26-
(MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.2 - http://www.slf4j.org)
27-
(New BSD License) Hamcrest All (org.hamcrest:hamcrest-all:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-all)
19+
(ASF 2.0) cglib-nodep (cglib:cglib-nodep:3.2.1 - https://github.com/cglib/cglib/cglib-nodep)
20+
(Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.1.6 - http://logback.qos.ch/logback-classic)
21+
(Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Core Module (ch.qos.logback:logback-core:1.1.6 - http://logback.qos.ch/logback-core)
22+
(Eclipse Public License 1.0) JUnit (junit:junit:4.12 - http://junit.org)
23+
(The Apache Software License, Version 2.0) Apache Groovy (org.codehaus.groovy:groovy-all:2.4.6 - http://groovy-lang.org)
24+
(New BSD License) Hamcrest Core (org.hamcrest:hamcrest-core:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
25+
(Apache 2) Objenesis (org.objenesis:objenesis:2.2 - http://objenesis.org)
26+
(MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.18 - http://www.slf4j.org)
27+
(The Apache Software License, Version 2.0) Spock Framework - Core Module (org.spockframework:spock-core:1.0-groovy-2.4 - http://spockframework.org)

‎pom.xml‎

Lines changed: 66 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1920

2021
<modelVersion>4.0.0</modelVersion>
2122
<groupId>de.danielbechler</groupId>
@@ -24,7 +25,7 @@
2425
<version>0.93.3-SNAPSHOT</version>
2526

2627
<prerequisites>
27-
<maven>2.2.1</maven>
28+
<maven>3.0</maven>
2829
</prerequisites>
2930

3031
<developers>
@@ -80,19 +81,19 @@
8081
<dependency>
8182
<groupId>org.codehaus.groovy</groupId>
8283
<artifactId>groovy-eclipse-compiler</artifactId>
83-
<version>2.9.1-01</version>
84+
<version>2.9.2-01</version>
8485
</dependency>
8586
<dependency>
8687
<groupId>org.codehaus.groovy</groupId>
8788
<artifactId>groovy-eclipse-batch</artifactId>
88-
<version>2.3.7-01</version>
89+
<version>2.4.3-01</version>
8990
</dependency>
9091
</dependencies>
9192
</plugin>
9293
<plugin>
9394
<artifactId>maven-release-plugin</artifactId>
9495
<configuration>
95-
<scmCommentPrefix/>
96+
<scmCommentPrefix/>
9697
</configuration>
9798
</plugin>
9899
<plugin>
@@ -111,12 +112,7 @@
111112
<dependency>
112113
<groupId>org.apache.maven.surefire</groupId>
113114
<artifactId>surefire-junit4</artifactId>
114-
<version>2.18</version>
115-
</dependency>
116-
<dependency>
117-
<groupId>org.apache.maven.surefire</groupId>
118-
<artifactId>surefire-testng</artifactId>
119-
<version>2.18</version>
115+
<version>2.19.1</version>
120116
</dependency>
121117
</dependencies>
122118
<configuration>
@@ -201,12 +197,10 @@
201197
<plugin>
202198
<groupId>org.eluder.coveralls</groupId>
203199
<artifactId>coveralls-maven-plugin</artifactId>
204-
<version>3.0.1</version>
205200
</plugin>
206201
<plugin>
207202
<groupId>org.codehaus.mojo</groupId>
208203
<artifactId>animal-sniffer-maven-plugin</artifactId>
209-
<version>1.12</version>
210204
<executions>
211205
<execution>
212206
<id>animal-sniffer</id>
@@ -227,12 +221,11 @@
227221
<plugin>
228222
<groupId>org.codehaus.mojo</groupId>
229223
<artifactId>cobertura-maven-plugin</artifactId>
230-
<version>2.6</version>
231224
<configuration>
232225
<format>xml</format>
233226
<maxmem>256m</maxmem>
234227
<aggregate>true</aggregate>
235-
<check/>
228+
<check/>
236229
</configuration>
237230
<executions>
238231
<execution>
@@ -250,33 +243,49 @@
250243
<version>3.1</version>
251244
</plugin>
252245
<plugin>
253-
<artifactId>maven-javadoc-plugin</artifactId>
254-
<version>2.9.1</version>
246+
<artifactId>maven-clean-plugin</artifactId>
247+
<version>2.5</version>
248+
</plugin>
249+
<plugin>
250+
<artifactId>maven-dependency-plugin</artifactId>
251+
<version>2.8</version>
255252
</plugin>
256253
<plugin>
257254
<artifactId>maven-deploy-plugin</artifactId>
258255
<version>2.8.1</version>
259256
</plugin>
260257
<plugin>
261-
<artifactId>maven-source-plugin</artifactId>
262-
<version>2.2.1</version>
258+
<artifactId>maven-install-plugin</artifactId>
259+
<version>2.5.1</version>
263260
</plugin>
264261
<plugin>
265-
<artifactId>maven-surefire-plugin</artifactId>
266-
<version>2.16</version>
262+
<artifactId>maven-release-plugin</artifactId>
263+
<version>2.5</version>
267264
</plugin>
268265
<plugin>
269266
<artifactId>maven-resources-plugin</artifactId>
270267
<version>2.6</version>
271268
</plugin>
272269
<plugin>
273-
<artifactId>maven-release-plugin</artifactId>
274-
<version>2.5</version>
270+
<artifactId>maven-site-plugin</artifactId>
271+
<version>3.3</version>
272+
</plugin>
273+
<plugin>
274+
<artifactId>maven-source-plugin</artifactId>
275+
<version>2.2.1</version>
276+
</plugin>
277+
<plugin>
278+
<artifactId>maven-surefire-plugin</artifactId>
279+
<version>2.16</version>
275280
</plugin>
276281
<plugin>
277282
<artifactId>maven-jar-plugin</artifactId>
278283
<version>2.4</version>
279284
</plugin>
285+
<plugin>
286+
<artifactId>maven-javadoc-plugin</artifactId>
287+
<version>2.9.1</version>
288+
</plugin>
280289
<plugin>
281290
<groupId>org.apache.felix</groupId>
282291
<artifactId>maven-bundle-plugin</artifactId>
@@ -292,6 +301,21 @@
292301
<artifactId>build-helper-maven-plugin</artifactId>
293302
<version>1.8</version>
294303
</plugin>
304+
<plugin>
305+
<groupId>org.codehaus.mojo</groupId>
306+
<artifactId>cobertura-maven-plugin</artifactId>
307+
<version>2.7</version>
308+
</plugin>
309+
<plugin>
310+
<groupId>org.codehaus.mojo</groupId>
311+
<artifactId>animal-sniffer-maven-plugin</artifactId>
312+
<version>1.15</version>
313+
</plugin>
314+
<plugin>
315+
<groupId>org.eluder.coveralls</groupId>
316+
<artifactId>coveralls-maven-plugin</artifactId>
317+
<version>4.1.0</version>
318+
</plugin>
295319
</plugins>
296320
</pluginManagement>
297321
</build>
@@ -301,7 +325,7 @@
301325
<dependency>
302326
<groupId>com.ibm.icu</groupId>
303327
<artifactId>icu4j</artifactId>
304-
<version>3.4.4</version>
328+
<version>56.1</version>
305329
</dependency>
306330
</dependencies>
307331
</dependencyManagement>
@@ -310,78 +334,42 @@
310334
<dependency>
311335
<groupId>org.slf4j</groupId>
312336
<artifactId>slf4j-api</artifactId>
313-
<version>1.7.6</version>
314-
</dependency>
315-
<dependency>
316-
<groupId>org.testng</groupId>
317-
<artifactId>testng</artifactId>
318-
<version>6.8.7</version>
319-
<scope>test</scope>
320-
<exclusions>
321-
<exclusion>
322-
<groupId>junit</groupId>
323-
<artifactId>junit</artifactId>
324-
</exclusion>
325-
<exclusion>
326-
<groupId>org.hamcrest</groupId>
327-
<artifactId>hamcrest-core</artifactId>
328-
</exclusion>
329-
<exclusion>
330-
<groupId>org.beanshell</groupId>
331-
<artifactId>bsh</artifactId>
332-
</exclusion>
333-
<exclusion>
334-
<groupId>org.yaml</groupId>
335-
<artifactId>snakeyaml</artifactId>
336-
</exclusion>
337-
</exclusions>
338-
</dependency>
339-
<dependency>
340-
<groupId>org.hamcrest</groupId>
341-
<artifactId>hamcrest-all</artifactId>
342-
<version>1.3</version>
343-
<scope>test</scope>
344-
</dependency>
345-
<dependency>
346-
<groupId>org.mockito</groupId>
347-
<artifactId>mockito-all</artifactId>
348-
<version>1.9.5</version>
349-
<scope>test</scope>
337+
<version>1.7.18</version>
350338
</dependency>
351339
<dependency>
352340
<groupId>ch.qos.logback</groupId>
353341
<artifactId>logback-core</artifactId>
354-
<version>1.1.1</version>
342+
<version>1.1.6</version>
355343
<scope>test</scope>
356344
</dependency>
357345
<dependency>
358346
<groupId>ch.qos.logback</groupId>
359347
<artifactId>logback-classic</artifactId>
360-
<version>1.1.1</version>
361-
<scope>test</scope>
362-
</dependency>
363-
<dependency>
364-
<groupId>org.easytesting</groupId>
365-
<artifactId>fest-assert-core</artifactId>
366-
<version>2.0M10</version>
348+
<version>1.1.6</version>
367349
<scope>test</scope>
368350
</dependency>
369351
<dependency>
370352
<groupId>org.codehaus.groovy</groupId>
371353
<artifactId>groovy-all</artifactId>
372-
<version>2.3.10</version>
354+
<version>2.4.6</version>
373355
<scope>test</scope>
374356
</dependency>
375357
<dependency>
376358
<groupId>org.spockframework</groupId>
377359
<artifactId>spock-core</artifactId>
378-
<version>1.0-groovy-2.3</version>
360+
<version>1.0-groovy-2.4</version>
379361
<scope>test</scope>
380362
</dependency>
381363
<dependency>
382364
<groupId>cglib</groupId>
383365
<artifactId>cglib-nodep</artifactId>
384-
<version>3.1</version>
366+
<version>3.2.1</version>
367+
<scope>test</scope>
368+
</dependency>
369+
<dependency>
370+
<groupId>org.objenesis</groupId>
371+
<artifactId>objenesis</artifactId>
372+
<version>2.2</version>
385373
<scope>test</scope>
386374
</dependency>
387375
</dependencies>
@@ -391,7 +379,7 @@
391379
<plugin>
392380
<groupId>org.apache.maven.plugins</groupId>
393381
<artifactId>maven-pmd-plugin</artifactId>
394-
<version>3.0.1</version>
382+
<version>3.6</version>
395383
<configuration>
396384
<sourceEncoding>utf-8</sourceEncoding>
397385
<minimumTokens>100</minimumTokens>
@@ -401,7 +389,7 @@
401389
<plugin>
402390
<groupId>org.codehaus.mojo</groupId>
403391
<artifactId>cobertura-maven-plugin</artifactId>
404-
<version>2.6</version>
392+
<version>2.7</version>
405393
<configuration>
406394
<instrumentation>
407395
<excludes>
@@ -410,16 +398,17 @@
410398
<exclude>**/*Example.class</exclude>
411399
</excludes>
412400
</instrumentation>
413-
<check/>
401+
<check/>
414402
</configuration>
415403
</plugin>
416404
<plugin>
417405
<groupId>org.apache.maven.plugins</groupId>
418406
<artifactId>maven-jxr-plugin</artifactId>
419-
<version>2.4</version>
407+
<version>2.5</version>
420408
</plugin>
421409
<plugin>
422410
<artifactId>maven-javadoc-plugin</artifactId>
411+
<version>2.9.1</version>
423412
<configuration>
424413
<encoding>UTF-8</encoding>
425414
<doclet>ch.raffael.doclets.pegdown.PegdownDoclet</doclet>
@@ -433,7 +422,7 @@
433422
</plugin>
434423
<plugin>
435424
<artifactId>maven-project-info-reports-plugin</artifactId>
436-
<version>2.7</version>
425+
<version>2.9</version>
437426
</plugin>
438427
</plugins>
439428
</reporting>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /