Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pick up maven-javadoc-plugin version from parent POM

This commit is contained in:
Gary Gregory 2023-01-10 11:25:31 -05:00
parent fa383f5c57
commit 302d697f9b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -634,7 +634,6 @@
<jmh.version>1.36</jmh.version> <jmh.version>1.36</jmh.version>
<uberjar.name>benchmarks</uberjar.name> <uberjar.name>benchmarks</uberjar.name>
<commons.javadoc.version>3.4.1</commons.javadoc.version>
<commons.japicmp.version>0.16.0</commons.japicmp.version> <commons.japicmp.version>0.16.0</commons.japicmp.version>
<commons.pmd.version>3.19.0</commons.pmd.version> <commons.pmd.version>3.19.0</commons.pmd.version>
<commons.pmd-impl.version>6.52.0</commons.pmd-impl.version> <commons.pmd-impl.version>6.52.0</commons.pmd-impl.version>

4
src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
View File

@ -21,6 +21,8 @@ import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
import org.apache.commons.lang3.ObjectUtils;
/** /**
* Date and time formatting utilities and constants. * Date and time formatting utilities and constants.
* *
@ -409,7 +411,7 @@ public class DateFormatUtils {
} }
private static TimeZone getTimeZone(final Calendar calendar) { private static TimeZone getTimeZone(final Calendar calendar) {
return calendar == null ? null : calendar.getTimeZone(); return ObjectUtils.get(calendar, Calendar::getTimeZone);
} }
} }