Merge branch 'BAEL-16646' into BAEL-16646-2. Flatten additional datetime modules and create new time-measurements module with 3 articles.

# Conflicts:
#	core-java-modules/core-java-datetime/README.md
#	core-java-modules/core-java-datetime/pom.xml

akka-streams/README.md

@@ -1,3 +1,3 @@
 ### Relevant articles
 
-- [Guide to Akka Streams](http://www.baeldung.com/akka-streams)
+- [Guide to Akka Streams](https://www.baeldung.com/akka-streams)

algorithms-genetic/README.md

@@ -1,6 +1,6 @@
 ## Relevant articles:
 
-- [Introduction to Jenetics Library](http://www.baeldung.com/jenetics)
+- [Introduction to Jenetics Library](https://www.baeldung.com/jenetics)
-- [Ant Colony Optimization](http://www.baeldung.com/java-ant-colony-optimization)
+- [Ant Colony Optimization](https://www.baeldung.com/java-ant-colony-optimization)
 - [Design a Genetic Algorithm in Java](https://www.baeldung.com/java-genetic-algorithm)
 - [The Traveling Salesman Problem in Java](https://www.baeldung.com/java-simulated-annealing-for-traveling-salesman)

algorithms-miscellaneous-3/README.md

@@ -2,8 +2,8 @@
 
 - [Java Two Pointer Technique](https://www.baeldung.com/java-two-pointer-technique)
 - [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
-- [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
+- [Converting Between Roman and Arabic Numerals in Java](https://www.baeldung.com/java-convert-roman-arabic)
-- [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
+- [Practical Java Examples of the Big O Notation](https://www.baeldung.com/java-algorithm-complexity)
 - [Checking If a List Is Sorted in Java](https://www.baeldung.com/java-check-if-list-sorted)
 - [Checking if a Java Graph has a Cycle](https://www.baeldung.com/java-graph-has-a-cycle)
 - [A Guide to the Folding Technique in Java](https://www.baeldung.com/folding-hashing-technique)

algorithms-sorting/README.md

@@ -1,6 +1,6 @@
 ## Relevant articles:
 
-- [Bubble Sort in Java](http://www.baeldung.com/java-bubble-sort)
+- [Bubble Sort in Java](https://www.baeldung.com/java-bubble-sort)
 - [Merge Sort in Java](https://www.baeldung.com/java-merge-sort)
 - [Quicksort Algorithm Implementation in Java](https://www.baeldung.com/java-quicksort)
 - [Insertion Sort in Java](https://www.baeldung.com/java-insertion-sort)

animal-sniffer-mvn-plugin/README.md

@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-[Introduction to Animal Sniffer Maven Plugin](http://www.baeldung.com/maven-animal-sniffer)
+[Introduction to Animal Sniffer Maven Plugin](https://www.baeldung.com/maven-animal-sniffer)

annotations/readme.md

@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [Java Annotation Processing and Creating a Builder](http://www.baeldung.com/java-annotation-processing-builder)
+- [Java Annotation Processing and Creating a Builder](https://www.baeldung.com/java-annotation-processing-builder)

antlr/README.md

@@ -1,3 +1,3 @@
 ### Relevant Articles: 
 
-- [Java with ANTLR](http://www.baeldung.com/java-antlr)
+- [Java with ANTLR](https://www.baeldung.com/java-antlr)

apache-avro/README.md

@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [Guide to Apache Avro](http://www.baeldung.com/java-apache-avro)
+- [Guide to Apache Avro](https://www.baeldung.com/java-apache-avro)

apache-bval/README.md

@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [Intro to Apache BVal](http://www.baeldung.com/apache-bval)
+- [Intro to Apache BVal](https://www.baeldung.com/apache-bval)

apache-curator/README.md

@@ -1,3 +1,3 @@
 ### Relevant Articles:
 
-- [Introduction to Apache Curator](http://www.baeldung.com/apache-curator)
+- [Introduction to Apache Curator](https://www.baeldung.com/apache-curator)

apache-cxf/README.md

@@ -1,6 +1,6 @@
 ## Relevant Articles:
-- [Introduction to Apache CXF Aegis Data Binding](http://www.baeldung.com/aegis-data-binding-in-apache-cxf)
+- [Introduction to Apache CXF Aegis Data Binding](https://www.baeldung.com/aegis-data-binding-in-apache-cxf)
-- [Apache CXF Support for RESTful Web Services](http://www.baeldung.com/apache-cxf-rest-api)
+- [Apache CXF Support for RESTful Web Services](https://www.baeldung.com/apache-cxf-rest-api)
-- [A Guide to Apache CXF with Spring](http://www.baeldung.com/apache-cxf-with-spring)
+- [A Guide to Apache CXF with Spring](https://www.baeldung.com/apache-cxf-with-spring)
-- [Introduction to Apache CXF](http://www.baeldung.com/introduction-to-apache-cxf)
+- [Introduction to Apache CXF](https://www.baeldung.com/introduction-to-apache-cxf)
 - [Server-Sent Events (SSE) In JAX-RS](https://www.baeldung.com/java-ee-jax-rs-sse)

apache-meecrowave/README.md

@@ -1,3 +1,3 @@
 ### Relevant Articles: 
 ================================
-- [Building a Microservice with Apache Meecrowave](http://www.baeldung.com/apache-meecrowave)
+- [Building a Microservice with Apache Meecrowave](https://www.baeldung.com/apache-meecrowave)

apache-opennlp/README.md

@@ -1,3 +1,3 @@
 ### Relevant Articles
 
-- [Intro to Apache OpenNLP](http://www.baeldung.com/apache-open-nlp)
+- [Intro to Apache OpenNLP](https://www.baeldung.com/apache-open-nlp)

apache-poi/README.md

@@ -1,4 +1,4 @@
 ### Relevant Articles:
-- [Microsoft Word Processing in Java with Apache POI](http://www.baeldung.com/java-microsoft-word-with-apache-poi)
+- [Microsoft Word Processing in Java with Apache POI](https://www.baeldung.com/java-microsoft-word-with-apache-poi)
-- [Working with Microsoft Excel in Java](http://www.baeldung.com/java-microsoft-excel)
+- [Working with Microsoft Excel in Java](https://www.baeldung.com/java-microsoft-excel)
-- [Creating a MS PowerPoint Presentation in Java](http://www.baeldung.com/apache-poi-slideshow)
+- [Creating a MS PowerPoint Presentation in Java](https://www.baeldung.com/apache-poi-slideshow)

apache-shiro/README.md

@@ -1,2 +1,2 @@
 ### Relevant articles
-- [Introduction to Apache Shiro](http://www.baeldung.com/apache-shiro)
+- [Introduction to Apache Shiro](https://www.baeldung.com/apache-shiro)

apache-solrj/README.md

@@ -1,4 +1,4 @@
 ## Apache Solrj Tutorials Project
 
 ### Relevant Articles
-- [Guide to Solr in Java with Apache Solrj](http://www.baeldung.com/apache-solrj)
+- [Guide to Solr in Java with Apache Solrj](https://www.baeldung.com/apache-solrj)

apache-spark/README.md

@@ -1,4 +1,4 @@
 ### Relevant articles
 
-- [Introduction to Apache Spark](http://www.baeldung.com/apache-spark)
+- [Introduction to Apache Spark](https://www.baeldung.com/apache-spark)
 - [Building a Data Pipeline with Kafka, Spark Streaming and Cassandra](https://www.baeldung.com/kafka-spark-data-pipeline)

apache-thrift/README.md

@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-- [Working with Apache Thrift](http://www.baeldung.com/apache-thrift)
+- [Working with Apache Thrift](https://www.baeldung.com/apache-thrift)

apache-tika/README.md

@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-- [Content Analysis with Apache Tika](http://www.baeldung.com/apache-tika)
+- [Content Analysis with Apache Tika](https://www.baeldung.com/apache-tika)

apache-velocity/README.md

@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-- [Introduction to Apache Velocity](http://www.baeldung.com/apache-velocity)
+- [Introduction to Apache Velocity](https://www.baeldung.com/apache-velocity)

apache-zookeeper/README.md

@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-- [Getting Started with Java and Zookeeper](http://www.baeldung.com/java-zookeeper)
+- [Getting Started with Java and Zookeeper](https://www.baeldung.com/java-zookeeper)

asciidoctor/README.md

@@ -1,4 +1,4 @@
 ### Relevant articles
 
-- [Generating a Book with Asciidoctor](http://www.baeldung.com/asciidoctor-book)
+- [Generating a Book with Asciidoctor](https://www.baeldung.com/asciidoctor-book)
-- [Introduction to Asciidoctor in Java](http://www.baeldung.com/asciidoctor)
+- [Introduction to Asciidoctor in Java](https://www.baeldung.com/asciidoctor)

asm/README.md

@@ -1,3 +1,3 @@
 ### Relevant Articles:
 
-- [A Guide to Java Bytecode Manipulation with ASM](http://www.baeldung.com/java-asm)
+- [A Guide to Java Bytecode Manipulation with ASM](https://www.baeldung.com/java-asm)

atomix/README.md

@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-- [Introduction to Atomix](http://www.baeldung.com/atomix)
+- [Introduction to Atomix](https://www.baeldung.com/atomix)

autovalue/README.md

@@ -1,4 +1,4 @@
 ### Relevant Articles:
-- [Introduction to AutoValue](http://www.baeldung.com/introduction-to-autovalue)
+- [Introduction to AutoValue](https://www.baeldung.com/introduction-to-autovalue)
-- [Introduction to AutoFactory](http://www.baeldung.com/autofactory)
+- [Introduction to AutoFactory](https://www.baeldung.com/autofactory)
 - [Google AutoService](https://www.baeldung.com/google-autoservice)

aws-lambda/README.md

@@ -1,3 +1,3 @@
 ### Relevant Articles: 
-- [Using AWS Lambda with API Gateway](http://www.baeldung.com/aws-lambda-api-gateway)
+- [Using AWS Lambda with API Gateway](https://www.baeldung.com/aws-lambda-api-gateway)
-- [Introduction to AWS Serverless Application Model](http://www.baeldung.com/aws-serverless)
+- [Introduction to AWS Serverless Application Model](https://www.baeldung.com/aws-serverless)

aws/README.md

@@ -1,11 +1,11 @@
 ### Relevant articles
 
-- [AWS Lambda Using DynamoDB With Java](http://www.baeldung.com/aws-lambda-dynamodb-java)
+- [AWS Lambda Using DynamoDB With Java](https://www.baeldung.com/aws-lambda-dynamodb-java)
-- [AWS S3 with Java](http://www.baeldung.com/aws-s3-java)
+- [AWS S3 with Java](https://www.baeldung.com/aws-s3-java)
-- [AWS Lambda With Java](http://www.baeldung.com/java-aws-lambda)
+- [AWS Lambda With Java](https://www.baeldung.com/java-aws-lambda)
-- [Managing EC2 Instances in Java](http://www.baeldung.com/ec2-java)
+- [Managing EC2 Instances in Java](https://www.baeldung.com/ec2-java)
-- [Multipart Uploads in Amazon S3 with Java](http://www.baeldung.com/aws-s3-multipart-upload)
+- [Multipart Uploads in Amazon S3 with Java](https://www.baeldung.com/aws-s3-multipart-upload)
-- [Integration Testing with a Local DynamoDB Instance](http://www.baeldung.com/dynamodb-local-integration-tests)
+- [Integration Testing with a Local DynamoDB Instance](https://www.baeldung.com/dynamodb-local-integration-tests)
-- [Using the JetS3t Java Client With Amazon S3](http://www.baeldung.com/jets3t-amazon-s3)
+- [Using the JetS3t Java Client With Amazon S3](https://www.baeldung.com/jets3t-amazon-s3)
-- [Managing Amazon SQS Queues in Java](http://www.baeldung.com/aws-queues-java)
+- [Managing Amazon SQS Queues in Java](https://www.baeldung.com/aws-queues-java)
 - [Guide to AWS Aurora RDS with Java](https://www.baeldung.com/aws-aurora-rds-java)

axon/README.md

@@ -1,3 +1,3 @@
 ### Relevant articles
 
-- [A Guide to the Axon Framework](http://www.baeldung.com/axon-cqrs-event-sourcing)
+- [A Guide to the Axon Framework](https://www.baeldung.com/axon-cqrs-event-sourcing)

azure/README.md

@@ -1,4 +1,4 @@
 ### Relevant Articles:
 
-- [Deploy a Spring Boot App to Azure](http://www.baeldung.com/spring-boot-azure)
+- [Deploy a Spring Boot App to Azure](https://www.baeldung.com/spring-boot-azure)
 

blade/README.md

@@ -1,5 +1,5 @@
 ### Relevant Articles: 
 
-- [Blade – A Complete Guidebook](http://www.baeldung.com/blade) 
+- [Blade – A Complete Guidebook](https://www.baeldung.com/blade) 
 
 Run Integration Tests with `mvn integration-test`

bootique/README.md

@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [Introduction to Bootique](http://www.baeldung.com/bootique)
+- [Introduction to Bootique](https://www.baeldung.com/bootique)

cdi/README.md

@@ -1,5 +1,5 @@
 ### Relevant Articles:
-- [CDI Interceptor vs Spring AspectJ](http://www.baeldung.com/cdi-interceptor-vs-spring-aspectj)
+- [CDI Interceptor vs Spring AspectJ](https://www.baeldung.com/cdi-interceptor-vs-spring-aspectj)
-- [An Introduction to CDI (Contexts and Dependency Injection) in Java](http://www.baeldung.com/java-ee-cdi)
+- [An Introduction to CDI (Contexts and Dependency Injection) in Java](https://www.baeldung.com/java-ee-cdi)
 - [Introduction to the Event Notification Model in CDI 2.0](https://www.baeldung.com/cdi-event-notification)
 

checker-plugin/README.md

@@ -1,3 +1,3 @@
 ### Relevant articles
 
-- [The Checker Framework – Pluggable Type Systems for Java](http://www.baeldung.com/checker-framework)
+- [The Checker Framework – Pluggable Type Systems for Java](https://www.baeldung.com/checker-framework)

core-groovy-2/README.md

@@ -2,7 +2,6 @@
 
 ## Relevant articles:
 
-- [String Matching in Groovy](http://www.baeldung.com/)
 - [Template Engines in Groovy](https://www.baeldung.com/groovy-template-engines)
 - [Groovy def Keyword](https://www.baeldung.com/groovy-def-keyword)
 - [Pattern Matching in Strings in Groovy](https://www.baeldung.com/groovy-pattern-matching)

core-groovy/README.md

@@ -2,8 +2,8 @@
 
 ## Relevant articles:
 
-- [JDBC with Groovy](http://www.baeldung.com/jdbc-groovy)
+- [JDBC with Groovy](https://www.baeldung.com/jdbc-groovy)
-- [Working with JSON in Groovy](http://www.baeldung.com/groovy-json)
+- [Working with JSON in Groovy](https://www.baeldung.com/groovy-json)
 - [Reading a File in Groovy](https://www.baeldung.com/groovy-file-read)
 - [Types of Strings in Groovy](https://www.baeldung.com/groovy-strings)
 - [A Quick Guide to Iterating a Map in Groovy](https://www.baeldung.com/groovy-map-iterating)

core-java-modules/core-java-datetime-computations/README.md

@@ -13,4 +13,3 @@ This module contains articles about date and time computations in Java.
 - [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)
 - [Introduction to Joda-Time](http://www.baeldung.com/joda-time)
-- [Measure Elapsed Time in Java](http://www.baeldung.com/java-measure-elapsed-time)

core-java-modules/core-java-datetime-computations/pom.xml

@@ -1,16 +1,16 @@
 <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-computations</artifactId>
+    <artifactId>core-java-datetime-computations</artifactId>
     <version>${project.parent.version}</version>
-    <name>java-dates-computations</name>
+    <name>core-java-datetime-computations</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>
@@ -40,7 +40,7 @@
     </dependencies>
 
     <build>
-        <finalName>java-dates-computations</finalName>
+        <finalName>core-java-datetime-computations</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

core-java-modules/core-java-datetime-conversion/pom.xml

@@ -1,16 +1,16 @@
 <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-conversion</artifactId>
+    <artifactId>core-java-datetime-conversion</artifactId>
     <version>${project.parent.version}</version>
-    <name>java-dates-conversion</name>
+    <name>core-java-datetime-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-conversion</finalName>
+        <finalName>core-java-datetime-conversion</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

core-java-modules/core-java-datetime-java8/pom.xml

@@ -1,16 +1,16 @@
 <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-java8</artifactId>
+    <artifactId>core-java-datetime-java8</artifactId>
     <version>${project.parent.version}</version>
-    <name>java-dates-java8</name>
+    <name>core-java-datetime-java8</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-java8</finalName>
+        <finalName>core-java-datetime-java8</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>