42 files changed, 429 insertions, 348 deletions

diff --git a/Changelog.md b/Changelog.md
index 8bf5b52..d0f5b78 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -104,3 +104,7 @@ All notable changes to this project will be documented in this file.
     - https://jira.onap.org/browse/VNFSDK-660
 
 ## [1.2.15]
+
+## Move
+- Extract pm-dictionary validation to separate module
+    - https://jira.onap.org/browse/VNFSDK-713
diff --git a/csarvalidation/pom.xml b/csarvalidation/pom.xml
index 729c82d..3444935 100644
--- a/csarvalidation/pom.xml
+++ b/csarvalidation/pom.xml
@@ -106,6 +106,11 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.onap.vnfsdk.validation</groupId>
+      <artifactId>validation-pmdictionary</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.14</version>
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/YamlFileValidatorTest.java b/csarvalidation/src/test/java/org/onap/validation/yaml/YamlFileValidatorTest.java
deleted file mode 100644
index f89cc68..0000000
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/YamlFileValidatorTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2020 Nokia
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.onap.validation.yaml;
-
-import org.assertj.core.util.Lists;
-import org.junit.Test;
-import org.onap.validation.yaml.error.YamlDocumentValidationError;
-import org.onap.validation.yaml.exception.YamlProcessingException;
-import org.yaml.snakeyaml.parser.ParserException;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-public class YamlFileValidatorTest {
-
-    @Test
-    public void shouldReturnCorrectErrorsWhenGivenPathToValidPmDictionaryFile() throws YamlProcessingException {
-        // given
-        String path = getFullPathForGivenResources(YamlLoadingUtils.PATH_TO_VALID_YAML);
-
-        // when
-        List<YamlDocumentValidationError> validationErrors =
-            new YamlFileValidator().validateYamlFileWithSchema(path);
-
-        // then
-        assertValidationReturnedExpectedErrors(validationErrors);
-
-    }
-
-    @Test
-    public void shouldReturnCorrecErrorsWhenGivenPathToValidJsonStylePmDictionaryFile() throws YamlProcessingException {
-        // given
-        String path = getFullPathForGivenResources(YamlLoadingUtils.PATH_TO_VALID_JSON_STYLE_YAML);
-
-        // when
-        List<YamlDocumentValidationError> validationErrors =
-            new YamlFileValidator().validateYamlFileWithSchema(path);
-
-        // then
-        assertValidationReturnedExpectedErrors(validationErrors);
-    }
-
-
-    private void assertValidationReturnedExpectedErrors(List<YamlDocumentValidationError> validationErrors) {
-        assertThat(validationErrors).isNotNull();
-        assertThat(validationErrors).hasSize(4);
-        assertThat(validationErrors).usingRecursiveFieldByFieldElementComparator().containsAll(
-            Lists.list(
-                new YamlDocumentValidationError(1,
-                    "/pmMetaData/pmFields/measResultType",
-                    "Value(s) is/are not in array of accepted values.\n" +
-                        " value(s):  integer\n" +
-                        "  accepted value(s):  [float, uint32, uint64]"),
-                new YamlDocumentValidationError(1,
-                    "/pmMetaData/pmFields/",
-                    "Key not found: measChangeType"),
-                new YamlDocumentValidationError(2,
-                    "/pmMetaData/pmFields/",
-                    "Key not found: measChangeType"),
-                new YamlDocumentValidationError(3,
-                    "/pmMetaData/pmFields/measAdditionalFields/vendorField1",
-                    "Value(s) is/are not in array of accepted values.\n" +
-                        " value(s):  [Z, A]\n" +
-                        "  accepted value(s):  [X, Y, Z]")
-            )
-        );
-    }
-    @Test
-    public void shouldThrowErrorWhenGivenPathToInvalidPmDictionaryFile() {
-        // given
-        String path = getFullPathForGivenResources(YamlLoadingUtils.PATH_TO_MULTI_DOCUMENT_INVALID_YAML);
-        // when  then
-        assertThatThrownBy(() ->
-            new YamlFileValidator().validateYamlFileWithSchema(path)
-        ).isInstanceOf(ParserException.class)
-            .hasMessageContaining(
-                "expected the node content, but found '<document end>'"
-            );
-    }
-
-    @Test
-    public void shouldThrowErrorWhenGivenInvalidPath() {
-        // given
-        String path ="invalid/path/to/pm_dictionary";
-
-        // when  then
-        assertThatThrownBy(() ->
-            new YamlFileValidator().validateYamlFileWithSchema(path)
-        ).isInstanceOf(YamlProcessingException.class)
-            .hasMessageContaining(
-                "PM_Dictionary YAML file is empty"
-            );
-    }
-
-    private String getFullPathForGivenResources(String pathToValidYaml) {
-        return this.getClass().getClassLoader().getResource(
-            pathToValidYaml
-        ).getPath();
-    }
-}
diff --git a/pmdictionaryvalidation/pom.xml b/pmdictionaryvalidation/pom.xml
new file mode 100644
index 0000000..3822057
--- /dev/null
+++ b/pmdictionaryvalidation/pom.xml
@@ -0,0 +1,71 @@
+<?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">
+    <parent>
+        <groupId>org.onap.vnfsdk.validation</groupId>
+        <artifactId>validation</artifactId>
+        <version>1.2.15-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>validation-pmdictionary</artifactId>
+    <packaging>jar</packaging>
+    <name>pmdictionaryvalidation/validation</name>
+
+    <repositories>
+        <repository>
+            <id>google-collections</id>
+            <name>Google collections repository</name>
+            <url>https://mvnrepository.com/artifact/com.google.collections/google-collections</url>
+        </repository>
+        <repository>
+            <id>onap</id>
+            <name>ONAP repository</name>
+            <url>https://nexus.onap.org/content/repositories/public/</url>
+        </repository>
+    </repositories>
+    <properties>
+        <log4j-slf4j-impl.version>2.13.3</log4j-slf4j-impl.version>
+        <snakeyaml.version>1.26</snakeyaml.version>
+        <junit.version>5.7.0</junit.version>
+        <assertj-core.version>3.18.1</assertj-core.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j-slf4j-impl.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-ext</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+        </dependency>
+        <!-- TEST dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/YamlFileValidator.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlFileValidator.java
index 2de4f48..2de4f48 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/YamlFileValidator.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlFileValidator.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/YamlLoader.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlLoader.java
index 1a5eef9..1a5eef9 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/YamlLoader.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlLoader.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/YamlValidator.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlValidator.java
index 9430df4..30ba646 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/YamlValidator.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlValidator.java
@@ -17,8 +17,8 @@
 
 package org.onap.validation.yaml;
 
