Code Review / netconf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bug 6797 - Fix deadlock on cached schema-changed notifications
[netconf.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 385c45d4117299cf13faf73ba20763a45e65d08d..6eb8222ca59a597e1d36285dfc8be5660a9d15d6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
@@ -19,38 +19,88 @@
         <module>opendaylight/restconf</module>
 
         <module>features</module>
+        <module>karaf</module>
     </modules>
 
     <properties>
-        <config.netconf.client.configfile>01-netconf.xml</config.netconf.client.configfile>
-        <config.netconf.topology.configfile>02-netconf-topology.xml</config.netconf.topology.configfile>
-        <config.netconf.mdsal.configfile>08-mdsal-netconf.xml</config.netconf.mdsal.configfile>
-        <config.restconf.configfile>10-rest-connector.xml</config.restconf.configfile>
-        <config.netconf.connector.configfile>99-netconf-connector.xml</config.netconf.connector.configfile>
-
-        <aaa.version>0.3.0-SNAPSHOT</aaa.version>
-        <commons.logback_settings.version>0.2.0-SNAPSHOT</commons.logback_settings.version>
-        <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-        <config.version>0.4.0-SNAPSHOT</config.version>
+        <aaa.version>0.3.4-SNAPSHOT</aaa.version>
+        <akka.version>2.3.14</akka.version>
+        <commons.logback_settings.version>0.2.4-SNAPSHOT</commons.logback_settings.version>
+        <commons.opendaylight.version>1.6.4-SNAPSHOT</commons.opendaylight.version>
+        <config.version>0.4.4-SNAPSHOT</config.version>
+        <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
         <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
-        <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-        <ietf-inet-types.version>2010.09.24.8-SNAPSHOT</ietf-inet-types.version>
-        <ietf-restconf.version>2013.10.19.8-SNAPSHOT</ietf-restconf.version>
-        <ietf-topology.version>2013.10.21.8-SNAPSHOT</ietf-topology.version>
-        <ietf-yang-types.version>2010.09.24.8-SNAPSHOT</ietf-yang-types.version>
-        <jersey-servlet.version>1.17</jersey-servlet.version>
-        <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-        <netconf.version>0.4.0-SNAPSHOT</netconf.version>
-        <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
+        <features.test.version>1.6.4-SNAPSHOT</features.test.version>
+        <ietf-inet-types.version>2010.09.24.8.4-SNAPSHOT</ietf-inet-types.version>
+        <ietf-restconf.version>2013.10.19.8.4-SNAPSHOT</ietf-restconf.version>
+        <ietf-topology.version>2013.10.21.8.4-SNAPSHOT</ietf-topology.version>
+        <ietf-yang-types.version>2010.09.24.8.4-SNAPSHOT</ietf-yang-types.version>
+
+        <mdsal.version>2.0.4-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.8.4-SNAPSHOT</mdsal.model.version>
+        <controller.mdsal.version>1.3.4-SNAPSHOT</controller.mdsal.version>
+        <netconf.version>1.0.4-SNAPSHOT</netconf.version>
+        <restconf.version>1.3.4-SNAPSHOT</restconf.version>
+        <protocol-framework.version>0.7.4-SNAPSHOT</protocol-framework.version>
         <sshd-core.version>0.14.0</sshd-core.version>
+        <scala.major.version>2.11</scala.major.version>
+        <scala.minor.version>7</scala.minor.version>
         <surefire.version>2.15</surefire.version>
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>0.8.4-SNAPSHOT</yangtools.version>
 
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 
     </properties>
 
+
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yangtools-artifacts</artifactId>
+            <version>${yangtools.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.mdsal</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>${mdsal.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.mdsal.model</groupId>
+          <artifactId>mdsal-model-artifacts</artifactId>
+          <version>${mdsal.model.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.aaa</groupId>
+          <artifactId>aaa-artifacts</artifactId>
+          <version>${aaa.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-artifacts</artifactId>
+          <version>${config.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>${controller.mdsal.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -70,7 +120,7 @@
                         <dependency>
                             <groupId>org.opendaylight.controller</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>0.2.0-SNAPSHOT</version>
+                            <version>0.2.4-SNAPSHOT</version>
                         </dependency>
                     </dependencies>
                     <executions>
@@ -127,13 +177,13 @@
                             <version>${config.version}</version>
                         </dependency>
                         <dependency>
-                            <groupId>org.opendaylight.yangtools</groupId>
+                            <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
                             <version>${yangtools.version}</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
-                            <groupId>org.opendaylight.yangtools</groupId>
+                            <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>yang-binding</artifactId>
                             <version>${yangtools.version}</version>
                             <type>jar</type>
@@ -159,6 +209,25 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                   <artifactId>maven-clean-plugin</artifactId>
+                   <configuration>
+                       <filesets>
+                         <fileset>
+                            <directory>${jmxGeneratorPath}</directory>
+                            <includes>
+                               <include>**</include>
+                            </includes>
+                         </fileset>
+                         <fileset>
+                            <directory>${salGeneratorPath}</directory>
+                            <includes>
+                               <include>**</include>
+                            </includes>
+                         </fileset>
+                      </filesets>
+                   </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -170,25 +239,8 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
-                <module>opendaylight/netconf/netconf-it</module>
+                <!-- module>opendaylight/netconf/netconf-it</module -->
             </modules>
         </profile>
-        <profile>
-            <id>doclint-java8-disable</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
Netconf