fix build configuration and dependencies

repair project build by correcting dependencies import

Change-Id: Id4c6beb550d81a6f00dd76315801b411b4c1bd23
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/inventory/pom.xml b/inventory/pom.xml
index ea11d15f99df2bb17166d8615dee904a36a5bdd6..5f2658ff86e521f63d93da683b0c91a1fa8f139d 100644 (file)
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -71,7 +71,7 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
+       <dependency>
             <groupId>org.apache.karaf.scheduler</groupId>
             <artifactId>org.apache.karaf.scheduler.core</artifactId>
             <version>4.0.9</version>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index b750b1b52e73f02562cdc0187c0dc7ff677a8e45..1555d36a75e86dca3c2114eaa36a021c37cf08fb 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -70,72 +70,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!-- DO NOT deploy the karaf artifact -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${project.groupId}.ordmodels</groupId>
-                                    <artifactId>transportpce-ordmodels-common</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>${project.groupId}.ordmodels</groupId>
-                                    <artifactId>transportpce-ordmodels-device</artifactId>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${device.yang.jar.extract.directory}</outputDirectory>
-                            <includes>**/*.yang</includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-yang-files</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <copy todir="${device.yang.final.directory}" flatten="true">
-                                    <fileset dir="${device.yang.jar.extract.directory}/META-INF/yang">
-                                        <include name="**/*.yang" />
-                                    </fileset>
-                                </copy>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+     <build>
+         <plugins>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-deploy-plugin</artifactId>
+                 <configuration>
+                     <skip>true</skip>
+                 </configuration>
+             </plugin>
+         </plugins>
+     </build>
+
+
 </project>

diff --git a/olm/pom.xml b/olm/pom.xml
index d5d7c9564e1e7eebfb5f65764e03d64babfcaee3..46e2401d062f8f8b9e114c416cacd7411e239c01 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -59,7 +59,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>sal-netconf-connector</artifactId>
-      <version>1.7.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Testing Dependencies -->

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 1fd381688da4fe4427b1b6681edba45e9a63b133..01511a6e2959bced611ffdebb3637087a26e4253 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -64,7 +64,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>sal-netconf-connector</artifactId>
-      <version>1.7.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Testing Dependencies -->

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index 4e73956587ba020e23f8c7db9433628a5536c92f..de77d0e38cbd03d1c9d314b18eddb826dded90fa 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -24,6 +24,18 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <version>0.2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.7.3-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -63,6 +75,30 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>test-common</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-broker-impl</artifactId>
+      <version>1.7.3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-pce</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-stubrenderer</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java
index aa35cdf5029cc9b5a4b8d9ca83d0f08d9f10001c..b050095d6fd9fdbe14b271c9b060ed9f176d23a3 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java
@@ -80,7 +80,7 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter
             YangInstanceIdentifier.PathArgument directChildIdentifier =
                     YangInstanceIdentifier.of(rootNode).getLastPathArgument();
             Optional<NormalizedNode<?, ?>> directChild =
-                    NormalizedNodes.getDirectChild(normalizedNode, directChildIdentifier).toJavaUtil();
+                    NormalizedNodes.getDirectChild(normalizedNode, directChildIdentifier);//.toJavaUtil();
             if (!directChild.isPresent()) {
                 throw new IllegalStateException(String.format("Could not get the direct child of %s", rootNode));
             }

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/JSONDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/JSONDataObjectConverter.java
index fced3dc79a6069a6a09285b93bce20fda9f45f2d..0413ef4e1436fcfdd0f58dc54de43597539e02b9 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/JSONDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/JSONDataObjectConverter.java
@@ -19,7 +19,7 @@ import java.util.Optional;
 import javax.annotation.Nonnull;
 import org.opendaylight.transportpce.binding.converter.api.DataObjectConverter;
 import org.opendaylight.transportpce.test.common.DataStoreContext;
-import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
+import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
index eb8f6e1519fe198e2cbcf0a0527f2fbeb7e485f0..81489cf3dd123e24244bd4357393c64938d73164 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
@@ -135,7 +135,7 @@ public class DeviceWrapper {
         YangInstanceIdentifier initialDataIi = YangInstanceIdentifier.of(dataQName);
         LOG.debug("Searching for {} inside {}", initialDataIi, initialDataNormalizedNodes.get());
         Optional<NormalizedNode<?, ?>> dataNormalizedNodes =
-                NormalizedNodes.findNode(initialDataNormalizedNodes.get(), initialDataIi).toJavaUtil();
+                NormalizedNodes.findNode(initialDataNormalizedNodes.get(), initialDataIi);//.toJavaUtil();
         Preconditions.checkArgument(dataNormalizedNodes.isPresent());
         LOG.info("Initial data was successfully stored into ds");
         DOMDataWriteTransaction writeOnlyTransaction = domDataBroker.newWriteOnlyTransaction();

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContext.java b/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContext.java
index d1e3dfd65ac11bd633ca466da85c7b3d9979aeae..11235124037d0593405a7f5c37b06b51da41d704 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContext.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContext.java
@@ -11,7 +11,7 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
+import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public interface DataStoreContext {

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java b/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java
index 5fc25dbeb521f91b7ab330845a7c63bf59e65d77..84a6428577103c42eb9553da2bf6508f870d6183 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java
@@ -35,8 +35,8 @@ import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
 import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.generator.util.JavassistUtils;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.yangtools.binding.data.codec.gen.impl.StreamWriterGenerator;
-import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
+import org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator;
+import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.util.ListenerRegistry;
 import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider;