Fix concurrent verify jobs

This uses URI instead of String to costruct paths, restoring
testability. Also fix a pom.xml warning while we're in the neighborhood.

Change-Id: I8df7573782b43326869e274e95720daf9d528e80
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/pom.xml b/yang/pom.xml
index 2806937f7ebcaf8b9d68f2d2872b1ccce4a566a0..5cbc84271de3ccdb5dd7c02d37cfc2e6b63e0afc 100644 (file)
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -56,6 +56,11 @@
                 <artifactId>yang-data-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-data-json</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-util</artifactId>
@@ -108,16 +113,6 @@
                 <artifactId>maven-plugin-api</artifactId>
                 <version>3.0.5</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-json</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsTest.java b/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsTest.java
index 4097d4a1cf21130c59903048d9b8888de9d5513e..5b56f0c74ab0941bbbdde7497796a1332c6e1c34 100644 (file)
--- a/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsTest.java
+++ b/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/YangDataOperationsTest.java
@@ -139,7 +139,7 @@ public class YangDataOperationsTest {
             return ModifyAction.MERGE;
         }
 
-        return ModifyAction.fromXmlValue(Files.toString(new File(resource.getFile()), Charsets.UTF_8).trim());
+        return ModifyAction.fromXmlValue(Files.toString(new File(resource.toURI()), Charsets.UTF_8).trim());
     }
 
     private void verifyModificationResult(Optional<ContainerNode> result, Optional<ContainerNode> expectedResult)