Cleanup and optimize POM

JIRA: TRNSPRTPCE-181
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I3229c20ca0df736a9845a4aa782b80bd6ab02317

diff --git a/api/pom.xml b/api/pom.xml
index af7987fcc36dcbd88824affb2163d453ad1ddb26..1a23c27c53fab388e3178b2893709aa5b25dbacf 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -37,10 +37,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>transportpce-ordmodels-service</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-inet-types</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>transportpce-tapimodels</artifactId>
@@ -87,5 +83,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       </plugin>
     </plugins>
   </reporting>
-
 </project>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
deleted file mode 100644 (file)
index 54159a1..0000000
--- a/artifacts/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 Orange and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-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>
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>5.0.4</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.transportpce</groupId>
-  <artifactId>transportpce-artifacts</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>transportpce-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <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}.ordmodels</groupId>
-        <artifactId>transportpce-ordmodels-device</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>transportpce-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/common/pom.xml b/common/pom.xml
index 7508c44f916e167f1d86dd1212008f2369922b84..012f3df11dfc68676dc2000c6e81a2c1525c339f 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -21,13 +21,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.10.2-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
@@ -38,7 +31,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.3</version>
+                <version>4.0.8</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -46,61 +39,23 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-topology</artifactId>
-        </dependency>
-<!-- Bump to  Fluorine
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-network-2015-06-08</artifactId>
-        </dependency>
--->
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}.ordmodels</groupId>
             <artifactId>transportpce-ordmodels-device</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-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>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>transportpce-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
-
-        <!-- Testing Dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
         </dependency>
 
         <!-- Sodium bump: javax.annotation.Nullable and friends -->
@@ -124,6 +79,4 @@
       </plugin>
     </plugins>
   </build>
-
-
 </project>

diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
deleted file mode 100644 (file)
index d2ac03b..0000000
--- a/features/features-transportpce/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 Orange and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-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>
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>feature-repo-parent</artifactId>
-    <version>5.0.4</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.transportpce</groupId>
-  <artifactId>features-transportpce</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce-api</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce-ordmodels</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce-inventory</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <!--dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce-stubmodels</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency-->
-  </dependencies>
-</project>

diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 58b7207d2449fdea638823c604d456d614a49d69..25e3e06df4d4d41d7c9fc3a9e7b99a708862d67f 100644 (file)
--- a/features/odl-transportpce-api/pom.xml
+++ b/features/odl-transportpce-api/pom.xml
@@ -21,15 +21,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
+  <name>OpenDaylight :: transportpce :: api</name>
 
   <properties>
     <netconf.version>1.7.2-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
-
-<name>OpenDaylight :: transportpce :: api</name>
-
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -38,26 +36,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <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}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-device</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>transportpce-api</artifactId>
@@ -78,5 +56,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </plugin>
     </plugins>
   </build>
-
 </project>

diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml
index 74da3a0d6912521c0b542b93e3861f9fc5c8b824..a6c52cc820fa55ae2e28e1727d5cfe8ebf109eb4 100644 (file)
--- a/features/odl-transportpce-inventory/pom.xml
+++ b/features/odl-transportpce-inventory/pom.xml
@@ -18,6 +18,8 @@
     <version>0.5.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
+    <name>OpenDaylight :: transportpce :: Inventory</name>
+
     <properties>
         <transportpce.db.host>localhost:3306</transportpce.db.host>
         <transportpce.db.database>transportpce</transportpce.db.database>
@@ -30,74 +32,71 @@
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
     </properties>
 
-    <name>OpenDaylight :: transportpce :: Inventory</name>
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>transportpce-inventory</artifactId>
+            <artifactId>odl-transportpce</artifactId>
             <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.transportpce</groupId>
-            <artifactId>odl-transportpce</artifactId>
+            <artifactId>transportpce-inventory</artifactId>
             <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
         </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>
+      <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-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index 6b8b72bbe8aa8b2a3347197d37cbeee2d08d4370..1f69cf788c768912b647b3e1c965c779d4e57ccf 100644 (file)
--- a/features/odl-transportpce-ordmodels/pom.xml
+++ b/features/odl-transportpce-ordmodels/pom.xml
@@ -21,16 +21,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <properties>
-    <mdsal.version>1.10.2-SNAPSHOT</mdsal.version>
-    <restconf.version>1.10.2-SNAPSHOT</restconf.version>
-    <yangtools.version>3.0.7</yangtools.version>
-    <netconf.version>1.7.2-SNAPSHOT</netconf.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-
-
-<name>OpenDaylight :: transportpce :: ordmodels</name>
+  <name>OpenDaylight :: transportpce :: ordmodels</name>
 
   <dependencies>
     <dependency>
