Clean up pom.xml files of maven projects

author Gilles Thouenon <gilles.thouenon@orange.com>

Fri, 25 Feb 2022 14:03:33 +0000 (15:03 +0100)

committer Guillaume Lambert <guillaume.lambert@orange.com>

Wed, 2 Mar 2022 07:39:57 +0000 (07:39 +0000)
author Gilles Thouenon <gilles.thouenon@orange.com>
Fri, 25 Feb 2022 14:03:33 +0000 (15:03 +0100)
committer Guillaume Lambert <guillaume.lambert@orange.com>
Wed, 2 Mar 2022 07:39:57 +0000 (07:39 +0000)
diff --git a/api/pom.xml b/api/pom.xml

index 7668f70b0b30a9c929bd9bfac3b13e3ee466d717..7b0193897237bbac38ee95d6537f1bb80a69806c 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -43,8 +43,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <version>${project.version}</version>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc8345-ietf-network-topology</artifactId>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
@@ -54,37 +58,44 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc6991-ietf-yang-types</artifactId>
      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
    </dependencies>
  
    <build>
-     <plugins>
-       <plugin>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>maven-bundle-plugin</artifactId>
-         <!--version>3.0.1</version-->
-         <extensions>true</extensions>
-         <configuration>
-           <instructions>
-             <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
-             <_exportcontents>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
+            <_exportcontents>
                 org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.rev170120.service.implementation.request.input,*
