From 8636de82acacefe6698e65d7818eb42683713fd6 Mon Sep 17 00:00:00 2001
From: Gal Mainzer <gmainzer@contextream.com>
Date: Fri, 26 Jul 2013 00:26:23 +0300
Subject: [PATCH] add deploy capabilities to build_tools module

Change-Id: Ia9200ad0e4db8917494b13292dcd123bb179c3a1
Signed-off-by: Gal Mainzer <gmainzer@contextream.com>
---
 commons/build_tools/pom.xml    |  7 ++-
 commons/code-parent/pom.xml    | 80 ++++++++++++++++++++++++++++++++++
 commons/parent/pom.xml         | 27 ------------
 commons/unittest_tools/pom.xml |  4 +-
 mappingservice/pom.xml         |  4 +-
 5 files changed, 90 insertions(+), 32 deletions(-)
 create mode 100644 commons/code-parent/pom.xml

diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml
index d4044a9fe..53877b0f0 100644
--- a/commons/build_tools/pom.xml
+++ b/commons/build_tools/pom.xml
@@ -3,7 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-        <groupId>org.opendaylight.lispflowmapping</groupId>
+	<parent>
+                <groupId>org.opendaylight.lispflowmapping</groupId>
+                <artifactId>lispflowmapping-commons</artifactId>
+                <version>0.1.0-SNAPSHOT</version>
+                <relativePath>../parent</relativePath>
+	</parent>
 	<artifactId>common.build.tools</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/commons/code-parent/pom.xml b/commons/code-parent/pom.xml
new file mode 100644
index 000000000..958283d4f
--- /dev/null
+++ b/commons/code-parent/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.opendaylight.lispflowmapping</groupId>
+		<artifactId>lispflowmapping-commons</artifactId>
+		<version>0.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>
+	<dependencies>
+	        <dependency>
+	        	<groupId>org.opendaylight.lispflowmapping</groupId>
+	        	<artifactId>common.unittest.tools</artifactId>
+	        	<version>0.1.0-SNAPSHOT</version>
+	        	<scope>test</scope>
+	        </dependency>
+       		<dependency>
+       			<groupId>junit</groupId>
+       			<artifactId>junit</artifactId>
+       		</dependency>
+       		<dependency>
+       			<groupId>org.hamcrest</groupId>
+       			<artifactId>hamcrest-core</artifactId>
+       			<scope>test</scope>
+       		</dependency>
+       		<dependency>
+       			<groupId>org.jmock</groupId>
+       			<artifactId>jmock-junit4</artifactId>
+       			<scope>test</scope>
+       		</dependency>
+       		<dependency>
+       			<groupId>org.jmock</groupId>
+       			<artifactId>jmock-legacy</artifactId>
+       			<scope>test</scope>
+       		</dependency>
+       		<dependency>
+       			<groupId>junit-addons</groupId>
+       			<artifactId>junit-addons</artifactId>
+       			<scope>test</scope>
+       		</dependency>
+	</dependencies>
+</project>
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 53ed98b62..6fab146e3 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -152,33 +152,6 @@
 
 
   <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>
     <pluginManagement>
       <plugins>
         <plugin>
diff --git a/commons/unittest_tools/pom.xml b/commons/unittest_tools/pom.xml
index b8e6780cf..5d6d55ef8 100644
--- a/commons/unittest_tools/pom.xml
+++ b/commons/unittest_tools/pom.xml
@@ -5,9 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
                 <groupId>org.opendaylight.lispflowmapping</groupId>
-                <artifactId>lispflowmapping-commons</artifactId>
+                <artifactId>lispflowmapping-code-commons</artifactId>
                 <version>0.1.0-SNAPSHOT</version>
-                <relativePath>../parent</relativePath>
+                <relativePath>../code-parent</relativePath>
 	</parent>
 	<artifactId>common.unittest.tools</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 9071a8c49..28f11bc7a 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,9 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.opendaylight.lispflowmapping</groupId>
-		<artifactId>lispflowmapping-commons</artifactId>
+		<artifactId>lispflowmapping-code-commons</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
-		<relativePath>../commons/parent</relativePath>
+		<relativePath>../commons/code-parent</relativePath>
 	</parent>
 	<artifactId>mappingservice-parent</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
-- 
2.36.6