Merge branch 'BAEL-16646' into BAEL-16646-2
# Conflicts: # core-java-modules/core-java-datetime/README.md
This commit is contained in:
@@ -3,14 +3,14 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>java-dates-conversion</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
<name>java-dates</name>
|
||||
<name>java-dates-conversion</name>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>parent-java</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<relativePath>../parent-java</relativePath>
|
||||
<relativePath>../../../parent-java</relativePath>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
@@ -39,7 +39,7 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>java-dates</finalName>
|
||||
<finalName>java-dates-conversion</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
|
||||
@@ -10,3 +10,4 @@ This module contains articles about parsing and formatting Java date and time ob
|
||||
- [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)
|
||||
- [Convert String to Date in Java](http://www.baeldung.com/java-string-to-date)
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>java-dates-string</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
<name>java-dates</name>
|
||||
<name>java-dates-string</name>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>com.baeldung</groupId>
|
||||
<artifactId>parent-java</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<relativePath>../parent-java</relativePath>
|
||||
<relativePath>../../../parent-java</relativePath>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
@@ -51,7 +51,7 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>java-dates</finalName>
|
||||
<finalName>java-dates-string</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
- [Publish and Receive Messages with Nats Java Client](http://www.baeldung.com/nats-java-client)
|
||||
- [Java Concurrency Utility with JCTools](http://www.baeldung.com/java-concurrency-jc-tools)
|
||||
- [Introduction to JavaPoet](http://www.baeldung.com/java-poet)
|
||||
- [Convert String to Date in Java](http://www.baeldung.com/java-string-to-date)
|
||||
- [Guide to Resilience4j](http://www.baeldung.com/resilience4j)
|
||||
- [Exactly Once Processing in Kafka](https://www.baeldung.com/kafka-exactly-once)
|
||||
- [Implementing a FTP-Client in Java](http://www.baeldung.com/java-ftp-client)
|
||||
|
||||
Reference in New Issue
Block a user