-import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.error.SchemaValidationError;
+import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.model.YamlDocument;
 import org.onap.validation.yaml.process.YamlValidationProcess;
 import org.onap.validation.yaml.schema.YamlSchema;
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/error/SchemaValidationError.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/error/SchemaValidationError.java
index 6ffe6d4..6ffe6d4 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/error/SchemaValidationError.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/error/SchemaValidationError.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/error/YamlDocumentValidationError.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/error/YamlDocumentValidationError.java
index f04708f..f04708f 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/error/YamlDocumentValidationError.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/error/YamlDocumentValidationError.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/exception/YamlProcessingException.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/exception/YamlProcessingException.java
index 99c2437..99c2437 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/exception/YamlProcessingException.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/exception/YamlProcessingException.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocument.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocument.java
index 557b6fd..557b6fd 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocument.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocument.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocumentFactory.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocumentFactory.java
index b56422c..b56422c 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocumentFactory.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocumentFactory.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/model/YamlParameterListFactory.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParameterListFactory.java
index 5f41c5c..5f41c5c 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/model/YamlParameterListFactory.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParameterListFactory.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/model/YamlParametersList.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParametersList.java
index 2b93c74..2b93c74 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/model/YamlParametersList.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParametersList.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationProcess.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationProcess.java
index 273014b..ebd37ce 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationProcess.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationProcess.java
@@ -17,8 +17,8 @@
 
 package org.onap.validation.yaml.process;
 
-import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.error.SchemaValidationError;
+import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.model.YamlDocument;
 import org.onap.validation.yaml.schema.YamlSchema;
 import org.onap.validation.yaml.schema.node.YamlSchemaNode;
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationStep.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationStep.java
index eb5ab8e..eb5ab8e 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationStep.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationStep.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchema.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchema.java
index 69bb6cd..69bb6cd 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchema.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchema.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchemaFactory.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchemaFactory.java
index df7d673..df7d673 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchemaFactory.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchemaFactory.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaBranchNode.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaBranchNode.java
index 0f5b480..0f5b480 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaBranchNode.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaBranchNode.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaLeafNode.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaLeafNode.java
index c98f41e..c98f41e 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaLeafNode.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaLeafNode.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNode.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNode.java
index 28913a2..28913a2 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNode.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNode.java
diff --git a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactory.java b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactory.java
index 79a8f14..79a8f14 100644
--- a/csarvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactory.java
+++ b/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactory.java
diff --git a/pmdictionaryvalidation/src/main/resources/log4j2.properties b/pmdictionaryvalidation/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..f3202ee
--- /dev/null
+++ b/pmdictionaryvalidation/src/main/resources/log4j2.properties
@@ -0,0 +1,48 @@
+# Copyright Nokia 2020,2020 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# By default, log4j2 will look for a configuration file named log4j2.xml on the classpath.
+# reference: https://logging.apache.org/log4j/2.x/faq.html#troubleshooting
+
+rootLogger.level=ERROR
+rootLogger.appenderRefs=file
+rootLogger.appenderRef.file.ref=RollingFile
+
+logger.onap.name = org.onap
+logger.onap.level=ERROR
+logger.onap.additivity=false
+logger.onap.appenderRef.stdout.ref=STDOUT
+
+appenders=stdout, file
+
+# Direct log messages to stdout
+appender.stdout.type=Console
+appender.stdout.name=STDOUT
+appender.stdout.target=SYSTEM_OUT
+appender.stdout.layout.type=PatternLayout
+appender.stdout.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Redirect log messages to a log file, support file rolling.
+appender.file.type = RollingFile
+appender.file.name = RollingFile
+appender.file.fileName=./pmdictionary-validate.log
+appender.file.filePattern=./pmdictionary-validate.%d{yyyy-MM-dd-HH:mm:ss}.log
+appender.file.append=true
+appender.file.policies.type=Policies
+appender.file.policies.size.type=SizeBasedTriggeringPolicy
+appender.file.policies.size.size=5MB
+appender.file.strategy.type=DefaultRolloverStrategy
+appender.file.strategy.max=10
+appender.file.layout.type=PatternLayout
+appender.file.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlFileValidatorTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlFileValidatorTest.java
new file mode 100644
index 0000000..089348d
--- /dev/null
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlFileValidatorTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2020 Nokia
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.onap.validation.yaml;
+
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.Test;
+import org.onap.validation.yaml.error.YamlDocumentValidationError;
+import org.onap.validation.yaml.exception.YamlProcessingException;
+import org.yaml.snakeyaml.parser.ParserException;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class YamlFileValidatorTest {
+
+    @Test
+    void shouldReturnCorrectErrorsWhenGivenPathToValidPmDictionaryFile() throws YamlProcessingException {
+        // given
+        String path = getFullPathForGivenResources(YamlLoadingUtils.PATH_TO_VALID_YAML);
+
+        // when
+        List<YamlDocumentValidationError> validationErrors = new YamlFileValidator().validateYamlFileWithSchema(path);
+
+        // then
+        assertValidationReturnedExpectedErrors(validationErrors);
+
+    }
+
+    @Test
+    void shouldReturnCorrecErrorsWhenGivenPathToValidJsonStylePmDictionaryFile() throws YamlProcessingException {
+        // given
+        String path = getFullPathForGivenResources(YamlLoadingUtils.PATH_TO_VALID_JSON_STYLE_YAML);
+
+        // when
+        List<YamlDocumentValidationError> validationErrors = new YamlFileValidator().validateYamlFileWithSchema(path);
+
+        // then
+        assertValidationReturnedExpectedErrors(validationErrors);
+    }
+
+
+    private void assertValidationReturnedExpectedErrors(List<YamlDocumentValidationError> validationErrors) {
+        assertThat(validationErrors)
+                .isNotNull()
+                .hasSize(4)
+                .usingRecursiveFieldByFieldElementComparator()
+                .containsAll(
+                        Lists.list(
+                                new YamlDocumentValidationError(1,
+                                        "/pmMetaData/pmFields/measResultType",
+                                        "Value(s) is/are not in array of accepted values.\n" +
+                                                " value(s):  integer\n" +
+                                                "  accepted value(s):  [float, uint32, uint64]"),
+                                new YamlDocumentValidationError(1,
+                                        "/pmMetaData/pmFields/",
+                                        "Key not found: measChangeType"),
+                                new YamlDocumentValidationError(2,
+                                        "/pmMetaData/pmFields/",
+                                        "Key not found: measChangeType"),
+                                new YamlDocumentValidationError(3,
+                                        "/pmMetaData/pmFields/measAdditionalFields/vendorField1",
+                                        "Value(s) is/are not in array of accepted values.\n" +
+                                                " value(s):  [Z, A]\n" +
+                                                "  accepted value(s):  [X, Y, Z]")
+                        )
+                );
+    }
+
+    @Test
+    void shouldThrowErrorWhenGivenPathToInvalidPmDictionaryFile() {
+        // given
+        String path = getFullPathForGivenResources(YamlLoadingUtils.PATH_TO_MULTI_DOCUMENT_INVALID_YAML);
+        // when  then
+        assertThatThrownBy(() -> new YamlFileValidator().validateYamlFileWithSchema(path))
+                .isInstanceOf(ParserException.class)
+                .hasMessageContaining("expected the node content, but found '<document end>'");
+    }
+
+    @Test
+    void shouldThrowErrorWhenGivenInvalidPath() {
+        // given
+        String path = "invalid/path/to/pm_dictionary";
+
+        // when  then
+        assertThatThrownBy(() -> new YamlFileValidator().validateYamlFileWithSchema(path))
+                .isInstanceOf(YamlProcessingException.class)
+                .hasMessageContaining("PM_Dictionary YAML file is empty");
+    }
+
+    private String getFullPathForGivenResources(String pathToValidYaml) {
+        return this.getClass().getClassLoader().getResource(pathToValidYaml).getPath();
+    }
+}
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
index 4c68d60..36297ca 100644
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
@@ -17,7 +17,7 @@
 
 package org.onap.validation.yaml;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.model.YamlDocument;
 import org.onap.validation.yaml.model.YamlDocumentFactory;
