Bump versions by x.y.(z+1)

[controller.git] / opendaylight / md-sal / sal-test-model / pom.xml

diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml
index 8d29b981dc2d8dce784397c25ae99eafa13f27d6..d7f86b8bcc6ffec302dd75ea12ccc55d44514f72 100644 (file)
--- a/opendaylight/md-sal/sal-test-model/pom.xml
+++ b/opendaylight/md-sal/sal-test-model/pom.xml
@@ -2,76 +2,31 @@
 <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">
 <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>
     <parent>

-        <artifactId>sal-parent</artifactId>

         <groupId>org.opendaylight.controller</groupId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>1.1-SNAPSHOT</version>
+        <artifactId>mdsal-parent</artifactId>
+        <version>1.11.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>

     </parent>
     </parent>

-    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>sal-test-model</artifactId>
+    <version>1.11.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>

 
     <dependencies>
         <dependency>
 
     <dependencies>
         <dependency>

-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-binding</artifactId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>yang-ext</artifactId>

         </dependency>
     </dependencies>
 
         </dependency>
     </dependencies>
 

-    <artifactId>sal-test-model</artifactId>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>org.opendaylight.controller.*</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>pre-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>post-test</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <phase>test</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>

     <scm>
     <scm>

-        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+        <connection>scm:git:http://git.opendaylight.org/gerrit/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>
 
         <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>
\ No newline at end of file
+</project>