Split the first 2 modules: java-dates-conversion and java-dates-string.

java-dates-2/README.md

@@ -1,4 +0,0 @@
-## Relevant Articles:
-- [Converting Between LocalDate and XMLGregorianCalendar](https://www.baeldung.com/java-localdate-to-xmlgregoriancalendar)
-- [Convert Time to Milliseconds in Java](https://www.baeldung.com/java-time-milliseconds)
-- [Check If a String Is a Valid Date in Java](https://www.baeldung.com/java-string-valid-date)

java-dates-conversion/.gitignore

@@ -24,6 +24,3 @@ backup-pom.xml
 #IntelliJ specific
 .idea/
 *.iml
-
-#jenv
-.java-version

java-dates-conversion/README.md

@@ -0,0 +1,9 @@
+=========
+
+## Java Date/time conversion Cookbooks and Examples
+
+### Relevant Articles: 
+- [Converting Between LocalDate and XMLGregorianCalendar](https://www.baeldung.com/java-localdate-to-xmlgregoriancalendar)
+- [Convert Time to Milliseconds in Java](https://www.baeldung.com/java-time-milliseconds)
+- [Convert Date to LocalDate or LocalDateTime and Back](http://www.baeldung.com/java-date-to-localdate-and-localdatetime)
+- [Convert Between java.time.Instant and java.sql.Timestamp](https://www.baeldung.com/java-time-instant-to-java-sql-timestamp)

java-dates-conversion/pom.xml

@@ -1,11 +1,10 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>java-dates-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <artifactId>java-dates-conversion</artifactId>
+    <version>${project.parent.version}</version>
+    <name>java-dates</name>
     <packaging>jar</packaging>
-    <name>java-dates-2</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -20,14 +19,16 @@
             <artifactId>joda-time</artifactId>
             <version>${joda-time.version}</version>
         </dependency>
-        
-        <!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
         <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>${commons-validator.version}</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
         </dependency>
-
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -38,7 +39,7 @@
     </dependencies>
 
     <build>
-        <finalName>java-dates-2</finalName>
+        <finalName>java-dates</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -60,11 +61,10 @@
     </build>
 
     <properties>
+        <joda-time.version>2.10</joda-time.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <joda-time.version>2.10</joda-time.version>
-        <commons-validator.version>1.6</commons-validator.version>
-        <maven.compiler.source>1.9</maven.compiler.source>
+		<maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
     </properties>
 </project>

java-dates-conversion/src/test/java/com/baeldung/datetime/ConvertInstantToTimestampUnitTest.java

@@ -1,15 +1,14 @@
 package com.baeldung.datetime;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
 
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.util.TimeZone;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ConvertInstantToTimestampUnitTest {
 

java-dates-string/.gitignore

@@ -0,0 +1,26 @@
+*.class
+
+0.*
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+.resourceCache
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+
+# Files generated by integration tests
+*.txt
+backup-pom.xml
+/bin/
+/temp
+
+#IntelliJ specific
+.idea/
+*.iml

java-dates-string/README.md

@@ -0,0 +1,12 @@
+=========
+
+## Java Dates Parsing and Formatting Cookbooks and Examples
+
+### Relevant Articles: 
+- [Check If a String Is a Valid Date in Java](https://www.baeldung.com/java-string-valid-date)
+- [RegEx for matching Date Pattern in Java](http://www.baeldung.com/java-date-regular-expressions)
+- [Guide to DateTimeFormatter](https://www.baeldung.com/java-datetimeformatter)
+- [Format ZonedDateTime to String](https://www.baeldung.com/java-format-zoned-datetime-string)
+- [A Guide to SimpleDateFormat](https://www.baeldung.com/java-simple-date-format)
+- [Display All Time Zones With GMT And UTC in Java](http://www.baeldung.com/java-time-zones)
+- [Convert between String and Timestamp](https://www.baeldung.com/java-string-to-timestamp)

java-dates-string/pom.xml

@@ -0,0 +1,83 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>java-dates-string</artifactId>
+    <version>${project.parent.version}</version>
+    <name>java-dates</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>${commons-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${joda-time.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.darwinsys</groupId>
+            <artifactId>hirondelle-date4j</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>java-dates</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <commons-validator.version>1.6</commons-validator.version>
+        <joda-time.version>2.10</joda-time.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+		<maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
+    </properties>
+</project>

java-dates-string/src/main/java/com/baeldung/zonedatetime/OffsetDateTimeExample.java

@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;

java-dates-string/src/main/java/com/baeldung/zonedatetime/OffsetTimeExample.java

@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import java.time.OffsetTime;
 import java.time.ZoneOffset;

java-dates-string/src/main/java/com/baeldung/zonedatetime/ZoneDateTimeExample.java

@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;

java-dates-string/src/test/java/com/baeldung/zonedatetime/OffsetDateTimeExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import static org.junit.Assert.assertTrue;
 

java-dates-string/src/test/java/com/baeldung/zonedatetime/OffsetTimeExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import static org.junit.Assert.assertTrue;
 

java-dates-string/src/test/java/com/baeldung/zonedatetime/ZoneDateTimeExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import static org.junit.Assert.assertTrue;
 

java-dates-string/src/test/java/com/baeldung/zonedatetime/ZonedDateTimeUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.zoneddatetime;
+package com.baeldung.zonedatetime;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 

java-dates/README.md

@@ -7,14 +7,11 @@
 - [Handling Daylight Savings Time in Java](http://www.baeldung.com/java-daylight-savings)
 - [Period and Duration in Java](http://www.baeldung.com/java-period-duration)
 - [Difference Between Two Dates in Java](http://www.baeldung.com/java-date-difference)
-- [RegEx for matching Date Pattern in Java](http://www.baeldung.com/java-date-regular-expressions)
 - [Migrating to the New Java 8 Date Time API](http://www.baeldung.com/migrating-to-java-8-date-time-api)
 - [Introduction to the Java 8 Date/Time API](http://www.baeldung.com/java-8-date-time-intro)
 - [Get the Current Date, Time and Timestamp in Java 8](http://www.baeldung.com/current-date-time-and-timestamp-in-java-8)
 - [Get Date Without Time in Java](http://www.baeldung.com/java-date-without-time)
 - [How to Get All Dates Between Two Dates?](http://www.baeldung.com/java-between-dates)
-- [Convert Date to LocalDate or LocalDateTime and Back](http://www.baeldung.com/java-date-to-localdate-and-localdatetime)
-- [Display All Time Zones With GMT And UTC in Java](http://www.baeldung.com/java-time-zones)
 - [Extracting Year, Month and Day from Date in Java](http://www.baeldung.com/java-year-month-day)
 - [Guide to java.util.GregorianCalendar](http://www.baeldung.com/java-gregorian-calendar)
 - [Measure Elapsed Time in Java](http://www.baeldung.com/java-measure-elapsed-time)
@@ -22,11 +19,6 @@
 - [Calculate Age in Java](http://www.baeldung.com/java-get-age)
 - [Increment Date in Java](http://www.baeldung.com/java-increment-date)
 - [Add Hours To a Date In Java](http://www.baeldung.com/java-add-hours-date)
-- [Guide to DateTimeFormatter](https://www.baeldung.com/java-datetimeformatter)
-- [Format ZonedDateTime to String](https://www.baeldung.com/java-format-zoned-datetime-string)
-- [Convert Between java.time.Instant and java.sql.Timestamp](https://www.baeldung.com/java-time-instant-to-java-sql-timestamp)
-- [Convert between String and Timestamp](https://www.baeldung.com/java-string-to-timestamp)
-- [A Guide to SimpleDateFormat](https://www.baeldung.com/java-simple-date-format)
 - [ZoneOffset in Java](https://www.baeldung.com/java-zone-offset)
 - [Differences Between ZonedDateTime and OffsetDateTime](https://www.baeldung.com/java-zoneddatetime-offsetdatetime)
 - [Introduction to Joda-Time](http://www.baeldung.com/joda-time)

java-dates/pom.xml

@@ -25,12 +25,6 @@
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- test scoped -->
         <dependency>
             <groupId>org.assertj</groupId>

pom.xml

@@ -467,8 +467,10 @@
                 <module>java-collections-maps</module>
                 <module>java-collections-maps-2</module>
                 <module>java-jdi</module>
-                <!-- <module>java-dates</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <!-- <module>java-dates-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+				<!-- <module>java-dates</module>
+				<module>java-dates</module>
+				<module>java-dates-conversion</module>
+				<module>java-dates-string</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
                 <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
                 <module>java-lite</module>
 				<module>java-math</module>