diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 712cdcc50a..84dcfc60e9 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,53 +6,58 @@ - - - - - + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - diff --git a/.idea/encodings.xml b/.idea/encodings.xml index d2d873b49d..1c11104ab2 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,18 @@ + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 452ef651af..11297efc82 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,10 +4,12 @@ - + + + - - + + - - - @@ -364,7 +380,8 @@ - diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 1a0497c41b..5fc323c761 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -17,8 +17,26 @@ core-java-8 core-java-annotations + core-java-collections-list core-java-datetime-conversion core-java-io + + + + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + test + + + + diff --git a/pom.xml b/pom.xml index debd338547..810bc0ac96 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ + core-java-modules jackson-modules jackson-simple parent-java @@ -62,6 +63,8 @@ 2.8.0 2.6 3.12.0 + 4.4 + 3.6.1 1.4 3.0.0 @@ -268,6 +271,12 @@ ${junit5.version} test + + org.assertj + assertj-core + ${assertj.version} + test + org.hamcrest hamcrest