@@ -30,13 +30,13 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 
-public class YamlLoaderTest {
+class YamlLoaderTest {
 
     private static final int EXPECTED_NUMBER_OF_DOCUMENTS = 5;
     private static final String LETTER_S_WITH_ASCII_CODE = "s(115)";
 
     @Test
-    public void shouldLoadAllDocumentsFromYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException {
+    void shouldLoadAllDocumentsFromYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException {
         // when
         List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFile();
 
@@ -45,7 +45,7 @@ public class YamlLoaderTest {
     }
 
     @Test
-    public void shouldLoadAllDocumentsFromJsonStyleYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException {
+    void shouldLoadAllDocumentsFromJsonStyleYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException {
         // when
         List<YamlDocument> documents = YamlLoadingUtils.loadValidJsonStyleMultiDocumentYamlFile();
 
@@ -54,7 +54,7 @@ public class YamlLoaderTest {
     }
 
     @Test
-    public void shouldLoadAllDocumentsFromYamlFileUsingPathInString() throws YamlProcessingException {
+    void shouldLoadAllDocumentsFromYamlFileUsingPathInString() throws YamlProcessingException {
         // when
         List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFileUsingStringPath();
 
@@ -63,37 +63,34 @@ public class YamlLoaderTest {
     }
 
     @Test
-    public void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFile() {
+    void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFile() {
         // when then
-        assertThatThrownBy(YamlLoadingUtils::tryToLoadMultiDocumentInvalidYamlFile
-        ).isInstanceOf(ParserException.class)
-            .hasMessageContaining("expected the node content, but found '<document end>'");
+        assertThatThrownBy(YamlLoadingUtils::tryToLoadMultiDocumentInvalidYamlFile)
+                .isInstanceOf(ParserException.class)
+                .hasMessageContaining("expected the node content, but found '<document end>'");
     }
 
     @Test
-    public void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFileUsingPathInString() {
+    void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFileUsingPathInString() {
         // when then
-        assertThatThrownBy(YamlLoadingUtils::tryToLoadMultiDocumentInvalidYamlFileUsingStringPath
-        ).isInstanceOf(ParserException.class)
-            .hasMessageContaining("expected the node content, but found '<document end>'");
+        assertThatThrownBy(YamlLoadingUtils::tryToLoadMultiDocumentInvalidYamlFileUsingStringPath)
+                .isInstanceOf(ParserException.class)
+                .hasMessageContaining("expected the node content, but found '<document end>'");
     }
 
-
     @Test
-    public void shouldThrowExceptionWhenLoadingInvalidYamlFileWithIncorrectKeyMapping() {
+    void shouldThrowExceptionWhenLoadingInvalidYamlFileWithIncorrectKeyMapping() {
         // when then
-        assertThatThrownBy(YamlLoadingUtils::tryToLoadInvalidYamlFileWithIncorrectKeyMapping
-        ).isInstanceOf(ScannerException.class)
-            .hasMessageContaining("mapping values are not allowed here");
+        assertThatThrownBy(YamlLoadingUtils::tryToLoadInvalidYamlFileWithIncorrectKeyMapping)
+                .isInstanceOf(ScannerException.class)
+                .hasMessageContaining("mapping values are not allowed here");
     }
 
-
     @Test
-    public void shouldThrowExceptionWhenLoadingInvalidYamlFileWithUnknownEscapeCharacter() {
+    void shouldThrowExceptionWhenLoadingInvalidYamlFileWithUnknownEscapeCharacter() {
         // when then
-        assertThatThrownBy(YamlLoadingUtils::tryToLoadInvalidYamlFileWithUnknownEscapeCharacter
-        ).isInstanceOf(ScannerException.class)
-            .hasMessageContaining("found unknown escape character " + LETTER_S_WITH_ASCII_CODE);
+        assertThatThrownBy(YamlLoadingUtils::tryToLoadInvalidYamlFileWithUnknownEscapeCharacter)
+                .isInstanceOf(ScannerException.class)
+                .hasMessageContaining("found unknown escape character " + LETTER_S_WITH_ASCII_CODE);
     }
-
 }
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/YamlLoadingUtils.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoadingUtils.java
index 8d03910..b65029f 100644
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/YamlLoadingUtils.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoadingUtils.java
@@ -27,7 +27,7 @@ import static org.onap.validation.yaml.model.YamlDocumentFactory.YamlDocumentPar
 
 public final class YamlLoadingUtils {
 
-    private YamlLoadingUtils() {}
+    private YamlLoadingUtils() { }
 
     public static final int VALID_YAML_DOCUMENT_INDEX = 4;
     public static final int YAML_DOCUMENT_WITH_WRONG_VALUE_IN_ARRAY_INDEX = 3;
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/YamlValidatorTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlValidatorTest.java
index efe9d69..3f64540 100644
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/YamlValidatorTest.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlValidatorTest.java
@@ -18,9 +18,9 @@
 package org.onap.validation.yaml;
 
 import org.assertj.core.util.Lists;
-import org.junit.Test;
-import org.onap.validation.yaml.exception.YamlProcessingException;
+import org.junit.jupiter.api.Test;
 import org.onap.validation.yaml.error.SchemaValidationError;
+import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.model.YamlDocument;
 import org.onap.validation.yaml.schema.YamlSchemaFactory;
 
@@ -30,24 +30,23 @@ import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.onap.validation.yaml.YamlLoadingUtils.VALID_YAML_DOCUMENT_INDEX;
-import static org.onap.validation.yaml.YamlLoadingUtils.YAML_DOCUMENT_WITH_MISSING_FIELD_INDEX;
 import static org.onap.validation.yaml.YamlLoadingUtils.YAML_DOCUMENT_WITH_MISSING_FIELD_AND_WRONG_VALUE_INDEX;
+import static org.onap.validation.yaml.YamlLoadingUtils.YAML_DOCUMENT_WITH_MISSING_FIELD_INDEX;
 import static org.onap.validation.yaml.YamlLoadingUtils.YAML_DOCUMENT_WITH_WRONG_VALUE_IN_ARRAY_INDEX;
 
-public class YamlValidatorTest {
-
+class YamlValidatorTest {
 
     @Test
-    public void shouldCreateValidatorUsingSchemaLoadedFromYamlFileAndValidatedJsonStyleDocumentsFromThatFile()
-        throws YamlProcessingException {
+    void shouldCreateValidatorUsingSchemaLoadedFromYamlFileAndValidatedJsonStyleDocumentsFromThatFile()
+            throws YamlProcessingException {
 
         // given
         List<YamlDocument> documents = YamlLoadingUtils.loadValidJsonStyleMultiDocumentYamlFile();
         YamlValidator validator = new YamlValidator(new YamlSchemaFactory().createTreeStructuredYamlSchema(documents.get(0)));
-        Map<Integer,List<SchemaValidationError>> validationErrors = new HashMap<>();
+        Map<Integer, List<SchemaValidationError>> validationErrors = new HashMap<>();
 
         // when
-        for (int documentIndex = 1 ; documentIndex < documents.size() ; documentIndex++) {
+        for (int documentIndex = 1; documentIndex < documents.size(); documentIndex++) {
             validationErrors.put(documentIndex, validator.validate(documents.get(documentIndex)));
         }
 
@@ -56,16 +55,16 @@ public class YamlValidatorTest {
     }
 
     @Test
-    public void shouldCreateValidatorUsingSchemaLoadedFromYamlFileAndValidatedDocumentsFromThatFile()
-        throws YamlProcessingException {
+    void shouldCreateValidatorUsingSchemaLoadedFromYamlFileAndValidatedDocumentsFromThatFile()
+            throws YamlProcessingException {
 
         // given
         List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFile();
         YamlValidator validator = new YamlValidator(new YamlSchemaFactory().createTreeStructuredYamlSchema(documents.get(0)));
-        Map<Integer,List<SchemaValidationError>> validationErrors = new HashMap<>();
+        Map<Integer, List<SchemaValidationError>> validationErrors = new HashMap<>();
 
         // when
-        for (int documentIndex = 1 ; documentIndex < documents.size() ; documentIndex++) {
+        for (int documentIndex = 1; documentIndex < documents.size(); documentIndex++) {
             validationErrors.put(documentIndex, validator.validate(documents.get(documentIndex)));
         }
 
@@ -76,47 +75,43 @@ public class YamlValidatorTest {
     private void assertValidatorReturnedCorrectErrors(Map<Integer, List<SchemaValidationError>> validationErrors) {
 
         SchemaValidationError expectedValidationValueError =
-            new SchemaValidationError(
-                "/pmMetaData/pmFields/measResultType",
-                "Value(s) is/are not in array of accepted values.\n"
-                    + " value(s):  integer\n"
-                    + "  accepted value(s):  [float, uint32, uint64]"
-            );
+                new SchemaValidationError(
+                        "/pmMetaData/pmFields/measResultType",
+                        "Value(s) is/are not in array of accepted values.\n"
+                                + " value(s):  integer\n"
+                                + "  accepted value(s):  [float, uint32, uint64]"
+                );
         SchemaValidationError expectedValidationKeyError =
-            new SchemaValidationError(
-                "/pmMetaData/pmFields/",
-                "Key not found: measChangeType"
-            );
+                new SchemaValidationError(
+                        "/pmMetaData/pmFields/",
+                        "Key not found: measChangeType"
+                );
         SchemaValidationError expectedValidationValuesInArrayError =
-            new SchemaValidationError(
-                "/pmMetaData/pmFields/measAdditionalFields/vendorField1",
-                "Value(s) is/are not in array of accepted values.\n"
-                    + " value(s):  [Z, A]\n"
-                    + "  accepted value(s):  [X, Y, Z]"
-            );
-
-        assertThat(validationErrors.size()).isEqualTo(4);
-        assertThat(validationErrors).containsKeys(1,2,3);
-        assertThat(validationErrors.get(YAML_DOCUMENT_WITH_MISSING_FIELD_AND_WRONG_VALUE_INDEX)).hasSize(2);
+                new SchemaValidationError(
+                        "/pmMetaData/pmFields/measAdditionalFields/vendorField1",
+                        "Value(s) is/are not in array of accepted values.\n"
+                                + " value(s):  [Z, A]\n"
+                                + "  accepted value(s):  [X, Y, Z]"
+                );
+
+        assertThat(validationErrors)
+                .hasSize(4)
+                .containsKeys(1, 2, 3);
         assertThat(validationErrors.get(YAML_DOCUMENT_WITH_MISSING_FIELD_AND_WRONG_VALUE_INDEX))
-            .usingFieldByFieldElementComparator()
-            .containsAll(
-                Lists.list(
-                    expectedValidationValueError,
-                    expectedValidationKeyError
+                .hasSize(2)
+                .usingFieldByFieldElementComparator()
+                .containsAll(Lists.list(
+                        expectedValidationValueError,
+                        expectedValidationKeyError
                 ));
-        assertThat(validationErrors.get(YAML_DOCUMENT_WITH_MISSING_FIELD_INDEX)).hasSize(1);
         assertThat(validationErrors.get(YAML_DOCUMENT_WITH_MISSING_FIELD_INDEX))
-            .usingFieldByFieldElementComparator()
-            .contains(
-                    expectedValidationKeyError
-            );
-        assertThat(validationErrors.get(YAML_DOCUMENT_WITH_WRONG_VALUE_IN_ARRAY_INDEX)).hasSize(1);
+                .hasSize(1)
+                .usingFieldByFieldElementComparator()
+                .contains(expectedValidationKeyError);
         assertThat(validationErrors.get(YAML_DOCUMENT_WITH_WRONG_VALUE_IN_ARRAY_INDEX))
-            .usingFieldByFieldElementComparator()
-            .contains(
-                expectedValidationValuesInArrayError
-            );
+                .hasSize(1)
+                .usingFieldByFieldElementComparator()
+                .contains(expectedValidationValuesInArrayError);
         assertThat(validationErrors.get(VALID_YAML_DOCUMENT_INDEX)).hasSize(0);
     }
 
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/model/YamlDocumentFactoryTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlDocumentFactoryTest.java
index 7879d4e..0bd0579 100644
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/model/YamlDocumentFactoryTest.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlDocumentFactoryTest.java
@@ -17,12 +17,9 @@
 
 package org.onap.validation.yaml.model;
 
-import org.assertj.core.util.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -30,20 +27,19 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.onap.validation.yaml.model.YamlDocumentFactory.YamlDocumentParsingException;
 
-public class YamlDocumentFactoryTest {
+class YamlDocumentFactoryTest {
 
     @Test
-    public void shouldTurnMapOfUnknownKeyTypeToMapWithStringKeysAndBeAbleToReturnStringifyValues()
-        throws YamlDocumentParsingException {
+    void shouldTurnMapOfUnknownKeyTypeToMapWithStringKeysAndBeAbleToReturnStringifyValues()
+            throws YamlDocumentParsingException {
         // given
-        Map<Object, Object> inputMap = new HashMap<>();
-        List<String> testList = Lists.list("element1", "element11");
+        List<String> testList = List.of("element1", "element11");
         Map<Object, Object> testEmptyMap = Collections.emptyMap();
-
-        inputMap.put("test", testList);
-        inputMap.put(345, "element2");
-        inputMap.put("test2", "element3");
-        inputMap.put(2.67, testEmptyMap);
+        Map<Object, Object> inputMap = Map.of(
+                "test", testList,
+                345, "element2",
+                "test2", "element3",
+                2.67, testEmptyMap);
 
         // when
         YamlDocument document = new YamlDocumentFactory().createYamlDocument(inputMap);
@@ -63,17 +59,15 @@ public class YamlDocumentFactoryTest {
     }
 
     @Test
-    public void shouldTurnMapOfUnknownKeyTypeToMapWithStringKeysAndBeAbleToExtractSubStructure()
-        throws YamlDocumentParsingException {
+    void shouldTurnMapOfUnknownKeyTypeToMapWithStringKeysAndBeAbleToExtractSubStructure()
+            throws YamlDocumentParsingException {
         // given
-        Map<Object, Object> inputMap = new HashMap<>();
-        Map<Object, Object> subStructureMap = new HashMap<>();
-
-        inputMap.put("test", "element1");
-        inputMap.put("structure", subStructureMap);
-
-        subStructureMap.put("subTest1", "subElement1");
-        subStructureMap.put("subTest2", "subElement2");
+        Map<Object, Object> subStructureMap = Map.of(
+                "subTest1", "subElement1",
+                "subTest2", "subElement2");
+        Map<Object, Object> inputMap = Map.of(
+                "test", "element1",
+                "structure", subStructureMap);
 
         // when
         YamlDocument document = new YamlDocumentFactory().createYamlDocument(inputMap);
@@ -89,17 +83,13 @@ public class YamlDocumentFactoryTest {
     }
 
     @Test
-    public void shouldTurnMapOfUnknownKeyTypeToMapWithStringKeysAndBeAbleToExtractParametersList()
-        throws YamlDocumentParsingException {
+    void shouldTurnMapOfUnknownKeyTypeToMapWithStringKeysAndBeAbleToExtractParametersList()
+            throws YamlDocumentParsingException {
         // given
-        Map<Object, Object> inputMap = new HashMap<>();
-        List<String> parametersList = new LinkedList<>();
-
-        inputMap.put("test", "element1");
-        inputMap.put("parameters", parametersList);
-
-        parametersList.add("parameter1");
-        parametersList.add("parameter2");
+        List<String> parametersList = List.of("parameter1", "parameter2");
+        Map<Object, Object> inputMap = Map.of(
+                "test", "element1",
+                "parameters", parametersList);
 
         // when
         YamlDocument document = new YamlDocumentFactory().createYamlDocument(inputMap);
@@ -110,45 +100,35 @@ public class YamlDocumentFactoryTest {
         assertThat(document.getValue("test")).isEqualTo("element1");
 
         assertThat(document.getListOfValues("parameters")).isNotNull();
-        assertThat(document.getListOfValues("parameters").getParameters()).contains("parameter1","parameter2");
+        assertThat(document.getListOfValues("parameters").getParameters()).contains("parameter1", "parameter2");
     }
 
     @Test
-    public void shouldThrowExceptionIfGetSubStructureIsCalledOnList()
-        throws YamlDocumentParsingException {
+    void shouldThrowExceptionIfGetSubStructureIsCalledOnList()
+            throws YamlDocumentParsingException {
         // given
-        Map<Object, Object> inputMap = new HashMap<>();
-        List<String> testList = Lists.list("element1", "element2");
-
-        inputMap.put("test", testList);
+        List<String> testList = List.of("element1", "element2");
+        Map<Object, Object> inputMap = Collections.singletonMap("test", testList);
 
         YamlDocument document = new YamlDocumentFactory().createYamlDocument(inputMap);
 
         // when then
-        assertThatThrownBy(() ->
-            document.getSubStructure("test")
-        ).isInstanceOf(YamlDocumentParsingException.class)
-            .hasMessageContaining(
-                String.format("Fail to parse given objects: %s as yaml document", testList)
-            );
+        assertThatThrownBy(() -> document.getSubStructure("test"))
+                .isInstanceOf(YamlDocumentParsingException.class)
+                .hasMessageContaining(String.format("Fail to parse given objects: %s as yaml document", testList));
     }
 
     @Test
-    public void shouldThrowExceptionIfGetSubStructureIsCalledOnString()
-        throws YamlDocumentParsingException {
+    void shouldThrowExceptionIfGetSubStructureIsCalledOnString()
+            throws YamlDocumentParsingException {
         // given
-        Map<Object, Object> inputMap = new HashMap<>();
-
-        inputMap.put("test", "testElement");
+        Map<Object, Object> inputMap = Collections.singletonMap("test", "testElement");
 
         YamlDocument document = new YamlDocumentFactory().createYamlDocument(inputMap);
 
         // when then
-        assertThatThrownBy(() ->
-            document.getSubStructure("test")
-        ).isInstanceOf(YamlDocumentParsingException.class)
-            .hasMessageContaining(
-                String.format("Fail to parse given objects: %s as yaml document.", "testElement")
-            );
+        assertThatThrownBy(() -> document.getSubStructure("test"))
+                .isInstanceOf(YamlDocumentParsingException.class)
+                .hasMessageContaining(String.format("Fail to parse given objects: %s as yaml document.", "testElement"));
     }
 }
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/model/YamlParameterListFactoryTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlParameterListFactoryTest.java
index 34e61c5..ed15532 100644
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/model/YamlParameterListFactoryTest.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlParameterListFactoryTest.java
@@ -18,16 +18,16 @@
 package org.onap.validation.yaml.model;
 
 import org.assertj.core.util.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class YamlParameterListFactoryTest {
+class YamlParameterListFactoryTest {
 
     @Test
-    public void shouldCreateEmptyParametersList() {
+    void shouldCreateEmptyParametersList() {
         // when
         YamlParametersList parametersList = new YamlParameterListFactory().createEmptyYamlParameterList();
 
@@ -37,35 +37,37 @@ public class YamlParameterListFactoryTest {
     }
 
     @Test
-    public void shouldCreateParametersListContainingStringsFromListContainingSimpleTypes() {
+    void shouldCreateParametersListContainingStringsFromListContainingSimpleTypes() {
         // given
-        List<Object> testList = Lists.list("test1",3,23.45,'a',"test2");
+        List<Object>  elements = List.of("test1", 3, 23.45, 'a', "test2");
 
         // when
-        YamlParametersList parametersList = new YamlParameterListFactory().createYamlParameterList(testList);
+        YamlParametersList parametersList = new YamlParameterListFactory().createYamlParameterList( elements);
 
         // then
         assertThat(parametersList).isNotNull();
-        assertThat(parametersList.getParameters()).hasSize(5);
-        assertThat(parametersList.getParameters()).contains("test1","test2","3","23.45","a");
+        assertThat(parametersList.getParameters())
+                .hasSize(5)
+                .contains("test1", "test2", "3", "23.45", "a");
     }
 
     @Test
-    public void shouldCreateParametersListContainingStringsFromListContainingVariousTypes() {
+    void shouldCreateParametersListContainingStringsFromListContainingVariousTypes() {
         // given
-        List<Object> testList = Lists.list("test1",3,Lists.list(2,3,4),"test2");
+        List<Object> testList = List.of("test1", 3, Lists.list(2, 3, 4), "test2");
 
         // when
         YamlParametersList parametersList = new YamlParameterListFactory().createYamlParameterList(testList);
 
         // then
         assertThat(parametersList).isNotNull();
-        assertThat(parametersList.getParameters()).hasSize(4);
-        assertThat(parametersList.getParameters()).contains("test1","test2","3","[2, 3, 4]");
+        assertThat(parametersList.getParameters())
+                .hasSize(4)
+                .contains("test1", "test2", "3", "[2, 3, 4]");
     }
 
     @Test
-    public void shouldCreateListWithOneStringWhenGivenObjectIsNotList() {
+    void shouldCreateListWithOneStringWhenGivenObjectIsNotList() {
         // given
         Object testObject = "test";
 
@@ -74,8 +76,8 @@ public class YamlParameterListFactoryTest {
 
         // then
         assertThat(parametersList).isNotNull();
-        assertThat(parametersList.getParameters()).hasSize(1);
-        assertThat(parametersList.getParameters()).contains("test");
+        assertThat(parametersList.getParameters())
+                .hasSize(1)
+                .contains("test");
     }
-
 }
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/process/YamlValidationProcessTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/process/YamlValidationProcessTest.java
index 12fe9ec..4c602e0 100644
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/process/YamlValidationProcessTest.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/process/YamlValidationProcessTest.java
@@ -17,10 +17,10 @@
 
 package org.onap.validation.yaml.process;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.validation.yaml.YamlLoadingUtils;
-import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.error.SchemaValidationError;
+import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.model.YamlDocument;
 import org.onap.validation.yaml.schema.YamlSchema;
 import org.onap.validation.yaml.schema.YamlSchemaFactory;
@@ -30,60 +30,59 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.onap.validation.yaml.YamlLoadingUtils.VALID_YAML_DOCUMENT_INDEX;
-import static org.onap.validation.yaml.YamlLoadingUtils.YAML_DOCUMENT_WITH_MISSING_FIELD_INDEX;
 import static org.onap.validation.yaml.YamlLoadingUtils.YAML_DOCUMENT_WITH_MISSING_FIELD_AND_WRONG_VALUE_INDEX;
+import static org.onap.validation.yaml.YamlLoadingUtils.YAML_DOCUMENT_WITH_MISSING_FIELD_INDEX;
 
-
-public class YamlValidationProcessTest {
+class YamlValidationProcessTest {
 
     @Test
-    public void shouldReturnNoErrorWhenProcessingValidPmDictionaryYaml()
-        throws YamlProcessingException {
+    void shouldReturnNoErrorWhenProcessingValidPmDictionaryYaml()
+            throws YamlProcessingException {
         // given
         List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFile();
         YamlSchema schema = new YamlSchemaFactory().createTreeStructuredYamlSchema(documents.get(0));
         YamlDocument document = documents.get(VALID_YAML_DOCUMENT_INDEX);
 
         // when
-        List<SchemaValidationError> errors = new YamlValidationProcess(schema,document).validate();
+        List<SchemaValidationError> errors = new YamlValidationProcess(schema, document).validate();
 
         // then
         assertThat(errors).isEmpty();
     }
 
     @Test
-    public void shouldReturnOneErrorWhenProcessingPmDictionaryYamlWithMissingField()
-        throws YamlProcessingException {
+    void shouldReturnOneErrorWhenProcessingPmDictionaryYamlWithMissingField()
+            throws YamlProcessingException {
         // given
         List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFile();
         YamlSchema schema = new YamlSchemaFactory().createTreeStructuredYamlSchema(documents.get(0));
         YamlDocument document = documents.get(YAML_DOCUMENT_WITH_MISSING_FIELD_INDEX);
 
         // when
-        List<SchemaValidationError> errors = new YamlValidationProcess(schema,document).validate();
+        List<SchemaValidationError> errors = new YamlValidationProcess(schema, document).validate();
 
         // then
         assertThat(errors).hasSize(1);
     }
 
     @Test
-    public void shouldReturnTwoErrorsWhenProcessingPmDictionaryYamlWithMissingFieldAndIncorrectValue()
-        throws YamlProcessingException {
+    void shouldReturnTwoErrorsWhenProcessingPmDictionaryYamlWithMissingFieldAndIncorrectValue()
+            throws YamlProcessingException {
         // given
         List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFile();
         YamlSchema schema = new YamlSchemaFactory().createTreeStructuredYamlSchema(documents.get(0));
         YamlDocument document = documents.get(YAML_DOCUMENT_WITH_MISSING_FIELD_AND_WRONG_VALUE_INDEX);
 
         // when
-        List<SchemaValidationError> errors = new YamlValidationProcess(schema,document).validate();
+        List<SchemaValidationError> errors = new YamlValidationProcess(schema, document).validate();
 
         // then
         assertThat(errors).hasSize(2);
     }
 
     @Test
-    public void shouldThrowExceptionWhenProcessingPmDictionaryIsNotValidYaml()
-        throws YamlProcessingException {
+    void shouldThrowExceptionWhenProcessingPmDictionaryIsNotValidYaml()
+            throws YamlProcessingException {
         // given
         List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFile();
         YamlDocument schemaInYaml = YamlLoadingUtils.loadSimpleInvalidYamlSchemaForLazyLoadingFile();
@@ -91,11 +90,8 @@ public class YamlValidationProcessTest {
         YamlDocument document = documents.get(VALID_YAML_DOCUMENT_INDEX);
 
         // when then
-        assertThatThrownBy(() ->
-            new YamlValidationProcess(schema,document).validate()
-        ).isInstanceOf(YamlProcessingException.class)
-            .hasMessageContaining(
-                String.format("Lazy loading failed, due to yaml parsing exception.")
-            );
+        assertThatThrownBy(() -> new YamlValidationProcess(schema, document).validate())
+                .isInstanceOf(YamlProcessingException.class)
+                .hasMessageContaining(String.format("Lazy loading failed, due to yaml parsing exception."));
     }
 }
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/schema/YamlSchemaFactoryTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/YamlSchemaFactoryTest.java
index 4c05d71..5768851 100644
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/schema/YamlSchemaFactoryTest.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/YamlSchemaFactoryTest.java
@@ -17,7 +17,7 @@
 
 package org.onap.validation.yaml.schema;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.validation.yaml.YamlLoadingUtils;
 import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.model.YamlDocument;
@@ -31,11 +31,11 @@ import static org.onap.validation.yaml.schema.node.YamlSchemaNodeFactoryTest.ass
 import static org.onap.validation.yaml.schema.node.YamlSchemaNodeFactoryTest.assertThatLeafNodeIsValid;
 
 
-public class YamlSchemaFactoryTest {
+class YamlSchemaFactoryTest {
 
     @Test
-    public void shouldCreateYamlSchemaFromYamlDocumentWithMultipleRoots()
-        throws YamlProcessingException {
+    void shouldCreateYamlSchemaFromYamlDocumentWithMultipleRoots()
+            throws YamlProcessingException {
 
         // given
         YamlDocument documents = YamlLoadingUtils.loadSimpleValidYamlSchemaWithMultiRootFile();
@@ -53,8 +53,8 @@ public class YamlSchemaFactoryTest {
 
 
     @Test
-    public void shouldCreateYamlSchemaFromYamlDocument()
-        throws YamlProcessingException {
+    void shouldCreateYamlSchemaFromYamlDocument()
+            throws YamlProcessingException {
 
         // given
         YamlDocument documents = YamlLoadingUtils.loadSimpleValidYamlSchemaFile();
@@ -66,57 +66,53 @@ public class YamlSchemaFactoryTest {
         assertThat(schema).isNotNull();
         assertThat(schema.getRootNodes()).hasSize(1);
         YamlSchemaNode pmMetaData = schema.getRootNodes().get(0);
-        assertThatBranchNodeIsValid(pmMetaData, "pmMetaData","/", true, EMPTY_COMMENT,
-            2);
+        assertThatBranchNodeIsValid(pmMetaData, "pmMetaData", "/", true, EMPTY_COMMENT,
+                2);
 
         YamlSchemaNode pmHeader = pmMetaData.getNextNodes().get(1);
-        assertThatBranchNodeIsValid(pmHeader, "pmHeader","/pmMetaData/", true, EMPTY_COMMENT,
-            1);
+        assertThatBranchNodeIsValid(pmHeader, "pmHeader", "/pmMetaData/", true, EMPTY_COMMENT,
+                1);
 
         YamlSchemaNode nfType = pmHeader.getNextNodes().get(0);
         assertThatLeafNodeIsValid(nfType, "nfType", "/pmMetaData/pmHeader/", true, "nfType comment");
 
         YamlSchemaNode pmFields = pmMetaData.getNextNodes().get(0);
         assertThatBranchNodeIsValid(pmFields, "pmFields", "/pmMetaData/", true, EMPTY_COMMENT,
-            2);
+                2);
 
         YamlSchemaNode measChangeType = pmFields.getNextNodes().get(1);
         assertThatLeafNodeIsValid(measChangeType, "measChangeType", "/pmMetaData/pmFields/",
-            true, "measChangeType comment",
-            "added", "modified", "deleted");
+                true, "measChangeType comment",
+                "added", "modified", "deleted");
 
         YamlSchemaNode measAdditionalFields = pmFields.getNextNodes().get(0);
         assertThatBranchNodeIsValid(measAdditionalFields, "measAdditionalFields", "/pmMetaData/pmFields/",
-            true, "measAdditionalFields comment",
-            2);
+                true, "measAdditionalFields comment",
+                2);
 
         YamlSchemaNode vendorField1 = measAdditionalFields.getNextNodes().get(0);
         assertThatLeafNodeIsValid(vendorField1, "vendorField1", "/pmMetaData/pmFields/measAdditionalFields/",
-            true, "vendorField1 comment",
-            "X", "Y", "Z");
+                true, "vendorField1 comment",
+                "X", "Y", "Z");
         YamlSchemaNode vendorField2 = measAdditionalFields.getNextNodes().get(1);
         assertThatLeafNodeIsValid(vendorField2, "vendorField2", "/pmMetaData/pmFields/measAdditionalFields/",
-            false, "vendorField2 comment",
-            "A", "B");
+                false, "vendorField2 comment",
+                "A", "B");
     }
 
     @Test
-    public void shouldThrowYamlParsingExceptionWhenLoadedSchemaIsInvalid()
-        throws YamlDocumentParsingException {
+    void shouldThrowYamlParsingExceptionWhenLoadedSchemaIsInvalid()
+            throws YamlDocumentParsingException {
 
         // given
         YamlDocument documents = YamlLoadingUtils.loadSimpleInvalidYamlSchemaFile();
 
         // when/then
-        assertThatThrownBy(() ->
-            new YamlSchemaFactory().createTreeStructuredYamlSchema(documents)
-        ).isInstanceOf(YamlDocumentParsingException.class)
-            .hasMessageContaining(
-                String.format(
-                    "Fail to parse given objects: %s as yaml document",
-                    documents.getSubStructure("pmMetaData").getYaml().get("structure")
-                )
-            );
+        assertThatThrownBy(() -> new YamlSchemaFactory().createTreeStructuredYamlSchema(documents))
+                .isInstanceOf(YamlDocumentParsingException.class)
+                .hasMessageContaining(String.format(
+                        "Fail to parse given objects: %s as yaml document",
+                        documents.getSubStructure("pmMetaData").getYaml().get("structure"))
+                );
     }
-
 }
diff --git a/csarvalidation/src/test/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactoryTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactoryTest.java
index d35e3b2..ed43a1d 100644
--- a/csarvalidation/src/test/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactoryTest.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactoryTest.java
@@ -18,7 +18,7 @@
 package org.onap.validation.yaml.schema.node;
 
 import org.assertj.core.util.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.validation.yaml.YamlLoadingUtils;
 import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.model.YamlDocument;
@@ -37,26 +37,24 @@ public class YamlSchemaNodeFactoryTest {
     private static final String ROOT_PATH = "/";
 
     @Test
-    public void shouldThrowExceptionDuringLazyLoadingWhenLoadedSchemaHaveInvalidSubStructure()
-        throws YamlProcessingException {
+    void shouldThrowExceptionDuringLazyLoadingWhenLoadedSchemaHaveInvalidSubStructure()
+            throws YamlProcessingException {
         // given
         String nodeName = "pmMetaData";
 
         YamlDocument document = YamlLoadingUtils.loadSimpleInvalidYamlSchemaForLazyLoadingFile();
         YamlSchemaNode node = new YamlSchemaNodeFactory()
-            .createNode(nodeName, ROOT_PATH, document.getSubStructure(nodeName));
+                .createNode(nodeName, ROOT_PATH, document.getSubStructure(nodeName));
 
         // when/then
-        assertThatThrownBy(node::getNextNodes
-        ).isInstanceOf(YamlSchemaNode.YamlSchemaProcessingException.class)
-            .hasMessageContaining(
-                "Lazy loading failed, due to yaml parsing exception."
-            );
+        assertThatThrownBy(node::getNextNodes)
+                .isInstanceOf(YamlSchemaNode.YamlSchemaProcessingException.class)
+                .hasMessageContaining("Lazy loading failed, due to yaml parsing exception.");
     }
 
     @Test
-    public void shouldCreateLeafNodeIfGivenYamlDocumentHaveNoSubStructure()
-        throws YamlProcessingException {
+    void shouldCreateLeafNodeIfGivenYamlDocumentHaveNoSubStructure()
+            throws YamlProcessingException {
         // given
         String nodeName = "leaf_test";
         String comment = "test leaf node";
@@ -65,23 +63,21 @@ public class YamlSchemaNodeFactoryTest {
         nodeInYamlFormat.put(YamlSchemaNodeFactory.PRESENCE_KEY, YamlSchemaNodeFactory.PRESENCE_REQUIRED_KEY);
         nodeInYamlFormat.put(YamlSchemaNodeFactory.COMMENT_KEY, comment);
         nodeInYamlFormat.put(YamlSchemaNodeFactory.VALUE_KET, acceptedValues);
-        YamlDocument document = new YamlDocumentFactory().createYamlDocument(
-            nodeInYamlFormat
-        );
+        YamlDocument document = new YamlDocumentFactory().createYamlDocument(nodeInYamlFormat);
 
         // when
         YamlSchemaNode yamlSchemaNode = new YamlSchemaNodeFactory().createNode(nodeName, ROOT_PATH, document);
 
         // then
         assertThatLeafNodeIsValid(
-            yamlSchemaNode, nodeName, ROOT_PATH, true, comment,
-            acceptedValues.toArray(new String[acceptedValues.size()])
+                yamlSchemaNode, nodeName, ROOT_PATH, true, comment,
+                acceptedValues.toArray(new String[acceptedValues.size()])
         );
     }
 
     @Test
-    public void shouldCreateBranchNodeIfGivenYamlDocumentHaveSubStructure()
-        throws YamlProcessingException {
+    void shouldCreateBranchNodeIfGivenYamlDocumentHaveSubStructure()
+            throws YamlProcessingException {
         // given
         String nodeName = "branch_test";
         String comment = "test branch node";
@@ -96,28 +92,25 @@ public class YamlSchemaNodeFactoryTest {
         nodeInYamlFormat.put(YamlSchemaNodeFactory.PRESENCE_KEY, YamlSchemaNodeFactory.PRESENCE_REQUIRED_KEY);
         nodeInYamlFormat.put(YamlSchemaNodeFactory.COMMENT_KEY, comment);
         nodeInYamlFormat.put(YamlSchemaNodeFactory.STRUCTURE_KEY, subStructure);
-        YamlDocument document = new YamlDocumentFactory().createYamlDocument(
-            nodeInYamlFormat
-        );
+        YamlDocument document = new YamlDocumentFactory().createYamlDocument(nodeInYamlFormat);
 
         // when
         YamlSchemaNode yamlSchemaNode = new YamlSchemaNodeFactory().createNode(nodeName, ROOT_PATH, document);
 
         // then
-        assertThatBranchNodeIsValid(
-            yamlSchemaNode, nodeName, ROOT_PATH, true, comment, 2);
+        assertThatBranchNodeIsValid(yamlSchemaNode, nodeName, ROOT_PATH, true, comment, 2);
 
         List<YamlSchemaNode> subNodes = yamlSchemaNode.getNextNodes();
         assertThat(subNodes).hasSize(2);
         assertThatLeafNodeIsValid(
-            subNodes.get(1), subNode1Name, ROOT_PATH + nodeName + "/", false, EMPTY_COMMENT);
+                subNodes.get(1), subNode1Name, ROOT_PATH + nodeName + "/", false, EMPTY_COMMENT);
         assertThatLeafNodeIsValid(
-            subNodes.get(0), subNode2Name, ROOT_PATH + nodeName + "/", false, EMPTY_COMMENT);
+                subNodes.get(0), subNode2Name, ROOT_PATH + nodeName + "/", false, EMPTY_COMMENT);
     }
 
     public static void assertThatBranchNodeIsValid(
-        YamlSchemaNode yamlSchemaNode, String name, String path, boolean isRequired, String comment,
-        int numberOfSubNodes
+            YamlSchemaNode yamlSchemaNode, String name, String path, boolean isRequired, String comment,
+            int numberOfSubNodes
     ) throws YamlSchemaNode.YamlSchemaProcessingException {
         assertThatNodeIsValid(yamlSchemaNode, name, path, isRequired, comment);
 
@@ -128,8 +121,8 @@ public class YamlSchemaNodeFactoryTest {
     }
 
     public static void assertThatLeafNodeIsValid(
-        YamlSchemaNode yamlSchemaNode, String name, String path, boolean isRequired, String comment,
-        String... acceptedValues
+            YamlSchemaNode yamlSchemaNode, String name, String path, boolean isRequired, String comment,
+            String... acceptedValues
     ) throws YamlSchemaNode.YamlSchemaProcessingException {
         assertThatNodeIsValid(yamlSchemaNode, name, path, isRequired, comment);
 
diff --git a/csarvalidation/src/test/resources/yaml_schema/Multi_Document_Invalid.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/Multi_Document_Invalid.yaml
index aab34fa..aab34fa 100644
--- a/csarvalidation/src/test/resources/yaml_schema/Multi_Document_Invalid.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/Multi_Document_Invalid.yaml
diff --git a/csarvalidation/src/test/resources/yaml_schema/PM_Dictionary.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary.yaml
index 12a4af9..12a4af9 100644
--- a/csarvalidation/src/test/resources/yaml_schema/PM_Dictionary.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary.yaml
diff --git a/csarvalidation/src/test/resources/yaml_schema/PM_Dictionary_JSON_Style.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary_JSON_Style.yaml
index f4cbddf..f4cbddf 100644
--- a/csarvalidation/src/test/resources/yaml_schema/PM_Dictionary_JSON_Style.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary_JSON_Style.yaml
diff --git a/csarvalidation/src/test/resources/yaml_schema/Simple_Invalid_Mapping_Value.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Mapping_Value.yaml
index 25c72cd..25c72cd 100644
--- a/csarvalidation/src/test/resources/yaml_schema/Simple_Invalid_Mapping_Value.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Mapping_Value.yaml
diff --git a/csarvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_Construction.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_Construction.yaml
index c5e7b7c..c5e7b7c 100644
--- a/csarvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_Construction.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_Construction.yaml
diff --git a/csarvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_LazyLoading.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_LazyLoading.yaml
index 7f9f946..7f9f946 100644
--- a/csarvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_LazyLoading.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_LazyLoading.yaml
diff --git a/csarvalidation/src/test/resources/yaml_schema/Simple_Unknown_Escape_Character.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Unknown_Escape_Character.yaml
index 2cac9e6..2cac9e6 100644
--- a/csarvalidation/src/test/resources/yaml_schema/Simple_Unknown_Escape_Character.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Unknown_Escape_Character.yaml
diff --git a/csarvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema.yaml
index a125b13..a125b13 100644
--- a/csarvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema.yaml
diff --git a/csarvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema_Multi_Root.yaml b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema_Multi_Root.yaml
index d73ca4f..d73ca4f 100644
--- a/csarvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema_Multi_Root.yaml
+++ b/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema_Multi_Root.yaml
diff --git a/pom.xml b/pom.xml
index c150b7f..9228351 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
     <modules>
         <module>csarvalidation</module>
         <module>deployment</module>
+        <module>pmdictionaryvalidation</module>
     </modules>
 
     <build>