From dc9b1354171f75cd60474040ae76029e1a14106c Mon Sep 17 00:00:00 2001 From: amit2103 Date: Sat, 20 Oct 2018 15:22:59 +0530 Subject: [PATCH 1/3] [BAEL-9517] - Upgraded parent-spring-4 to the latest version of Spring 4.3.20 --- parent-spring-4/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent-spring-4/pom.xml b/parent-spring-4/pom.xml index d1b1298013..9b3c42599b 100644 --- a/parent-spring-4/pom.xml +++ b/parent-spring-4/pom.xml @@ -29,7 +29,7 @@ - 4.3.17.RELEASE + 4.3.20.RELEASE 5.0.2 From d639ab24957ec7f796c43d7578f5b1b866760712 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Sat, 20 Oct 2018 15:10:00 +0300 Subject: [PATCH 2/3] Update README.md --- java-collections-maps/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-collections-maps/README.md b/java-collections-maps/README.md index 4883e0e1b6..ca7fee1d21 100644 --- a/java-collections-maps/README.md +++ b/java-collections-maps/README.md @@ -14,4 +14,5 @@ - [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap) - [Get the Key for a Value from a Java Map](https://www.baeldung.com/java-map-key-from-value) - [Sort a HashMap in Java](https://www.baeldung.com/java-hashmap-sort) -- [Finding the Highest Value in a Java Map](https://www.baeldung.com/java-find-map-max) \ No newline at end of file +- [Finding the Highest Value in a Java Map](https://www.baeldung.com/java-find-map-max) +- [Merging Two Maps with Java 8](https://www.baeldung.com/java-merge-maps) From 6be1833b3d54b296bc053109f9c78f6de926ab44 Mon Sep 17 00:00:00 2001 From: amit2103 Date: Sat, 20 Oct 2018 23:11:32 +0530 Subject: [PATCH 3/3] [BAEL-9550] - Moved GuavaBiMapUnitTest from core-java to java-collections-map module --- .../src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {core-java => java-collections-maps}/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java (100%) diff --git a/core-java/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java b/java-collections-maps/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java similarity index 100% rename from core-java/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java rename to java-collections-maps/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java