You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2018/09/04 14:15:49 UTC
[1/5] [lang] LANG-1416: Update ValidateTest to JUnit 5 API
Repository: commons-lang
Updated Branches:
refs/heads/master 3e44d2634 -> 6ec01a633
LANG-1416: Update ValidateTest to JUnit 5 API
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/2bcf86d8
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/2bcf86d8
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/2bcf86d8
Branch: refs/heads/master
Commit: 2bcf86d8af125b45d39bd1d43b8375911c551d78
Parents: 83b472b
Author: Benedikt Ritter <br...@apache.org>
Authored: Tue Sep 4 11:30:39 2018 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Tue Sep 4 15:08:37 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/commons/lang3/ValidateTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/2bcf86d8/src/test/java/org/apache/commons/lang3/ValidateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/ValidateTest.java b/src/test/java/org/apache/commons/lang3/ValidateTest.java
index e5d077a..853f7e8 100644
--- a/src/test/java/org/apache/commons/lang3/ValidateTest.java
+++ b/src/test/java/org/apache/commons/lang3/ValidateTest.java
@@ -18,12 +18,7 @@
*/
package org.apache.commons.lang3;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.Test;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
@@ -35,7 +30,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Unit tests {@link org.apache.commons.lang3.Validate}.
[2/5] [lang] LANG-1416: Update to JUnit 5.3.0
Posted by br...@apache.org.
LANG-1416: Update to JUnit 5.3.0
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/83b472b7
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/83b472b7
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/83b472b7
Branch: refs/heads/master
Commit: 83b472b754df1d4f8392490296d2467be7ce8855
Parents: 3287f31
Author: Benedikt Ritter <br...@apache.org>
Authored: Tue Sep 4 11:30:17 2018 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Tue Sep 4 15:08:37 2018 +0200
----------------------------------------------------------------------
pom.xml | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/83b472b7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 39c5b94..bea54d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -507,12 +507,35 @@
</contributor>
</contributors>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>${junit.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!-- Lang should depend on very little -->
<dependencies>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Vintage engine needed for exectuing JUnit 4.x tests. Remove once all tests have been migrated to JUnit 5. -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -595,6 +618,8 @@
<jmh.version>1.21</jmh.version>
<uberjar.name>benchmarks</uberjar.name>
+ <junit.version>5.3.0</junit.version>
+
<!-- generate report even if there are binary incompatible changes -->
<commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
<!-- 0.12.0 dies with a NullPointerException -->
[4/5] [lang] LANG-1416: Add changes.xml entry
Posted by br...@apache.org.
LANG-1416: Add changes.xml entry
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/65a7b5d3
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/65a7b5d3
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/65a7b5d3
Branch: refs/heads/master
Commit: 65a7b5d3b922e40b0ec12760f1c90db2e1fdee10
Parents: 2bcf86d
Author: Benedikt Ritter <br...@apache.org>
Authored: Tue Sep 4 16:15:27 2018 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Tue Sep 4 16:15:27 2018 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/65a7b5d3/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 705ccd0..fe030f7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="3.9" date="????-??-??" description="??">
+ <action issue="LANG-1416" type="update" dev="britter">Update to JUnit 5</action>
<action issue="LANG-1417" type="update" dev="britter">Add @FunctionalInterface to ThreadPredicate and ThreadGroupPredicate</action>
<action issue="LANG-1415" type="update" dev="britter">Update Java Language requirement to 1.8</action>
<action issue="LANG-1411" type="add" dev="britter" due-to="Alexander Tsvetkov">Add isEmpty method to ObjectUtils</action>
[3/5] [lang] LANG-1416: Use latest Apache Maven Surefire Plugin
release
Posted by br...@apache.org.
LANG-1416: Use latest Apache Maven Surefire Plugin release
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/3287f310
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/3287f310
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/3287f310
Branch: refs/heads/master
Commit: 3287f3100f5940c254130192fb442077755477f6
Parents: 3e44d26
Author: Benedikt Ritter <br...@apache.org>
Authored: Tue Sep 4 15:07:47 2018 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Tue Sep 4 15:08:37 2018 +0200
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3287f310/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 149e151..39c5b94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -641,6 +641,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.0</version>
<executions>
<execution>
<id>plain</id>
[5/5] [lang] Merge branch 'LANG-1416'
Posted by br...@apache.org.
Merge branch 'LANG-1416'
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/6ec01a63
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/6ec01a63
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/6ec01a63
Branch: refs/heads/master
Commit: 6ec01a633ceaa24eb476540644460497045ef7ea
Parents: 3e44d26 65a7b5d
Author: Benedikt Ritter <br...@apache.org>
Authored: Tue Sep 4 16:15:34 2018 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Tue Sep 4 16:15:34 2018 +0200
----------------------------------------------------------------------
pom.xml | 32 ++++++++++++++++++--
src/changes/changes.xml | 1 +
.../org/apache/commons/lang3/ValidateTest.java | 14 ++++-----
3 files changed, 37 insertions(+), 10 deletions(-)
----------------------------------------------------------------------