-             </_exportcontents>
-           </instructions>
-         </configuration>
-       </plugin>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-javadoc-plugin</artifactId>
-         <configuration>
-           <sourcepath>*/target/generated-sources/mdsal-binding/*</sourcepath>
-           <excludePackageNames>*</excludePackageNames>
-         </configuration>
-       </plugin>
-     </plugins>
+            </_exportcontents>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <sourcepath>*/target/generated-sources/mdsal-binding/*</sourcepath>
+          <excludePackageNames>*</excludePackageNames>
+        </configuration>
+      </plugin>
+    </plugins>
    </build>
  
    <reporting>
-     <plugins>
+    <plugins>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/common/pom.xml b/common/pom.xml

index 5ec69a27a965874ed83b3134d06292a92611dbe7..5f6eea446d5187d3caebd8f9204060ac156efe84 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -7,70 +7,140 @@
      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>8.0.11</version>
-        <relativePath />
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>8.0.11</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>transportpce-common</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>2.0.14</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>transportpce-common</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
  
+  <dependencyManagement>
      <dependencies>
-        <dependency>
-            <groupId>${project.groupId}.ordmodels</groupId>
-            <artifactId>transportpce-ordmodels-device</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}.ordmodels</groupId>
-            <artifactId>transportpce-ordmodels-network</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-codec-spi</artifactId>
-        </dependency>
-        <!-- Testing dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>test-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-generator</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-runtime-spi</artifactId>
-            <scope>test</scope>
-        </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>2.0.14</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
      </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-device</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-network</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-model-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-codec-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-spec-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-runtime-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>sal-netconf-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+
+    <!-- Testing dependencies -->
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>test-common</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-runtime-spi</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
  </project>
diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml

index 8a6563552c11dafa3ac9e768cb9ec0ebe4f70bd7..1e4ed70490d16aa14cf4f8f3b06a9f2e0de0d532 100644 (file)
--- a/dmaap-client/pom.xml
+++ b/dmaap-client/pom.xml
@@ -5,74 +5,123 @@
  <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>8.0.11</version>
-        <relativePath />
-    </parent>
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>transportpce-dmaap-client</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <description>client to send message to Dmaap message router</description>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>8.0.11</version>
+    <relativePath/>
+  </parent>
  
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.ext</groupId>
-            <artifactId>jersey-proxy-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-        <!-- Testing dependencies -->
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.test-framework</groupId>
-            <artifactId>jersey-test-framework-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>transportpce-dmaap-client</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <description>client to send message to Dmaap message router</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.ext</groupId>
+      <artifactId>jersey-proxy-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+    </dependency>
+
+    <!-- Testing dependencies -->
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.test-framework</groupId>
+      <artifactId>jersey-test-framework-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+      <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+    </dependency>
+  </dependencies>
  </project>
 \ No newline at end of file
diff --git a/features/odl-transportpce-dmaap-client/pom.xml b/features/odl-transportpce-dmaap-client/pom.xml

index 5b9e0ffe4ba86f02731bf0322ebf166b341e0953..a623770d1160dea88de3dfea15094f9f23d604f7 100644 (file)
--- a/features/odl-transportpce-dmaap-client/pom.xml
+++ b/features/odl-transportpce-dmaap-client/pom.xml
@@ -6,73 +6,77 @@
  <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
-        <relativePath />
-    </parent>
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>odl-transportpce-dmaap-client</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
+  <modelVersion>4.0.0</modelVersion>
  
-    <name>OpenDaylight :: transportpce :: dmaap-client</name>
-    <properties>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>9.0.13</version>
+    <relativePath/>
+  </parent>
+
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>odl-transportpce-dmaap-client</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: transportpce :: dmaap-client</name>
+
+  <properties>
      <!-- skipped because we are using config file as artifact and it is not installed before running test -->
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>odl-transportpce</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.inject</groupId>
-                    <artifactId>jersey-hk2</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-dmaap-client</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish.jersey.inject</groupId>
-                    <artifactId>jersey-hk2</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-dmaap-artifact</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${basedir}/src/main/resources/org.opendaylight.transportpce.dmaap.cfg</file>
-                                    <type>cfg</type>
-                                    <classifier>config</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <skip.karaf.featureTest>true</skip.karaf.featureTest>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>odl-transportpce</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <exclusions>
+        <exclusion>
+          <groupId>org.glassfish.jersey.inject</groupId>
+          <artifactId>jersey-hk2</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-dmaap-client</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.glassfish.jersey.inject</groupId>
+          <artifactId>jersey-hk2</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-dmaap-artifact</id>
+            <phase>test</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${basedir}/src/main/resources/org.opendaylight.transportpce.dmaap.cfg</file>
+                  <type>cfg</type>
+                  <classifier>config</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
  </project>
 \ No newline at end of file
diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml

index ab7042e63c06ea63a5b2d75bc775e4a549fe7a2e..855f0359cdb2d400d352dad65bf49a1ce5d01275 100644 (file)
--- a/features/odl-transportpce-inventory/pom.xml
+++ b/features/odl-transportpce-inventory/pom.xml
@@ -4,99 +4,98 @@
      and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
  <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">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
-        <relativePath/>
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>9.0.13</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>odl-transportpce-inventory</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>odl-transportpce-inventory</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: transportpce :: Inventory</name>
  
-    <name>OpenDaylight :: transportpce :: Inventory</name>
+  <properties>
+    <transportpce.db.host>localhost:3306</transportpce.db.host>
+    <transportpce.db.database>transportpce</transportpce.db.database>
+    <transportpce.db.username>root</transportpce.db.username>
+    <transportpce.db.password>root</transportpce.db.password>
+    <transporpce.device.backup.folder>data/transportpce/devicebackup</transporpce.device.backup.folder>
+    <transporpce.device.backup.prefix></transporpce.device.backup.prefix>
+    <transporpce.device.backup.period>600</transporpce.device.backup.period>
+    <!-- skipping single feature test because DataSource is not available in Pax4j (H2 possible workaround) -->
+    <skip.karaf.featureTest>true</skip.karaf.featureTest>
+  </properties>
  
-    <properties>
-        <transportpce.db.host>localhost:3306</transportpce.db.host>
-        <transportpce.db.database>transportpce</transportpce.db.database>
-        <transportpce.db.username>root</transportpce.db.username>
-        <transportpce.db.password>root</transportpce.db.password>
-        <transporpce.device.backup.folder>data/transportpce/devicebackup</transporpce.device.backup.folder>
-        <transporpce.device.backup.prefix></transporpce.device.backup.prefix>
-        <transporpce.device.backup.period>600</transporpce.device.backup.period>
-        <!-- skipping single feature test because DataSource is not available in Pax4j (H2 possible workaround) -->
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-    </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>odl-transportpce</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-inventory</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
  
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>odl-transportpce</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-inventory</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-      <plugins>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>copy-resources</id>
-              <phase>validate</phase>
-              <goals>
-                <goal>copy-resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${basedir}/target/resources</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>src/main/resources</directory>
-                    <filtering>true</filtering>
-                  </resource>
-                </resources>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>attach-db-artifact</id>
-              <phase>package</phase>
-              <goals>
-                <goal>attach-artifact</goal>
-              </goals>
-              <configuration>
-                <artifacts>
-                  <artifact>
-                    <file>target/resources/org.ops4j.datasource-transporpce.cfg</file>
-                    <type>cfg</type>
-                    <classifier>datasource</classifier>
-                  </artifact>
-                  <artifact>
-                    <file>target/resources/org.opendaylight.transportpce.job.cfg</file>
-                    <type>cfg</type>
-                    <classifier>config</classifier>
-                  </artifact>
-                </artifacts>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/resources</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/resources</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-db-artifact</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>target/resources/org.ops4j.datasource-transporpce.cfg</file>
+                  <type>cfg</type>
+                  <classifier>datasource</classifier>
+                </artifact>
+                <artifact>
+                  <file>target/resources/org.opendaylight.transportpce.job.cfg</file>
+                  <type>cfg</type>
+                  <classifier>config</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
  </project>
diff --git a/features/odl-transportpce-nbinotifications/pom.xml b/features/odl-transportpce-nbinotifications/pom.xml

index 72d244167a1c0a6d684a6cbcdf66eab9f835d24c..bdcd60d784ee1f259bbda6d0f5d9e19970a9cbe5 100644 (file)
--- a/features/odl-transportpce-nbinotifications/pom.xml
+++ b/features/odl-transportpce-nbinotifications/pom.xml
@@ -6,63 +6,65 @@
  <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">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>9.0.13</version>
-        <relativePath />
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>9.0.13</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>odl-transportpce-nbinotifications</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>odl-transportpce-nbinotifications</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
+  <name>OpenDaylight :: transportpce :: nbinotifications</name>
  
-    <name>OpenDaylight :: transportpce :: nbinotifications</name>
-    <properties>
+  <properties>
      <!-- skipped because we are using config file as artifact and it is not installed before running test -->
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>odl-transportpce</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-nbinotifications</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-dmaap-artifact</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${basedir}/src/main/resources/org.opendaylight.transportpce.nbinotifications.cfg</file>
-                                    <type>cfg</type>
-                                    <classifier>config</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <skip.karaf.featureTest>true</skip.karaf.featureTest>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>odl-transportpce</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-nbinotifications</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-dmaap-artifact</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${basedir}/src/main/resources/org.opendaylight.transportpce.nbinotifications.cfg</file>
+                  <type>cfg</type>
+                  <classifier>config</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
  </project>
diff --git a/features/odl-transportpce-swagger/pom.xml b/features/odl-transportpce-swagger/pom.xml

index b4c79809ab975f69f7f6e311dac7ac25db5a64d3..63debf64951fe2f167e5b4af0e00eeaab9e1962d 100644 (file)
--- a/features/odl-transportpce-swagger/pom.xml
+++ b/features/odl-transportpce-swagger/pom.xml
@@ -20,7 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <artifactId>odl-transportpce-swagger</artifactId>
    <version>5.0.0-SNAPSHOT</version>
    <packaging>feature</packaging>
-
    <name>OpenDaylight :: transportpce :: swagger</name>
  
    <properties>
@@ -28,17 +27,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
      <configfile.directory>etc/opendaylight/karaf</configfile.directory>
    </properties>
  
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>${netconf.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>${netconf.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
  
    <dependencies>
      <dependency>
@@ -49,7 +48,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
      </dependency>
    </dependencies>
  
-<!-- skipping test since this is an umbrella project / folder -->
+  <!-- skipping test since this is an umbrella project / folder -->
    <build>
      <plugins>
        <plugin>
@@ -61,5 +60,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
        </plugin>
      </plugins>
    </build>
-
  </project>
diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml

index 1e9f5ac0287484e7da9624f665fcf77a99b00853..c30cccaf621c35c27295231a6623cc65c112a078 100644 (file)
--- a/features/odl-transportpce-tapi/pom.xml
+++ b/features/odl-transportpce-tapi/pom.xml
@@ -20,7 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <artifactId>odl-transportpce-tapi</artifactId>
    <version>5.0.0-SNAPSHOT</version>
    <packaging>feature</packaging>
-
    <name>OpenDaylight :: transportpce :: tapi</name>
  
    <dependencies>
@@ -36,7 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
      </dependency>
    </dependencies>
  
-<!-- skipping test since this is an umbrella project / folder -->
+  <!-- skipping test since this is an umbrella project / folder -->
    <build>
      <plugins>
        <plugin>
@@ -48,5 +47,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
        </plugin>
      </plugins>
    </build>
-
  </project>
diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml

index e3cbd7cff8a447b72caf37eb70aea159182fde18..1710cc23ca82d9b120ab09f00ac8c999444490b3 100644 (file)
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -20,7 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <artifactId>odl-transportpce</artifactId>
    <version>5.0.0-SNAPSHOT</version>
    <packaging>feature</packaging>
-
    <name>OpenDaylight :: transportpce</name>
  
    <properties>
@@ -28,17 +27,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
      <configfile.directory>etc/opendaylight/karaf</configfile.directory>
    </properties>
  
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>${netconf.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>${netconf.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
  
    <dependencies>
      <dependency>
@@ -48,17 +47,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
      </dependency>
      <dependency>
        <groupId>${project.groupId}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-network</artifactId>
+      <artifactId>transportpce-ordmodels-device</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
        <groupId>${project.groupId}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-service</artifactId>
+      <artifactId>transportpce-ordmodels-network</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
        <groupId>${project.groupId}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-device</artifactId>
+      <artifactId>transportpce-ordmodels-service</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
@@ -116,7 +115,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
      </dependency>
    </dependencies>
  
-<!-- skipping test since this is an umbrella project / folder -->
+  <!-- skipping test since this is an umbrella project / folder -->
    <build>
      <plugins>
        <plugin>
@@ -150,5 +149,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
        </plugin>
      </plugins>
    </build>
-
  </project>
diff --git a/inventory/pom.xml b/inventory/pom.xml

index 5a76f551d91f3e6dfe1376292688d141d57bb579..9dc9e8b50838ab3b12a6a76cdc2ecad7c488db55 100644 (file)
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -5,26 +5,87 @@
      and is available at http://www.eclipse.org/legal/epl-v10.html -->
  <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">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>8.0.11</version>
-        <relativePath />
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>8.0.11</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>transportpce-inventory</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>transportpce-inventory</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
  
+  <dependencyManagement>
      <dependencies>
        <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>transportpce-common</artifactId>
-        <version>${project.version}</version>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>2.0.13</version>
+        <scope>import</scope>
+        <type>pom</type>
        </dependency>
      </dependencies>
+  </dependencyManagement>
  
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-device</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>sal-netconf-connector</artifactId>
+    </dependency>
+  </dependencies>
  </project>
diff --git a/karaf/pom.xml b/karaf/pom.xml

index 880884a1a3cfbc9580a184bc2a01388388c5c98f..4c4597e65356f3b4eac550321efd4e335ad334b4 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -7,7 +7,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
  -->
  <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">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
  
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
@@ -25,23 +25,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <properties>
      <karaf.localFeature>odl-transportpce</karaf.localFeature>
      <device.yang.jar.extract.directory>
-        ${project.build.outputDirectory}/../yang-models/schema
+      ${project.build.outputDirectory}/../yang-models/schema
      </device.yang.jar.extract.directory>
      <device.yang.final.directory>
-        ${project.build.outputDirectory}/../assembly/cache/schema
+      ${project.build.outputDirectory}/../assembly/cache/schema
      </device.yang.final.directory>
    </properties>
  
    <dependencies>
-
      <dependency>
-    <!-- scope is compile so all features (there is only one) are installed into startup.properties
+      <!-- scope is compile so all features (there is only one) are installed into startup.properties
                  and the feature repo itself is not installed -->
        <groupId>org.apache.karaf.features</groupId>
        <artifactId>framework</artifactId>
        <type>kar</type>
      </dependency>
-
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>odl-transportpce</artifactId>
diff --git a/lighty/pom.xml b/lighty/pom.xml

index 78e56e86a149a4daa438a5bfab3a6cdf9939a5d4..d95ea88e411c5c94e9334129ecba607ea693b63f 100644 (file)
--- a/lighty/pom.xml
+++ b/lighty/pom.xml
@@ -6,157 +6,151 @@
  <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">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>io.lighty.core</groupId>
-        <artifactId>lighty-app-parent</artifactId>
-        <version>15.1.1-SNAPSHOT</version>
-        <relativePath />
-    </parent>
+  <parent>
+    <groupId>io.lighty.core</groupId>
+    <artifactId>lighty-app-parent</artifactId>
+    <version>15.1.1-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>io.lighty.controllers</groupId>
-    <artifactId>tpce</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
+  <groupId>io.lighty.controllers</groupId>
+  <artifactId>tpce</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
  
-    <properties>
-        <application.main.class>io.lighty.controllers.tpce.Main</application.main.class>
-        <application.attach.zip>true</application.attach.zip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <transportpce.version>5.0.0-SNAPSHOT</transportpce.version>
-    </properties>
+  <properties>
+    <application.main.class>io.lighty.controllers.tpce.Main</application.main.class>
+    <application.attach.zip>true</application.attach.zip>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <transportpce.version>5.0.0-SNAPSHOT</transportpce.version>
+  </properties>
  
-    <dependencies>
-        <!-- for parsing command line arguments -->
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.4</version>
-        </dependency>
+  <dependencies>
+    <!-- for parsing command line arguments -->
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <!-- TPCE Models - BEGIN -->
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-networkmodel</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <!-- TPCE Models - END -->
+    <!-- TPCE bundles - BEGIN -->
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-pce</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-olm</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-servicehandler</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-tapi</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>transportpce-nbinotifications</artifactId>
+      <version>${transportpce.version}</version>
+    </dependency>
+    <!-- TPCE bundles - END -->
+    <dependency>
+      <groupId>io.lighty.modules</groupId>
+      <artifactId>lighty-netconf-sb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.lighty.modules</groupId>
+      <artifactId>lighty-restconf-nb-community</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <version>1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <version>3.1.3</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
  
-        <!-- TPCE Models - BEGIN -->
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-api</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-networkmodel</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <!-- TPCE Models - END -->
-
-        <!-- TPCE bundles - BEGIN -->
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-pce</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-olm</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-servicehandler</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-tapi</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-nbinotifications</artifactId>
-            <version>${transportpce.version}</version>
-        </dependency>
-        <!-- TPCE bundles - END -->
-
-        <dependency>
-            <groupId>io.lighty.modules</groupId>
-            <artifactId>lighty-netconf-sb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.lighty.modules</groupId>
-            <artifactId>lighty-restconf-nb-community</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.jcip</groupId>
-            <artifactId>jcip-annotations</artifactId>
-            <version>1.0</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <version>3.1.3</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-client</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <finalName>tpce</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>True</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <configLocation>odl_checks.xml</configLocation>
-                    <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-                    <!-- <sourceDirectories> are needed so that checkstyle
-                        ignores the generated sources directory -->
-                    <sourceDirectories>
-                        <directory>${project.build.sourceDirectory}</directory>
-                    </sourceDirectories>
-                    <includeResources>true</includeResources>
-                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                    <includeTestResources>true</includeTestResources>
-                    <includes>**\/*.java</includes>
-                    <excludes>
-                        **/protobuff/messages/**,
-                        **/thrift/gen/*.java,
-                        **/module-info.java
-                    </excludes>
-                    <consoleOutput>true</consoleOutput>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>validate</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <finalName>tpce</finalName>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>True</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>odl_checks.xml</configLocation>
+          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+          <!-- <sourceDirectories> are needed so that checkstyle
+            ignores the generated sources directory -->
+          <sourceDirectories>
+            <directory>${project.build.sourceDirectory}</directory>
+          </sourceDirectories>
+          <includeResources>true</includeResources>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <includeTestResources>true</includeTestResources>
+          <includes>**\/*.java</includes>
+          <excludes>
+            **/protobuff/messages/**,
+            **/thrift/gen/*.java,
+            **/module-info.java
+          </excludes>
+          <consoleOutput>true</consoleOutput>
+        </configuration>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
  </project>
diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml

index aa34dfbe65e45e15e0a2275d44c6d73b4afd7cf9..54792eddbe046b1384ae7f4379fec754a6fbed24 100644 (file)
--- a/nbinotifications/pom.xml
+++ b/nbinotifications/pom.xml
@@ -6,65 +6,100 @@
  <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">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>8.0.11</version>
-        <relativePath />
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>8.0.11</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>transportpce-nbinotifications</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>transportpce-nbinotifications</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
  
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kafka.version>2.6.0</kafka.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}.ordmodels</groupId>
-            <artifactId>transportpce-ordmodels-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-            <version>${kafka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-api</artifactId>
-        </dependency>
-        <!-- Testing Dependencies -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>test-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-generator</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <kafka.version>2.6.0</kafka.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-codec-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-clients</artifactId>
+      <version>${kafka.version}</version>
+    </dependency>
+
+    <!-- Testing Dependencies -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>test-common</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
  </project>
diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml

index 699ac6302149f2a1bbc7001cee8ab707dbc7053d..584baccd09fceec9c17ef49d0f22f6882ec2a25b 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -24,6 +24,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  
    <dependencyManagement>
      <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>7.0.14</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
        <dependency>
          <groupId>org.opendaylight.mdsal</groupId>
          <artifactId>mdsal-artifacts</artifactId>
@@ -31,15 +38,143 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
          <scope>import</scope>
          <type>pom</type>
        </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>2.0.13</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
      </dependencies>
    </dependencyManagement>
  
    <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-device</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-network</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>transportpce-common</artifactId>
        <version>${project.version}</version>
      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-model-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-codec-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-runtime-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-runtime-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>ietf-netconf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>ietf-netconf-notifications</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>sal-netconf-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
  
      <!-- Sodium bump: javax.annotation.Nullable and friends -->
      <dependency>
@@ -67,5 +202,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <scope>test</scope>
      </dependency>
    </dependencies>
-
  </project>
diff --git a/olm/pom.xml b/olm/pom.xml

index 50d51da0f289e4bc9b68682f6b8e437dce7bb216..686a533138a25e5a8ddd30610f5fef9c2fbf1ad5 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -23,6 +23,75 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <packaging>bundle</packaging>
  
    <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-device</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-network</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <!-- Sodium bump: javax.annotation.Nullable and friends -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
+      <optional>true</optional>
+    </dependency>
+
      <!-- Testing Dependencies -->
      <dependency>
        <groupId>${project.groupId}</groupId>
@@ -31,9 +100,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <scope>test</scope>
      </dependency>
      <dependency>
-       <groupId>org.opendaylight.mdsal</groupId>
-       <artifactId>mdsal-binding-generator</artifactId>
-       <scope>test</scope>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator</artifactId>
+      <scope>test</scope>
      </dependency>
      <dependency>
        <groupId>org.mockito</groupId>
@@ -55,18 +124,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <artifactId>powermock-module-junit4</artifactId>
        <scope>test</scope>
      </dependency>
-
-    <!-- Sodium bump: javax.annotation.Nullable and friends -->
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
    </dependencies>
  </project>
diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml

index 3dd728c2ea6de955ecac29386655c91352117b60..75653f5ec1ec5cb3b9185e8b5e1ae55bb8c348c2 100644 (file)
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -22,9 +22,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <packaging>bundle</packaging>
  
    <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
      <dependency>
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc6991-ietf-yang-types</artifactId>
      </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
    </dependencies>
  </project>
diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml

index e925f06be893ae9e26abb4b1564066a7c9caf82d..f18a9696d9f89696f85b5fe878222450625739f3 100644 (file)
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -34,17 +34,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    </dependencyManagement>
  
    <dependencies>
-    <!-- ord model dependencies -->
      <dependency>
        <groupId>org.opendaylight.transportpce.ordmodels</groupId>
        <artifactId>transportpce-ordmodels-common</artifactId>
        <version>${project.version}</version>
      </dependency>
-
-    <!-- other model dependencies -->
      <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-netconf</artifactId>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
@@ -54,34 +55,40 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc6991-ietf-yang-types</artifactId>
      </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>ietf-netconf</artifactId>
+    </dependency>
    </dependencies>
  
    <build>
-     <plugins>
-       <plugin>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>maven-bundle-plugin</artifactId>
-         <!--version>3.0.1</version-->
-         <extensions>true</extensions>
-         <configuration>
-           <instructions>
-             <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
-             <_exportcontents>
-               org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.link,
-               org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.links,*
-             </_exportcontents>
-           </instructions>
-         </configuration>
-       </plugin>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-javadoc-plugin</artifactId>
-         <configuration>
-           <sourcepath>*/target/generated-sources/mdsal-binding/*</sourcepath>
-           <excludePackageNames>*</excludePackageNames>
-         </configuration>
-       </plugin>
-     </plugins>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
+            <_exportcontents>
+              org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.link,
+              org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.internal.links,*
+            </_exportcontents>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <sourcepath>*/target/generated-sources/mdsal-binding/*</sourcepath>
+          <excludePackageNames>*</excludePackageNames>
+        </configuration>
+      </plugin>
+    </plugins>
    </build>
-
  </project>
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml

index 2090e6ecec3fe4d50bd0305be37bb2f5ef890bf0..b47a140050db1bf5c6e31f2f52e89d07f3d6ba8c 100644 (file)
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -22,14 +22,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <packaging>bundle</packaging>
  
    <dependencies>
-    <!-- ord model dependencies -->
      <dependency>
        <groupId>org.opendaylight.transportpce.ordmodels</groupId>
        <artifactId>transportpce-ordmodels-common</artifactId>
        <version>${project.version}</version>
      </dependency>
-
-    <!-- other model dependencies -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
      <dependency>
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc6991-ietf-inet-types</artifactId>
@@ -38,8 +43,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc6991-ietf-yang-types</artifactId>
      </dependency>
-
-    <!-- to upgrade topology to 4.1 -->
      <dependency>
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc8345-ietf-network-topology</artifactId>
@@ -48,5 +51,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc8345-ietf-network</artifactId>
      </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
    </dependencies>
  </project>
diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml

index 6342c531a8e6a2b79346c28a3fbb74e46a99d470..8ae2894eed5ad18184aa896adb4361fe9c8ca6e3 100644 (file)
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -52,7 +52,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
            <excludePackageNames>*</excludePackageNames>
          </configuration>
        </plugin>
-<!-- skipping test since this is a util project / folder -->
+      <!-- skipping test since this is a util project / folder -->
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-surefire-plugin</artifactId>
diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml

index a384152a94602d805428f0c4700cbe44dafada9a..10fa8223daeb82b66b8bf577262dd3843cfebb7a 100644 (file)
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -22,14 +22,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <packaging>bundle</packaging>
  
    <dependencies>
-    <!-- ord model dependencies -->
      <dependency>
        <groupId>org.opendaylight.transportpce.ordmodels</groupId>
        <artifactId>transportpce-ordmodels-common</artifactId>
        <version>${project.version}</version>
      </dependency>
-
-    <!-- other model dependencies -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
      <dependency>
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc6991-ietf-inet-types</artifactId>
@@ -38,5 +43,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
        <artifactId>rfc6991-ietf-yang-types</artifactId>
      </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
    </dependencies>
  </project>
diff --git a/pce/pom.xml b/pce/pom.xml

index 8bff084efc9c50e542fdad3fcbb0e2e04d72a182..7d340d04edc94f98feb4649b5cb18726e8c84054 100644 (file)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -9,130 +9,257 @@
      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">
  
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>8.0.11</version>
-        <relativePath />
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>8.0.11</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>transportpce-pce</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>transportpce-pce</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
  
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jgrapht</groupId>
-            <artifactId>jgrapht-core</artifactId>
-            <version>1.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-runtime-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.ext</groupId>
-            <artifactId>jersey-proxy-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>test-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-generator</artifactId>
-            <scope>test</scope>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-device</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-network</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-model-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-codec-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-runtime-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-runtime-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.ext</groupId>
+      <artifactId>jersey-proxy-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jgrapht</groupId>
+      <artifactId>jgrapht-core</artifactId>
+      <version>1.2.0</version>
+    </dependency>
  
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-grizzly2-http</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.test-framework</groupId>
-            <artifactId>jersey-test-framework-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
-            <version>1.2.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <!-- Testing Dependencies -->
+    <dependency>
+      <groupId>org.opendaylight.transportpce</groupId>
+      <artifactId>test-common</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.containers</groupId>
+      <artifactId>jersey-container-grizzly2-http</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.test-framework</groupId>
+      <artifactId>jersey-test-framework-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+      <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-http-server</artifactId>
+      <version>2.4.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>javax.activation-api</artifactId>
+      <version>1.2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
  </project>
diff --git a/pom.xml b/pom.xml

index 02c57461b6e2320cdb72a0c93559f6d8026648aa..4891b6f8844b25bf36e37a8e20654881b8bc70eb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,73 +7,73 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
  -->
  <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">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>9.0.13</version>
-        <relativePath/>
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>9.0.13</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>transportpce-aggregator</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <name>transportpce</name>
-    <packaging>pom</packaging>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>transportpce-aggregator</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <name>transportpce</name>
+  <packaging>pom</packaging>
  
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/transportpce.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/transportpce.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/display/ODL/TransportPCE</url>
-    </scm>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/transportpce.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/transportpce.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/display/ODL/TransportPCE</url>
+  </scm>
  
-    <modules>
-        <module>ordmodels</module>
-        <module>tapimodels</module>
-        <module>api</module>
-        <module>common</module>
-        <module>test-common</module>
-        <module>renderer</module>
-        <module>networkmodel</module>
-        <module>inventory</module>
-        <module>olm</module>
-        <module>pce</module>
-        <module>servicehandler</module>
-        <module>tapi</module>
-        <module>nbinotifications</module>
-        <module>dmaap-client</module>
-        <module>features</module>
-        <module>karaf</module>
-    </modules>
+  <modules>
+    <module>ordmodels</module>
+    <module>tapimodels</module>
+    <module>api</module>
+    <module>common</module>
+    <module>test-common</module>
+    <module>renderer</module>
+    <module>networkmodel</module>
+    <module>inventory</module>
+    <module>olm</module>
+    <module>pce</module>
+    <module>servicehandler</module>
+    <module>tapi</module>
+    <module>nbinotifications</module>
+    <module>dmaap-client</module>
+    <module>features</module>
+    <module>karaf</module>
+  </modules>
  
-    <build>
-        <plugins>
-            <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-javadoc-plugin</artifactId>
-                <configuration>
-                    <sourcepath>*/target/generated-sources/mdsal-binding/*</sourcepath>
-                    <excludePackageNames>*</excludePackageNames>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <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-javadoc-plugin</artifactId>
+        <configuration>
+          <sourcepath>*/target/generated-sources/mdsal-binding/*</sourcepath>
+          <excludePackageNames>*</excludePackageNames>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
  
  </project>
  
diff --git a/renderer/pom.xml b/renderer/pom.xml

index 6cd224479b5398a2b3ce7fab1526b804db6e64b2..b1b0f0e85b328223739ad9a9fe32da99de00a147 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -23,6 +23,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <packaging>bundle</packaging>
  
    <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-device</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-network</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>transportpce-common</artifactId>
@@ -33,6 +58,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <artifactId>transportpce-networkmodel</artifactId>
        <version>${project.version}</version>
      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
      <!-- Testing Dependencies -->
      <dependency>
        <groupId>${project.groupId}</groupId>
@@ -46,5 +96,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <scope>test</scope>
      </dependency>
    </dependencies>
-
  </project>
diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml

index d66118bbf8fd418343c6f68363d06462a63a0b62..0cd5a205764036af4f767a8e03700a3db89a1c52 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -25,6 +25,36 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
    <packaging>bundle</packaging>
  
    <dependencies>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-network</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-networkmodel</artifactId>
+      <version>${project.version}</version>
+    </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>transportpce-pce</artifactId>
@@ -35,6 +65,34 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
        <artifactId>transportpce-renderer</artifactId>
        <version>${project.version}</version>
      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
  
      <!-- Testing Dependencies -->
      <dependency>
@@ -44,10 +102,9 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
        <scope>test</scope>
      </dependency>
      <dependency>
-       <groupId>org.opendaylight.mdsal</groupId>
-       <artifactId>mdsal-binding-generator</artifactId>
-       <scope>test</scope>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator</artifactId>
+      <scope>test</scope>
      </dependency>
    </dependencies>
-
  </project>
diff --git a/tapi/pom.xml b/tapi/pom.xml

index 6a2509596b84c4d039638ddc572c52a935ed8aac..4d4588f914c7808c3461d6de9de96786b793a058 100644 (file)
--- a/tapi/pom.xml
+++ b/tapi/pom.xml
@@ -24,20 +24,32 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
    <version>5.0.0-SNAPSHOT</version>
    <packaging>bundle</packaging>
  
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>2.0.14</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
    <dependencies>
      <dependency>
        <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-api</artifactId>
+      <artifactId>transportpce-tapimodels</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-tapimodels</artifactId>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-common</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
        <groupId>${project.groupId}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-common</artifactId>
+      <artifactId>transportpce-ordmodels-device</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
@@ -51,20 +63,79 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
        <version>${project.version}</version>
      </dependency>
      <dependency>
-      <groupId>${project.groupId}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-device</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-servicehandler</artifactId>
+      <artifactId>transportpce-common</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-common</artifactId>
+      <artifactId>transportpce-networkmodel</artifactId>
        <version>${project.version}</version>
      </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-renderer</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-pce</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-servicehandler</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>sal-netconf-connector</artifactId>
+    </dependency>
  
      <!-- Sodium bump: javax.annotation.Nullable and friends -->
      <dependency>
@@ -75,18 +146,6 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
      </dependency>
  
      <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <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>test-common</artifactId>
@@ -94,15 +153,19 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
        <scope>test</scope>
      </dependency>
      <dependency>
-       <groupId>org.opendaylight.mdsal</groupId>
-       <artifactId>mdsal-binding-generator</artifactId>
-       <scope>test</scope>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
      </dependency>
      <dependency>
        <groupId>org.mockito</groupId>
        <artifactId>mockito-core</artifactId>
        <scope>test</scope>
      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator</artifactId>
+      <scope>test</scope>
+    </dependency>
    </dependencies>
-
  </project>
diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml

index 7dff629c28a4fd8797a40e7c6b74cd389b7f9b45..8ef00a52766b50000622cb9af7cb8855f7381e20 100644 (file)
--- a/tapimodels/pom.xml
+++ b/tapimodels/pom.xml
@@ -21,4 +21,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <version>5.0.0-SNAPSHOT</version>
    <packaging>bundle</packaging>
  
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+  </dependencies>
  </project>
diff --git a/test-common/pom.xml b/test-common/pom.xml

index 234ab71f324771b2ee0824f29c0543c359d69752..3e40288b93b4870007c1fb9ca81306e447b9c209 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -5,70 +5,135 @@
      and is available at http://www.eclipse.org/legal/epl-v10.html Author: Martial Coulibaly <martial.coulibaly@gfi.com>
      on behalf of Orange -->
  <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">
-    <modelVersion>4.0.0</modelVersion>
+  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">
+  <modelVersion>4.0.0</modelVersion>
  
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>8.0.11</version>
-        <relativePath />
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>8.0.11</version>
+    <relativePath/>
+  </parent>
  
-    <groupId>org.opendaylight.transportpce</groupId>
-    <artifactId>test-common</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>2.0.14</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <groupId>org.opendaylight.transportpce</groupId>
+  <artifactId>test-common</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+
+  <dependencyManagement>
      <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-codec-xml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-codec-gson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-runtime-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-        </dependency>
-        <!-- Aluminium bump: undocumented new dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-broker</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-inmemory-datastore</artifactId>
-        </dependency>
-        <!-- Sodium bump: javax.annotation.Nullable and friends -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-            <optional>true</optional>
-        </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>2.0.14</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
      </dependencies>
+  </dependencyManagement>
  
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>transportpce-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-model-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-model-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-codec-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-data-codec-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-dom-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-dom-spi</artifactId>
+    </dependency>
+    <!-- Aluminium bump: undocumented new dependencies -->
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-dom-broker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-dom-inmemory-datastore</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-common-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-adapter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-runtime-spi</artifactId>
+    </dependency>
+    <!-- Sodium bump: javax.annotation.Nullable and friends -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+  </dependencies>
  </project>
author	Gilles Thouenon <gilles.thouenon@orange.com>
	Fri, 25 Feb 2022 14:03:33 +0000 (15:03 +0100)
committer	Guillaume Lambert <guillaume.lambert@orange.com>
	Wed, 2 Mar 2022 07:39:57 +0000 (07:39 +0000)
api/pom.xml		patch \| blob \| history
common/pom.xml		patch \| blob \| history
dmaap-client/pom.xml		patch \| blob \| history
features/odl-transportpce-dmaap-client/pom.xml		patch \| blob \| history
features/odl-transportpce-inventory/pom.xml		patch \| blob \| history
features/odl-transportpce-nbinotifications/pom.xml		patch \| blob \| history
features/odl-transportpce-swagger/pom.xml		patch \| blob \| history
features/odl-transportpce-tapi/pom.xml		patch \| blob \| history
features/odl-transportpce/pom.xml		patch \| blob \| history
inventory/pom.xml		patch \| blob \| history
karaf/pom.xml		patch \| blob \| history
lighty/pom.xml		patch \| blob \| history
nbinotifications/pom.xml		patch \| blob \| history
networkmodel/pom.xml		patch \| blob \| history
olm/pom.xml		patch \| blob \| history
ordmodels/common/pom.xml		patch \| blob \| history
ordmodels/device/pom.xml		patch \| blob \| history
ordmodels/network/pom.xml		patch \| blob \| history
ordmodels/pom.xml		patch \| blob \| history
ordmodels/service/pom.xml		patch \| blob \| history
pce/pom.xml		patch \| blob \| history
pom.xml		patch \| blob \| history
renderer/pom.xml		patch \| blob \| history
servicehandler/pom.xml		patch \| blob \| history
tapi/pom.xml		patch \| blob \| history
tapimodels/pom.xml		patch \| blob \| history
test-common/pom.xml		patch \| blob \| history