You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/02/24 11:51:08 UTC
[commons-lang] branch master updated (d7ff0ae -> 02200b8)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git.
from d7ff0ae Fix Javadoc.
new cd10cfd Make DurationUtils#getNanosOfMiili() null-safe.
new 2777d67 Add JavaVersion for Java 18 since a release candidate is available.
new 02200b8 Bump maven-javadoc-plugin from 3.3.1 to 3.3.2.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
src/changes/changes.xml | 3 ++-
src/main/java/org/apache/commons/lang3/JavaVersion.java | 9 +++++++++
src/main/java/org/apache/commons/lang3/time/DurationUtils.java | 2 +-
src/test/java/org/apache/commons/lang3/JavaVersionTest.java | 4 +++-
.../java/org/apache/commons/lang3/time/DurationUtilsTest.java | 1 +
6 files changed, 17 insertions(+), 4 deletions(-)
[commons-lang] 02/03: Add JavaVersion for Java 18 since a release candidate is available.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 2777d6784ef5ccd1764e36a64575d2590b2d59d8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Feb 24 06:48:59 2022 -0500
Add JavaVersion for Java 18 since a release candidate is available.
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/lang3/JavaVersion.java | 9 +++++++++
src/test/java/org/apache/commons/lang3/JavaVersionTest.java | 4 +++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8662fbe..20d1e45 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -119,6 +119,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="add" dev="ggregory" due-to="Gary Gregory">Add Processor.Type.AARCH_64.</action>
<action type="add" dev="ggregory" due-to="Gary Gregory">Add Processor.isAarch64().</action>
<action type="add" dev="ggregory" due-to="Gary Gregory">Update ArchUtils.getProcessor(String) for "aarch64".</action>
+ <action type="add" dev="ggregory" due-to="Gary Gregory">Add JavaVersion.JAVA_18.</action>
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Dependabot, Gary Gregory">Bump spotbugs-maven-plugin from 4.2.0 to 4.5.0.0 #735, #808, #822, #834.</action>
<action type="update" dev="ggregory" due-to="Dependabot, XenoAmess">Bump actions/cache from v2.1.4 to v2.1.7 #742, #752, #764, #833.</action>
diff --git a/src/main/java/org/apache/commons/lang3/JavaVersion.java b/src/main/java/org/apache/commons/lang3/JavaVersion.java
index 6166512..9e8908f 100644
--- a/src/main/java/org/apache/commons/lang3/JavaVersion.java
+++ b/src/main/java/org/apache/commons/lang3/JavaVersion.java
@@ -144,6 +144,13 @@ public enum JavaVersion {
JAVA_17(17.0f, "17"),
/**
+ * Java 18.
+ *
+ * @since 3.13.0
+ */
+ JAVA_18(18.0f, "18"),
+
+ /**
* The most recent java version. Mainly introduced to avoid to break when a new version of Java is used.
*/
JAVA_RECENT(maxVersion(), Float.toString(maxVersion()));
@@ -260,6 +267,8 @@ public enum JavaVersion {
return JAVA_16;
case "17":
return JAVA_17;
+ case "18":
+ return JAVA_18;
default:
final float v = toFloatVersion(versionStr);
if ((v - 1.) < 1.) { // then we need to check decimals > .9
diff --git a/src/test/java/org/apache/commons/lang3/JavaVersionTest.java b/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
index 5549875..b8f6b40 100644
--- a/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
+++ b/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
@@ -27,6 +27,7 @@ import static org.apache.commons.lang3.JavaVersion.JAVA_14;
import static org.apache.commons.lang3.JavaVersion.JAVA_15;
import static org.apache.commons.lang3.JavaVersion.JAVA_16;
import static org.apache.commons.lang3.JavaVersion.JAVA_17;
+import static org.apache.commons.lang3.JavaVersion.JAVA_18;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_1;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_2;
import static org.apache.commons.lang3.JavaVersion.JAVA_1_3;
@@ -70,10 +71,11 @@ public class JavaVersionTest {
assertEquals(JAVA_15, get("15"), "15 failed");
assertEquals(JAVA_16, get("16"), "16 failed");
assertEquals(JAVA_17, get("17"), "17 failed");
+ assertEquals(JAVA_18, get("18"), "18 failed");
assertEquals(JAVA_RECENT, get("1.10"), "1.10 failed");
// assertNull("2.10 unexpectedly worked", get("2.10"));
assertEquals(get("1.5"), getJavaVersion("1.5"), "Wrapper method failed");
- assertEquals(JAVA_RECENT, get("18"), "Unhandled"); // LANG-1384
+ assertEquals(JAVA_RECENT, get("19"), "Unhandled"); // LANG-1384
}
@Test
[commons-lang] 03/03: Bump maven-javadoc-plugin from 3.3.1 to 3.3.2.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 02200b8411c45eae33a6fb7ef9434242f1e044c6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Feb 24 06:51:05 2022 -0500
Bump maven-javadoc-plugin from 3.3.1 to 3.3.2.
---
pom.xml | 2 +-
src/changes/changes.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6518a0b..cfc58bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -649,7 +649,7 @@
<commons.jacoco.version>0.8.7</commons.jacoco.version>
<commons.surefire.version>3.0.0-M5</commons.surefire.version>
- <commons.javadoc.version>3.3.1</commons.javadoc.version>
+ <commons.javadoc.version>3.3.2</commons.javadoc.version>
<commons.japicmp.version>0.15.4</commons.japicmp.version>
<commons.pmd.version>3.15.0</commons.pmd.version>
<commons.pmd-impl.version>6.42.0</commons.pmd-impl.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 20d1e45..634eede 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -131,7 +131,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump commons.japicmp.version 0.15.2 -> 0.15.4.</action>
<action type="update" dev="ggregory" due-to="Dependabot">Bump junit-pioneer from 1.3.8 to 1.5.0 #749, #767, #832.</action>
<action type="update" dev="ggregory" due-to="Dependabot">Bump junit-bom from 5.7.1 to 5.8.2 #761, #805, #807, #836.</action>
- <action type="update" dev="ggregory" due-to="Dependabot">Bump maven-javadoc-plugin from 3.2.0 to 3.3.1.</action>
+ <action type="update" dev="ggregory" due-to="Dependabot, Gary Gregory">Bump maven-javadoc-plugin from 3.2.0 to 3.3.2.</action>
<action type="update" dev="ggregory" due-to="Dependabot">Bump jmh.version from 1.27 to 1.34 #794, #842.</action>
<action type="update" dev="ggregory" due-to="Dependabot">Bump maven-pmd-plugin from 3.14.0 to 3.15.0 #802.</action>
<action type="update" dev="ggregory" due-to="Dependabot">Bump pmd-java8 from 6.40.0 to 6.41.0 #837.</action>
[commons-lang] 01/03: Make DurationUtils#getNanosOfMiili() null-safe.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit cd10cfd51fdc80606b296a0cd71e6e9daf946438
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Feb 24 06:33:25 2022 -0500
Make DurationUtils#getNanosOfMiili() null-safe.
---
src/main/java/org/apache/commons/lang3/time/DurationUtils.java | 2 +-
src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/lang3/time/DurationUtils.java b/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
index 58d4358..139f85a 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
@@ -70,7 +70,7 @@ public class DurationUtils {
* @return nanoseconds between 0 and 999,999.
*/
public static int getNanosOfMiili(final Duration duration) {
- return duration.getNano() % 1_000_000;
+ return zeroIfNull(duration).getNano() % 1_000_000;
}
/**
diff --git a/src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java
index 202ee4b..3b9c55b 100644
--- a/src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java
@@ -34,6 +34,7 @@ public class DurationUtilsTest {
@Test
public void testGetNanosOfMilli() {
+ assertEquals(0, DurationUtils.getNanosOfMiili(null));
assertEquals(0, DurationUtils.getNanosOfMiili(Duration.ZERO));
assertEquals(1, DurationUtils.getNanosOfMiili(Duration.ofNanos(1)));
assertEquals(10, DurationUtils.getNanosOfMiili(Duration.ofNanos(10)));