From: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Date: Tue, 2 Aug 2016 00:00:34 +0000 (+0900)
Subject: Cleanup Maven build script
X-Git-Tag: 1.2.0+RC1~70^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d949b0875b9bac83a8a065b18afd6b09b3d2ff58;p=platform%2Fupstream%2Fiotivity.git

Cleanup Maven build script

1. Cleanup Maven build script

Change-Id: Ibf455e52f064b7b0cc5e4cd00beda51d25c8950d
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
---

diff --git a/cloud/account/pom.xml b/cloud/account/pom.xml
index fd1bff3..c283b9f 100644
--- a/cloud/account/pom.xml
+++ b/cloud/account/pom.xml
@@ -1,49 +1,59 @@
-<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>
-	<groupId>org.iotivity.cloud</groupId>
-	<artifactId>CloudAccount</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-
-	<properties>
+<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>
+  <groupId>org.iotivity.cloud</groupId>
+  <artifactId>CloudAccount</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  
+  <properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.test.skip>true</maven.test.skip>
 	</properties>
-
-	<dependencies>
-		<dependency>
+	
+  <dependencies>
+  		<dependency>
 			<groupId>org.iotivity.cloud</groupId>
 			<artifactId>CloudStack</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongo-java-driver</artifactId>
-			<version>3.2.0</version>
-		</dependency>
-		<dependency>
+  		<dependency>
+  			<groupId>org.mongodb</groupId>
+  			<artifactId>mongo-java-driver</artifactId>
+  			<version>3.2.0</version>
+  		</dependency>
+  		<dependency>
+  			<groupId>org.apache.oltu.oauth2</groupId>
+  			<artifactId>org.apache.oltu.oauth2.client</artifactId>
+  			<version>1.0.1</version>
+  		</dependency>
+  		<dependency>
+  			<groupId>org.apache.oltu.oauth2</groupId>
+  			<artifactId>
+  				org.apache.oltu.oauth2.common
+  			</artifactId>
+  			<version>1.0.1</version>
+  		</dependency>
+  		<dependency>
+  			<groupId>org.apache.oltu.oauth2</groupId>
+  			<artifactId>
+  				org.apache.oltu.oauth2.authzserver
+  			</artifactId>
+  			<version>1.0.1</version>
+  		</dependency>
+  		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.oltu.oauth2</groupId>
-			<artifactId>org.apache.oltu.oauth2.client</artifactId>
-			<version>1.0.1</version>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.oltu.oauth2</groupId>
-			<artifactId>
-  				org.apache.oltu.oauth2.common
-  			</artifactId>
-			<version>1.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.oltu.oauth2</groupId>
-			<artifactId>
-  				org.apache.oltu.oauth2.authzserver
-  			</artifactId>
-			<version>1.0.1</version>
+			<groupId>com.jayway.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>1.7.0</version>
 		</dependency>
 
 		<!-- For security tasks(certificates, signature, keystore) -->
@@ -60,9 +70,9 @@
 		</dependency>
 		<!-- For security tasks(certificates, signature, keystore) -->
 
-	</dependencies>
-
-	<build>
+  </dependencies>
+	
+  <build>
 		<plugins>
 			<plugin>
 				<inherited>true</inherited>
@@ -104,7 +114,7 @@
 					<overWriteIfNewer>true</overWriteIfNewer>
 				</configuration>
 			</plugin>
-		</plugins>
+		</plugins>		
 	</build>
-
+  
 </project>
\ No newline at end of file
diff --git a/cloud/interface/pom.xml b/cloud/interface/pom.xml
index a713f8b..e33bb82 100644
--- a/cloud/interface/pom.xml
+++ b/cloud/interface/pom.xml
@@ -17,9 +17,20 @@
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.iotivity.cloud</groupId>
-			<artifactId>CloudResourceDirectory</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.jayway.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>1.7.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/cloud/messagequeue/pom.xml b/cloud/messagequeue/pom.xml
index ba61c09..23961d9 100644
--- a/cloud/messagequeue/pom.xml
+++ b/cloud/messagequeue/pom.xml
@@ -22,30 +22,30 @@
 			<version>3.2.0</version>
 		</dependency>
 		<dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka_2.11</artifactId>
+            <version>0.9.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jmxri</artifactId>
+                    <groupId>com.sun.jmx</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jmxtools</artifactId>
+                    <groupId>com.sun.jdmk</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jms</artifactId>
+                    <groupId>javax.jms</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.11</artifactId>
-			<version>0.9.0.0</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>jmxri</artifactId>
-					<groupId>com.sun.jmx</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>jmxtools</artifactId>
-					<groupId>com.sun.jdmk</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>jms</artifactId>
-					<groupId>javax.jms</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
 			<version>1.10.19</version>
diff --git a/cloud/resourcedirectory/pom.xml b/cloud/resourcedirectory/pom.xml
index f4deecc..d8f1952 100644
--- a/cloud/resourcedirectory/pom.xml
+++ b/cloud/resourcedirectory/pom.xml
@@ -26,12 +26,17 @@
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
 		</dependency>
-		<dependency>
+		<dependency>		
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
 			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.jayway.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>1.7.0</version>
 		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/cloud/stack/pom.xml b/cloud/stack/pom.xml
index da32793..325c608 100644
--- a/cloud/stack/pom.xml
+++ b/cloud/stack/pom.xml
@@ -35,11 +35,6 @@
 			<version>20140107</version>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-		</dependency>
-		<dependency>
     		<groupId>com.fasterxml.jackson.core</groupId>
     		<artifactId>jackson-databind</artifactId>
     		<version>2.4.0</version>
@@ -50,10 +45,26 @@
 	  		<version>2.4.0</version>
 		</dependency>
 		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.jayway.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>1.7.0</version>
+		</dependency>
+		<dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
-        </dependency>
+        </dependency>		
 	</dependencies>
   <build>
 		<plugins>