@@ -68,5 +59,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </plugin>
     </plugins>
   </build>
-
 </project>

diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml
deleted file mode 100644 (file)
index 0dee03b..0000000
--- a/features/odl-transportpce-stubmodels/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 Orange and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-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>
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>single-feature-parent</artifactId>
-    <version>5.0.4</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.transportpce</groupId>
-  <artifactId>odl-transportpce-stubmodels</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-
-
-  <properties>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-
-
-<name>OpenDaylight :: transportpce :: stubmodels</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce-ordmodels</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-transportpce-api</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <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}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-device</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-stubmodels</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-<!-- skipping test since this is a util project / folder -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18.1</version>
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 8edc04a39fa2437945b8aef22b50f84d5f4b6d39..d6b1670ff95f218881080a7905f761f580796793 100644 (file)
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -21,58 +21,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
+  <name>OpenDaylight :: transportpce</name>
 
   <properties>
     <mdsal.version>1.10.2-SNAPSHOT</mdsal.version>
-    <yangtools.version>3.0.7</yangtools.version>
     <netconf.version>1.7.2-SNAPSHOT</netconf.version>
     <restconf.version>1.10.2-SNAPSHOT</restconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
-  <name>OpenDaylight :: transportpce</name>
-
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-restconf-all</artifactId>
-      <version>${restconf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>odl-mdsal-broker</artifactId>
-      <version>${mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-netconf-all</artifactId>
-      <version>${netconf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-netconf-connector-all</artifactId>
-      <version>${netconf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>netconf-console</artifactId>
-      <version>${netconf.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-netconf-topology</artifactId>
-      <version>${netconf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.transportpce</groupId>
       <artifactId>odl-transportpce-api</artifactId>
@@ -80,13 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.transportpce</groupId>
-      <artifactId>odl-transportpce-ordmodels</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.transportpce</groupId>
       <artifactId>transportpce-common</artifactId>
@@ -94,22 +45,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
     <dependency>
       <groupId>org.opendaylight.transportpce</groupId>
-      <artifactId>transportpce-networkmodel</artifactId>
+      <artifactId>transportpce-renderer</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.transportpce</groupId>
-      <artifactId>transportpce-pce</artifactId>
+      <artifactId>transportpce-networkmodel</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.transportpce</groupId>
-      <artifactId>transportpce-renderer</artifactId>
+      <artifactId>transportpce-olm</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.transportpce</groupId>
-      <artifactId>transportpce-olm</artifactId>
+      <artifactId>transportpce-pce</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -127,6 +78,35 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>transportpce-tapi</artifactId>
       <version>${project.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>odl-mdsal-broker</artifactId>
+      <version>${mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-restconf-all</artifactId>
+      <version>${restconf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-netconf-all</artifactId>
+      <version>${netconf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>odl-netconf-connector-all</artifactId>
+      <version>${netconf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
   </dependencies>
 
 <!-- skipping test since this is an umbrella project / folder -->
@@ -142,6 +122,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </plugin>
     </plugins>
   </build>
-
-
 </project>

diff --git a/features/pom.xml b/features/pom.xml
index c35d36662619432b2bd3b8da436160b18cefc162..4fcd8f83403a40e1c50b202cb09a8be85ea142a6 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -23,12 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>pom</packaging>
 
   <modules>
-    <module>features-transportpce</module>
-    <module>odl-transportpce-api</module>
     <module>odl-transportpce-ordmodels</module>
-    <!--module>odl-transportpce-stubmodels</module-->
+    <module>odl-transportpce-api</module>
     <module>odl-transportpce</module>
     <module>odl-transportpce-inventory</module>
   </modules>
-
 </project>

diff --git a/inventory/pom.xml b/inventory/pom.xml
index 6b00f1b7fb9e9676330ff85932010bf0af1d6684..5b5609eee72d25077ed65af1489494cd2124344f 100644 (file)
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -19,64 +19,11 @@
     <version>0.5.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.10.2-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>1.7.2-SNAPSHOT</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>${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>${project.groupId}</groupId>
-            <artifactId>transportpce-renderer</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-topology</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <!--dependency>
-            <groupId>org.apache.karaf.scheduler</groupId>
-            <artifactId>org.apache.karaf.scheduler.core</artifactId>
-            <version>4.0.9</version>
-            <scope>provided</scope>
-        </dependency-->
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>transportpce-common</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
-
 </project>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 722ef13b60132c4e60f00cd5a3628cc4edd857fc..906ebd139a9414a38ba1f2ba85e667ac2b3a6231 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -19,68 +19,47 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-karaf</artifactId>
   <version>0.5.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
   <packaging>pom</packaging>
+  <name>${project.artifactId}</name>
 
-    <properties>
-        <karaf.localFeature>odl-transportpce</karaf.localFeature>
-        <device.yang.jar.extract.directory>
-            ${project.build.outputDirectory}/../yang-models/schema
-        </device.yang.jar.extract.directory>
-        <device.yang.final.directory>
-            ${project.build.outputDirectory}/../assembly/cache/schema
-        </device.yang.final.directory>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>transportpce-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.ordmodels</groupId>
-                <artifactId>transportpce-ordmodels-device</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <properties>
+    <karaf.localFeature>odl-transportpce</karaf.localFeature>
+    <device.yang.jar.extract.directory>
+        ${project.build.outputDirectory}/../yang-models/schema
+    </device.yang.jar.extract.directory>
+    <device.yang.final.directory>
+        ${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
+  <dependencies>
+    <dependency>
+    <!-- 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>features-transportpce</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-     <build>
-         <plugins>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-deploy-plugin</artifactId>
-                 <configuration>
-                     <skip>true</skip>
-                 </configuration>
-             </plugin>
-         </plugins>
-     </build>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>framework</artifactId>
+      <type>kar</type>
+    </dependency>
 
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-transportpce</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index 790e57929cb89f73043f9e58c980a1853dc76255..61cea4df6091a76f16c11709edc81fe82a8437fd 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -22,56 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>1.7.2-SNAPSHOT</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>${project.groupId}</groupId>
       <artifactId>transportpce-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}</groupId>
-      <artifactId>transportpce-renderer</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>sal-netconf-connector</artifactId>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
 
     <!-- Sodium bump: javax.annotation.Nullable and friends -->
     <dependency>
@@ -79,6 +35,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>jsr305</artifactId>
       <optional>true</optional>
     </dependency>
-
   </dependencies>
 </project>

diff --git a/olm/pom.xml b/olm/pom.xml
index 74690a29a31fc5cac9eb46c5d7685dd077522abb..f5ca9820852e8268385282a2ccb10da5745f5f67 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -22,56 +22,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>1.10.2-SNAPSHOT</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>1.7.2-SNAPSHOT</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
+    <!-- Testing Dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-api</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-common</artifactId>
+      <artifactId>test-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-topology</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>sal-netconf-connector</artifactId>
-    </dependency>
 
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
@@ -83,12 +41,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-    <groupId>${project.groupId}</groupId>
-    <artifactId>test-common</artifactId>
-    <version>${project.version}</version>
-    </dependency>
-
     <!-- Sodium bump: javax.annotation.Nullable and friends -->
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
@@ -96,5 +48,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <optional>true</optional>
     </dependency>
   </dependencies>
-
 </project>

diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 6c0413041bb4dad05fe63a0cc1f733d68577459e..ecc92ed96dfb677833585c60c179079fdfa12d32 100644 (file)
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -21,18 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.3</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 3ae653498c653b039ce94d18ab41125f6a46141e..14761e71db0cf25b9f92def2d621da7c9f0ad477 100644 (file)
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -30,13 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.3</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 36130e4221042411bf4ffcef50fb96ebe44611cd..e6f78405a4f9319bfc8aa501774058c87cee1bc7 100644 (file)
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -21,18 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.3</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <!-- ord model dependencies -->
     <dependency>
@@ -56,17 +44,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc8345</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.binding.model.ietf</groupId>
-      <artifactId>rfc8345-ietf-network-topology-state</artifactId>
-    </dependency-->
   </dependencies>
 </project>

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index 0bcba205aa6d163ab943cd242d3cc447097590db..1fff50a3dea5df8d05c851176a5dc6d1277aecfd 100644 (file)
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -76,71 +76,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       </plugin>
     </plugins>
   </reporting>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>1.7.2-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.3</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-netconf</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.model</groupId>
-      <artifactId>iana-afn-safi</artifactId>
-      <version>2013.07.04.16.3</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-access-control-list</artifactId>
-    </dependency>
-    <!--dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>2014.05.08.13.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-interfaces</artifactId>
-      <version>2014.05.08.13.2-SNAPSHOT</version>
-    </dependency-->
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
-      <artifactId>iana-if-type</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc7223</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-packet-fields</artifactId>
-    </dependency>
-  </dependencies>
-
 </project>

diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index d1be640a3989ea228a5270aed93ff5efb66be159..908a92fa30045582df1f89f01d204f1b995aa01a 100644 (file)
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -21,18 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.3</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <!-- ord model dependencies -->
     <dependency>

diff --git a/pce/pom.xml b/pce/pom.xml
index 43cff90492067ea7853b9f05e920b0daa7a74ce2..b010e323da4f3d3e5e61a064fd04778d6a08f83f 100644 (file)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -26,35 +26,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-api</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-common</artifactId>
@@ -66,35 +38,6 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <version>1.2.0</version>
     </dependency>
 
-    <!-- Testing Dependencies -->
-    <dependency>
-      <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>${project.groupId}</groupId>
-      <artifactId>test-common</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-      <version>1.10.2-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-codec</artifactId>
-    </dependency>
-
     <!-- Sodium bump: javax.annotation.Nullable and friends -->
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
@@ -111,4 +54,20 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     </repository>
   </repositories>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

diff --git a/pom.xml b/pom.xml
index ce0eec7215db17121d929f334b6f50097a1992cd..a6dca6ff9bf87314b16ef83859a88ca6a3f3ff85 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,36 +29,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </scm>
 
   <modules>
-    <module>artifacts</module>
     <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>tests</module-->
     <module>pce</module>
     <module>servicehandler</module>
     <module>tapi</module>
     <module>features</module>
     <module>karaf</module>
-    <module>test-common</module>
   </modules>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <!--
-      Jenkins-releng tests reports more than 600 lines of javadoc warnings on ordmodels
-      and api folders generated-sources for unclear reasons.
-      This behavior was impossible to reproduce locally.
-      The javadoc plugin build section below removes most of those useless warnings.
-      ordmodels/pom.xml and api/pom.xml have been modified similarly with a build and
-      a reporting sections to remove the rest of the warnings.
-      Note that javadoc plugins maven implementation still suffers from several bugs.
-      Tests shows that many configurations options are not correctly supported.
-      (proxy, sourceFilesExclude, etc...).
-  -->
   <build>
     <plugins>
       <plugin>

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 835fa4f5836f7fed49126bb69387abdf8b3abcce..fd457df479df1e93d70e3bc5bc324f267a2f43f3 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -22,49 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>1.10.2-SNAPSHOT</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>1.7.2-SNAPSHOT</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>${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.controller.model</groupId>
-      <artifactId>model-topology</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>sal-netconf-connector</artifactId>
-    </dependency>
 
     <!-- Testing Dependencies -->
     <dependency>
@@ -73,17 +36,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.19.0</version>
-      <scope>test</scope>
-    </dependency>
 
     <!-- Sodium bump: javax.annotation.Nullable and friends -->
     <dependency>
@@ -91,7 +43,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>jsr305</artifactId>
         <optional>true</optional>
     </dependency>
-
   </dependencies>
-
 </project>

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index c1f4a64862d6a65564e5e33dc8d02faa11c22ebf..74b3960b2bd56f78ae3293a776ecf6b41e1ca3b5 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -24,44 +24,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>1.10.2-SNAPSHOT</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>${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}.ordmodels</groupId>
-      <artifactId>transportpce-ordmodels-device</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>transportpce-pce</artifactId>
@@ -69,38 +32,16 @@ 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>test-common</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</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>transportpce-renderer</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml
index ece3de23d949123601b46b4d6bf89f3d56ada286..feffd258fa8194cfed9d065d7ad1044c161a8f9c 100644 (file)
--- a/tapimodels/pom.xml
+++ b/tapimodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.4</version>
+    <version>4.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/test-common/pom.xml b/test-common/pom.xml
index e4f3c0a1cd000060f104d589bf3cfcc4aa59424a..699e09f6761ab6f2b249f8fb014cde5e5e1729ac 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -20,56 +20,7 @@
     <version>0.5.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.10.2-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>3.0.7</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</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>${project.groupId}</groupId>
             <artifactId>transportpce-common</artifactId>
@@ -82,6 +33,5 @@
             <artifactId>jsr305</artifactId>
             <optional>true</optional>
         </dependency>
-
     </dependencies>
 </project>