[BAEL-14774] - Fixed conflicts and replaced hsql with h2

algorithms-miscellaneous-1/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.github.dpaukov</groupId>
             <artifactId>combinatoricslib3</artifactId>
-            <version>3.3.0</version>
+            <version>${combinatoricslib3.version}</version>
          </dependency>
     </dependencies>
 
@@ -83,6 +83,7 @@
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
         <guava.version>27.0.1-jre</guava.version>
+        <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
     </properties>
 
 </project>

algorithms-miscellaneous-3/README.md

@@ -5,3 +5,5 @@
 - [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
 - [Practical Java Examples of the Big O Notation](http://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](https://www.baeldung.com/folding-hashing-technique)

apache-avro/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

autovalue/README.md

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

core-groovy-2/README.md

@@ -6,4 +6,5 @@
 - [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)
-- [Working with XML in Groovy](https://www.baeldung.com/groovy-xml)
+- [Working with XML in Groovy](https://www.baeldung.com/groovy-xml)
+- [Integrating Groovy into Java Applications](https://www.baeldung.com/groovy-java-applications)

core-java-modules/README.md

@@ -3,3 +3,4 @@
 - [Multi-Module Maven Application with Java Modules](https://www.baeldung.com/maven-multi-module-project-java-jpms)
 - [Guide to Java FileChannel](https://www.baeldung.com/java-filechannel)
 - [Understanding the NumberFormatException in Java](https://www.baeldung.com/java-number-format-exception)
+- [Will an Error Be Caught by Catch Block in Java?](https://www.baeldung.com/java-error-catch)

core-java-modules/core-java-10/README.md

@@ -5,3 +5,4 @@
 - [Guide to Java 10](http://www.baeldung.com/java-10-overview)
 - [Copy a List to Another List in Java](http://www.baeldung.com/java-copy-list-to-another)
 - [Deep Dive Into the New Java JIT Compiler – Graal](https://www.baeldung.com/graal-java-jit-compiler)
+- [Copying Sets in Java](https://www.baeldung.com/java-copy-sets)

core-java-modules/core-java-8-2/README.md

@@ -6,3 +6,4 @@
 - [Anonymous Classes in Java](http://www.baeldung.com/)
 - [How to Delay Code Execution in Java](https://www.baeldung.com/java-delay-code-execution)
 - [Run JAR Application With Command Line Arguments](https://www.baeldung.com/java-run-jar-with-arguments)
+- [Java 8 Stream skip() vs limit()](https://www.baeldung.com/java-stream-skip-vs-limit)

core-java-modules/core-java-8/README.md

@@ -40,3 +40,4 @@
 - [Java 8 Predicate Chain](https://www.baeldung.com/java-predicate-chain)
 - [Method References in Java](https://www.baeldung.com/java-method-references)
 - [Creating a Custom Annotation in Java](https://www.baeldung.com/java-custom-annotation)
+- [The Difference Between Collection.stream().forEach() and Collection.forEach()](https://www.baeldung.com/java-collection-stream-foreach)

core-java-modules/core-java-collections-set/README.md

@@ -10,3 +10,4 @@
 - [Initializing HashSet at the Time of Construction](http://www.baeldung.com/java-initialize-hashset)
 - [Guide to EnumSet](https://www.baeldung.com/java-enumset)
 - [Set Operations in Java](https://www.baeldung.com/java-set-operations)
+- [Copying Sets in Java](https://www.baeldung.com/java-copy-sets)

core-java-modules/core-java-collections-set/pom.xml

@@ -27,17 +27,18 @@
     <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
-        <version>2.8.5</version>
+        <version>${gson.version}</version>
     </dependency>
     <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
+        <version>${commons-lang.version}</version>
     </dependency>
     </dependencies>
 
     <properties>
         <commons-collections4.version>4.3</commons-collections4.version>
         <guava.version>27.1-jre</guava.version>
+        <gson.version>2.8.5</gson.version>
     </properties>
 </project>

core-java-modules/core-java-exceptions/pom.xml

@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

core-java-modules/core-java-lang-oop-2/README.md

@@ -6,3 +6,4 @@
 - [Generic Constructors in Java](https://www.baeldung.com/java-generic-constructors)
 - [Cannot Reference “X” Before Supertype Constructor Has Been Called](https://www.baeldung.com/java-cannot-reference-x-before-supertype-constructor-error)
 - [Anonymous Classes in Java](https://www.baeldung.com/java-anonymous-classes)
+- [Raw Types in Java](https://www.baeldung.com/raw-types-java)

core-java-modules/core-java-nio/README.md

@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-- [Determine File Creating Date in Java](https://www.baeldung.com/file-creation-date-java)
+- [Determine File Creating Date in Java](https://www.baeldung.com/java-file-creation-date)

core-java-modules/core-java-optional/README.md

@@ -2,4 +2,5 @@
 
 ## Core Java Optional
 
-### Relevant Articles: 
+### Relevant Articles: 
+- [Java Optional as Return Type](https://www.baeldung.com/java-optional-return)

core-java-modules/multimodulemavenproject/pom.xml

@@ -19,13 +19,13 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.12</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.12.2</version>
+                <version>${assertj-core.version}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
@@ -58,5 +58,6 @@
     
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <assertj-core.version>3.12.2</assertj-core.version>
     </properties>
 </project>

core-java-modules/pre-jpms/pom.xml

@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
+			<version>${org.slf4j.version}</version>
 		</dependency>
 	</dependencies>
 	<build>

jackson-2/README.md

@@ -9,4 +9,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Mapping Multiple JSON Fields to a Single Java Field](https://www.baeldung.com/json-multiple-fields-single-java-field)
 - [How to Process YAML with Jackson](https://www.baeldung.com/jackson-yaml)
 - [Working with Tree Model Nodes in Jackson](https://www.baeldung.com/jackson-json-node-tree-model)
-
+- [Converting JSON to CSV in Java](https://www.baeldung.com/java-converting-json-to-csv)

jackson-2/pom.xml

@@ -26,21 +26,21 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>
         
         <!-- CSV -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>        
 
         <!-- Allow use of LocalDate -->
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>
 
 

java-collections-conversions/README.md

@@ -10,4 +10,7 @@
 - [Converting a List to String in Java](http://www.baeldung.com/java-list-to-string)
 - [How to Convert List to Map in Java](http://www.baeldung.com/java-list-to-map)
 - [Array to String Conversions](https://www.baeldung.com/java-array-to-string)
-- [Converting a Collection to ArrayList in Java](https://www.baeldung.com/java-convert-collection-arraylist)
+- [Converting a Collection to ArrayList in Java](https://www.baeldung.com/java-convert-collection-arraylist)
+- [Java 8 Collectors toMap](https://www.baeldung.com/java-collectors-tomap)
+- [Converting Iterable to Collection in Java](https://www.baeldung.com/java-iterable-to-collection)
+- [Converting Iterator to List](https://www.baeldung.com/java-convert-iterator-to-list)

java-collections-conversions/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.java.collections;
+package com.baeldung.java.collections;
 
 import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.assertThat;

java-dates-2/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.6</version>
+            <version>${commons-validator.version}</version>
         </dependency>
 
         <!-- test scoped -->
@@ -63,6 +63,7 @@
         <!-- 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.target>1.9</maven.compiler.target>
     </properties>

java-math/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.github.dpaukov</groupId>
             <artifactId>combinatoricslib3</artifactId>
-            <version>3.3.0</version>
+            <version>${combinatoricslib3.version}</version>
          </dependency>
     </dependencies>
 
@@ -63,6 +63,7 @@
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
         <guava.version>27.0.1-jre</guava.version>
+        <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
     </properties>
 
 </project>

java-streams-2/README.md

@@ -1,3 +1,4 @@
 ### Relevant Articles:
 - [Guide to Stream.reduce()](https://www.baeldung.com/java-stream-reduce)
-
+- [How to Break from Java Stream forEach](https://www.baeldung.com/java-break-stream-foreach)
+- [Java IntStream Conversions](https://www.baeldung.com/java-intstream-convert)

kotlin-quasar/README.md

@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Introduction to Quasar in Kotlin](https://www.baeldung.com/kotlin-quasar)

libraries-2/README.md

@@ -5,3 +5,6 @@
 - [Guide to Classgraph Library](https://www.baeldung.com/classgraph)
 - [Create a Java Command Line Program with Picocli](https://www.baeldung.com/java-picocli-create-command-line-program)
 - [Guide to Java Parallel Collectors Library](https://www.baeldung.com/java-parallel-collectors)
+- [Templating with Handlebars](https://www.baeldung.com/handlebars)
+- [A Guide to Crawler4j](https://www.baeldung.com/crawler4j)
+- [Decode an OkHttp JSON Response](https://www.baeldung.com/okhttp-json-response)

libraries-2/pom.xml

@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.pivovarit</groupId>
             <artifactId>parallel-collectors</artifactId>
-            <version>1.1.0</version>
+            <version>${parallel-collectors.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -96,22 +96,22 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.14.2</version>
+            <version>${okhttp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.9</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>3.14.2</version>
+            <version>${mockwebserver.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>com.github.jknack</groupId>
             <artifactId>handlebars</artifactId>
-            <version>4.1.2</version>
+            <version>${handlebars.version}</version>
         </dependency>
         <!-- Benchmarking -->
         <dependency>
@@ -156,5 +156,10 @@
         <la4j.version>0.6.0</la4j.version>
         <jmh.version>1.19</jmh.version>
         <mesos.library.version>0.28.3</mesos.library.version>
+        <parallel-collectors.version>1.1.0</parallel-collectors.version>
+        <okhttp.version>3.14.2</okhttp.version>
+        <gson.version>2.8.5</gson.version>
+        <mockwebserver.version>3.14.2</mockwebserver.version>
+        <handlebars.version>4.1.2</handlebars.version>
     </properties>
 </project>

libraries-http/README.md

@@ -0,0 +1,7 @@
+
+### Relevant Articles: 
+
+- [A Guide to OkHttp](http://www.baeldung.com/guide-to-okhttp)
+- [A Guide to Google-Http-Client](http://www.baeldung.com/google-http-client)
+- [Asynchronous HTTP with async-http-client in Java](http://www.baeldung.com/async-http-client)
+- [WebSockets with AsyncHttpClient](http://www.baeldung.com/async-http-client-websockets)

libraries-http/pom.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>libraries-http</artifactId>
+	<name>libraries-http</name>
+
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-modules</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj.version}</version>
+		</dependency>
+
+		<!-- Dependencies for response decoder with okhttp -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+            <version>${com.squareup.okhttp3.version}</version>
+		</dependency>
+
+        <!-- Dependencies for google http client -->
+        <dependency>
+            <groupId>com.google.http-client</groupId>
+            <artifactId>google-http-client</artifactId>
+            <version>${googleclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.http-client</groupId>
+            <artifactId>google-http-client-jackson2</artifactId>
+            <version>${googleclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.http-client</groupId>
+            <artifactId>google-http-client-gson</artifactId>
+            <version>${googleclient.version}</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.asynchttpclient/async-http-client -->
+        <dependency>
+            <groupId>org.asynchttpclient</groupId>
+            <artifactId>async-http-client</artifactId>
+            <version>${async.http.client.version}</version>
+        </dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.5</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>mockwebserver</artifactId>
+            <version>${com.squareup.okhttp3.version}</version>
+			<scope>test</scope>
+		</dependency>
+          
+	</dependencies>
+
+	<properties>
+		<assertj.version>3.6.2</assertj.version>
+        <com.squareup.okhttp3.version>3.14.2</com.squareup.okhttp3.version>
+        <googleclient.version>1.23.0</googleclient.version>
+        <async.http.client.version>2.2.0</async.http.client.version>
+	</properties>
+</project>