Merge branch 'master' of https://github.com/Maiklins/tutorials into BAEL-20598-Fix-unit-test-in-core-java-jndi-module

Conflicts: core-java-modules/core-java-jndi/pom.xml
2020-01-22 08:52:27 +01:00
parent b0c3152a9c e37bfa6336
commit dd76d3d221
53 changed files with 1187 additions and 483 deletions
@@ -9,10 +9,9 @@
    <name>core-java-jndi</name>

    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
    </parent>

    <dependencies>
@@ -22,6 +21,12 @@
            <version>${jupiter.version}</version>
            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.5.1</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter-api</artifactId>