Code Review / packetcable.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump to odlparent 3.1.0 and yangtools 2.0.3
[packetcable.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 0eadfec317f7caf7e18541987bcf208a0e5359a9..d1a45ef42f89671132d19b468dc4b180358cff55 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-
-       <groupId>org.opendaylight.packetcable</groupId>
-       <artifactId>packetcable</artifactId>
-       <name>packetcable</name> <!-- Used by Sonar to set project name -->
-       <packaging>pom</packaging>
-
+<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>
+    <!-- FIXME: Do not use sal-parent, use odlparent:odlparent or mdsal:binding-parent intstead. -->
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>3.1.0</version>
+        <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.packetcable</groupId>
+    <artifactId>packetcable</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <name>packetcable</name> <!-- Used by Sonar to set project name -->
+    <packaging>pom</packaging>
     <properties>
-      <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
+        <openflowplugin.version>0.7.0-SNAPSHOT</openflowplugin.version>
+        <controller.model.version>1.8.0-SNAPSHOT</controller.model.version>
     </properties>
-
-   <distributionManagement>
+    <distributionManagement>
         <!-- OpenDayLight Released artifact -->
         <repository>
             <id>opendaylight-release</id>
@@ -30,75 +30,61 @@
         </snapshotRepository>
     </distributionManagement>
 
-       <modules>
-               <module>packetcable-driver</module>
-               <module>packetcable-model</module>
-               <module>packetcable-provider</module>
-               <module>packetcable-consumer</module>
-               <module>features-packetcable</module>
-               <module>packetcable-config</module>
-               <module>packetcable-karaf</module>
-       </modules>
-       <scm>
-               <connection>scm:git:ssh://git.opendaylight.org:29418/packetcable.git</connection>
-               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/packetcable.git</developerConnection>
-               <tag>HEAD</tag>
-               <url>https://wiki.opendaylight.org/view/PacketCablePCMM:Main</url>
-       </scm>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.openflowplugin.model</groupId>
-                       <artifactId>model-flow-base</artifactId>
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-artifacts</artifactId>
+            <version>2.5.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>mdsal-model-artifacts</artifactId>
+            <version>0.13.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>packetcable-driver</module>
+        <!-- New modules for the new Arris API -->
+        <module>packetcable-policy-model</module>
+        <module>packetcable-policy-server</module>
+        <module>features-packetcable-policy</module>
+        <module>packetcable-policy-karaf</module>
+        <!-- Jar module CMTS emulator for testing -->
+        <module>packetcable-emulator</module>
+    </modules>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/packetcable.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/packetcable.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/view/PacketCablePCMM:Main</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
             <version>${openflowplugin.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.openflowplugin.model</groupId>
-                       <artifactId>model-flow-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-service</artifactId>
             <version>${openflowplugin.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-inet-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>ietf-yang-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller.model</groupId>
-                       <artifactId>model-inventory</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools.model</groupId>
-                       <artifactId>opendaylight-l2-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.openflowplugin.model</groupId>
-                       <artifactId>model-flow-statistics</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-inventory</artifactId>
+            <version>${controller.model.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-statistics</artifactId>
             <version>${openflowplugin.version}</version>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-checkstyle-plugin</artifactId>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-
-
-       <!-- <profiles> -->
-       <!-- <profile> -->
-       <!-- <id>integrationtests</id> -->
-       <!-- <activation> -->
-       <!-- <activeByDefault>false</activeByDefault> -->
-       <!-- </activation> -->
-       <!-- <modules> -->
-       <!-- <module>packetcable-it</module> -->
-       <!-- </modules> -->
-       <!-- </profile> -->
-       <!-- </profiles> -->
+        </dependency>
+    </dependencies>
 </project>
PacketCable