Merge commit 'refs/changes/20/18320/1' of ssh://git.opendaylight.org:29418/alto

[alto.git] / alto-provider / pom.xml

diff --git a/alto-provider/pom.xml b/alto-provider/pom.xml
index d473a6e17816fe2c686f1da413a1bfe81d1b78cb..cc95f660e6ebabdc8778d35c62f47ff7c151a61d 100644 (file)
--- a/alto-provider/pom.xml
+++ b/alto-provider/pom.xml
@@ -1,15 +1,10 @@
 <?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/xsd/maven-4.0.0.xsd">
-
+<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.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -17,7 +12,6 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <sal-binding-api.version>1.2.0-SNAPSHOT</sal-binding-api.version>
     <configfile>default.networkmap</configfile>
   </properties>
 
@@ -36,19 +30,16 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-config</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-util</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <dependency>
@@ -58,37 +49,34 @@
 
     <!-- dependencies to use AbstractDataBrokerTest -->
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
-      <scope>test</scope>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
       <type>test-jar</type>
-      <version>1.2.0-SNAPSHOT</version>
+      <version>${mdsal.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-        <artifactId>junit</artifactId>
-        <groupId>junit</groupId>
-        <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-commons</artifactId>
-      <version>${project.version}</version>
+    <!-- used to mock up classes -->
+     <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+
+
+      <plugin> <!-- OSGi plugin -->
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
@@ -99,6 +87,7 @@
           </instructions>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
@@ -117,21 +106,26 @@
         </dependencies>
         <executions>
           <execution>
-            <id>config</id>
             <goals>
               <goal>generate-sources</goal>
             </goals>
             <configuration>
               <codeGenerators>
                 <generator>
-                  <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                  <codeGeneratorClass>
+                    org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+                  </codeGeneratorClass>
                   <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
                   <additionalConfiguration>
-                    <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
+                    <namespaceToPackage1>
+                      urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
+                    </namespaceToPackage1>
                   </additionalConfiguration>
                 </generator>
                 <generator>
-                  <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                  <codeGeneratorClass>
+                    org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                  </codeGeneratorClass>
                   <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                 </generator>
               </codeGenerators>
@@ -142,10 +136,4 @@
       </plugin>
     </plugins>
   </build>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
 </project>