Merge remote branch 'origin/release-1.0.X' into mer

[lispflowmapping.git] / commons / code-parent / pom.xml

diff --git a/commons/code-parent/pom.xml b/commons/code-parent/pom.xml
index 5fef268959f6959c06945b78f8b81438d463843b..4f2166c82f956d112b1ca7954d7401423a8a2a0e 100644 (file)
--- a/commons/code-parent/pom.xml
+++ b/commons/code-parent/pom.xml
@@ -6,50 +6,22 @@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>lispflowmapping-commons</artifactId>
-               <version>0.1.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
                <relativePath>../parent</relativePath>
        </parent>
        <artifactId>lispflowmapping-code-commons</artifactId>
-       <version>0.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
-        <modules>
-                <module>api</module>
-                <module>implementation</module>
-        </modules>
-        <build>
-                <!--plugins>
-                        <plugin>
-                                <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
-                                <artifactId>maven-java-formatter-plugin</artifactId>
-                                <version>0.3.1</version>
-                                <configuration>
-                                        <compilerSource>1.6</compilerSource>
-                                        <compilerCompliance>1.6</compilerCompliance>
-                                        <compilerTargetPlatform>1.6</compilerTargetPlatform>
-                                        <configFile>eclipse/formatter.xml</configFile>
-                                </configuration>
-                                 <dependencies>
-                                           <dependency>
-                                                       <groupId>org.opendaylight.lispflowmapping</groupId>
-                                                       <artifactId>common.build.tools</artifactId>
-                                                       <version>0.1.0-SNAPSHOT</version>
-                                           </dependency>
-                                 </dependencies>
-                                <executions>
-                                        <execution>
-                                                <goals>
-                                                        <goal>format</goal>
-                                                </goals>
-                                        </execution>
-                                </executions>
-                        </plugin>
-                </plugins-->
-       </build>
+       <version>1.1.0-SNAPSHOT</version>
+       <scm>
+               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
+               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
+               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
+               <tag>HEAD</tag>
+       </scm>
        <dependencies>
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>common.unittest.tools</artifactId>
-                       <version>0.1.0-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
                        <dependency>