From 193bdd04b8554a013f8991c1a58b6bcd599aa909 Mon Sep 17 00:00:00 2001
From: Jesus Perez <jesuspg@tid.es>
Date: Tue, 22 Apr 2014 16:26:40 +0200
Subject: [PATCH] add dependencies; refactor poms

---
 .travis.yml      |   5 +-
 README.md        |   7 +-
 client/pom.xml   |  24 +------
 core/pom.xml     |  20 ------
 model/pom.xml    |  21 +-----
 pom.xml          | 182 +++++++++++++++--------------------------------
 rest-api/pom.xml |  39 +---------
 7 files changed, 68 insertions(+), 230 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae7738f1..b19b1b38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,11 @@ jdk:
 - openjdk6
 before_install:
 - python travis.py --mirrors;
+
 install:
-- mvn install -DskipTests=true
+- mvn install -DskipTests=true -B -V -q
+test:
+- mvn test -B -q
 env:
   global:
   - SONATYPE_USERNAME=deployment
diff --git a/README.md b/README.md
index 8b282650..ad0c34b1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
-## Software Deployment and Configuration for Fiware
+# FI-WARE SDC [![Build Status](https://travis-ci.org/telefonicaid/fiware-sdc.svg)](https://travis-ci.org/telefonicaid/fiware-sdc) [![Coverage Status](https://coveralls.io/repos/jesuspg/fiware-sdc/badge.png)](https://coveralls.io/r/jesuspg/fiware-sdc)
+
+## Software Deployment and Configuration
 
 
-#### Builds:
-develop: [![Build Status](https://travis-ci.org/telefonicaid/fiware-sdc.svg?branch=develop)](https://travis-ci.org/telefonicaid/fiware-sdc)
-master: [![Build Status](https://travis-ci.org/telefonicaid/fiware-sdc.svg?branch=master)](https://travis-ci.org/telefonicaid/fiware-sdc)
 
diff --git a/client/pom.xml b/client/pom.xml
index ec215295..0f6b3408 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -47,36 +47,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-
         </dependency>
+
         <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-site-plugin</artifactId>
-
-                <configuration>
-                    <reportPlugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-project-info-reports-plugin</artifactId>
-
-                        </plugin>
-                    </reportPlugins>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index f83eeb4c..b97ce777 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -290,25 +290,5 @@
     </dependencies>
 
 
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-
-                <configuration>
-                    <reportPlugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-project-info-reports-plugin</artifactId>
-                        </plugin>
-                    </reportPlugins>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
 
 </project>
diff --git a/model/pom.xml b/model/pom.xml
index 8e1c8fea..f231fb03 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -85,6 +85,7 @@
             <artifactId>json-lib</artifactId>
             <version>2.4</version>
             <classifier>jdk15</classifier>
+            
         </dependency>
 
         <dependency>
@@ -99,24 +100,6 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-
-                <configuration>
-                    <reportPlugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-project-info-reports-plugin</artifactId>
-
-                        </plugin>
-                    </reportPlugins>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
+   
 
 </project>
diff --git a/pom.xml b/pom.xml
index cc584cbd..e71649bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
         <scmURI>git@github.com:telefonicaid</scmURI>
         <ciURI>http://ci-fiware-01.hi.inet</ciURI>
         <nexusURI>http://130.206.80.169</nexusURI>
-        <issueURI>https://jirapdi.tid.es/browse</issueURI>
         <nexusRepositories>${nexusURI}/nexus/content/repositories</nexusRepositories>
         <continousIntegrationSystemUrl>${ciURI}/jenkins</continousIntegrationSystemUrl>
         <continousIntegrationSystemProjectName>${repoName}</continousIntegrationSystemProjectName>
@@ -41,10 +40,6 @@
         <repoMavenThirdpartyId>repo-third-party-release</repoMavenThirdpartyId>
         <repoMavenThirdpartyName>repo-third-party-release</repoMavenThirdpartyName>
         <repoMavenThirdpartyUrl>${nexusRepositories}/thirdparty</repoMavenThirdpartyUrl>
-        <!-- site -->
-        <repoSiteId>nexus-site-repository</repoSiteId>
-        <repoSiteName>repo-site</repoSiteName>
-        <repoSiteUrl>${ciURI}</repoSiteUrl>
 
 
         <!-- encoding -->
@@ -58,10 +53,6 @@
 
         <!-- plugins versions -->
 
-        <maven-site-plugin.version>2.2</maven-site-plugin.version>
-        <cobertura-maven-plugin.version>2.6</cobertura-maven-plugin.version>
-        <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-
 
         <compilerInfoDebug>false</compilerInfoDebug>
         <compilerOptimize>false</compilerOptimize>
@@ -83,20 +74,16 @@
         <junit.version>4.11</junit.version>
         <jmock.version>2.5.1</jmock.version>
         <jvm.version>1.6</jvm.version>
-        <tomcat.version>6</tomcat.version>
-        <tomcat.home>/usr/share/tomcat${tomcat.version}</tomcat.home>
         <maven-surefire-plugin.version>2.12.2</maven-surefire-plugin.version>
 
         <!-- Release generation -->
         <maven-jgitflow-plugin.version>1.0-alpha21.1</maven-jgitflow-plugin.version>
         <maven-license-plugin.version>1.2.5</maven-license-plugin.version>
 
+        <cobertura-maven-plugin.version>2.6</cobertura-maven-plugin.version>
         <!-- sonar -->
         <jacoco-maven-plugin.version>0.6.3.201306030806</jacoco-maven-plugin.version>
-        <!--     <sonar.jacoco.reportPath>${project.build.directory}/jacoco-unit.exec</sonar.jacoco.reportPath>
-             <sonar.jacoco.itReportPath>${project.build.directory}/jacoco-it.exec</sonar.jacoco.itReportPath>
-             <sonar.jacoco.jar>${basedir}/lib/org.jacoco.agent-0.5.10.201208310627-runtime.jar</sonar.jacoco.jar>
-            -->
+        
 
     </properties>
 
@@ -107,31 +94,6 @@
         <tag>HEAD</tag>
     </scm>
 
-    <developers>
-        <developer>
-            <name>Jesus Movilla</name>
-            <timezone>+1</timezone>
-            <id>jmms392</id>
-            <roles>
-                <role>soft. developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <name>Sergio Arroyo</name>
-            <email>sergio.arroyo@tic.alten.es</email>
-            <timezone>+1</timezone>
-            <id>sa245</id>
-            <roles>
-                <role>soft. developer</role>
-            </roles>
-        </developer>
-    </developers>
-
-
-    <issueManagement>
-        <system>Jira</system>
-        <url>${issueURI}/CLAUDIA</url>
-    </issueManagement>
 
 
     <dependencyManagement>
@@ -175,12 +137,6 @@
                 <artifactId>commons-properties</artifactId>
                 <version>1.1.1</version>
             </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
-                <version>1.9.5</version>
-                <scope>test</scope>
-            </dependency>
 
         </dependencies>
     </dependencyManagement>
@@ -189,34 +145,62 @@
     <build>
         <finalName>${project.artifactId}</finalName>
 
-        <pluginManagement>
-            <plugins>
-                <!-- license plugin -->
-
-                <plugin>
-                    <groupId>com.google.code.maven-license-plugin</groupId>
-                    <artifactId>maven-license-plugin</artifactId>
-                    <version>${maven-license-plugin.version}</version>
-                    <configuration>
-                        <header>src/license/fiware/header.txt</header>
-                        <includes>
-                            <include>src/main/**/*.java</include>
-                            <include>src/test/**/*.java</include>
-                        </includes>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
-            </plugins>
-        </pluginManagement>
 
         <plugins>
+            <!-- license plugin -->
+
+            <plugin>
+                <groupId>com.google.code.maven-license-plugin</groupId>
+                <artifactId>maven-license-plugin</artifactId>
+                <version>${maven-license-plugin.version}</version>
+                <configuration>
+                    <header>src/license/fiware/header.txt</header>
+                    <includes>
+                        <include>src/main/**/*.java</include>
+                        <include>src/test/**/*.java</include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>${cobertura-maven-plugin.version}</version>
+                <configuration>
+                    <format>xml</format>
+                    <maxmem>256m</maxmem>
+                    <!-- aggregated reports for multi-module projects -->
+                    <aggregate>true</aggregate>
+                    <instrumentation>
+                        <ignores>
+                            <ignore>org.openstack.docs.common.api.v1.*</ignore>
+                        </ignores>
+                        <excludes>
+                            <exclude>**/*Test*.class</exclude>
+                            <exclude>**/model/**.class</exclude>
+                            <exclude>org/openstack/**/*</exclude>
+                            <exclude>org/w3/**/*</exclude>
+                        </excludes>
+                    </instrumentation>
+                </configuration>
+
+            </plugin>
+            <plugin>
+                <groupId>org.eluder.coveralls</groupId>
+                <artifactId>coveralls-maven-plugin</artifactId>
+                <version>2.2.0</version>
+                <configuration>
+                    <repoToken>udY6EhQuSfSatLQWMYC5kSYde7qWchS0z</repoToken>
+                    <sourceEncoding>UTF-8</sourceEncoding>
+                </configuration>
+            </plugin>
 
             <!-- jgitflow -->
             <plugin>
@@ -255,54 +239,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>${cobertura-maven-plugin.version}</version>
-                <configuration>
-                    <check>
-                        <haltOnFailure>false</haltOnFailure>
-                    </check>
-                    <instrumentation>
-                        <excludes>
-                            <exclude>**/main/Bootstrap.class</exclude>
-                        </excludes>
-                    </instrumentation>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>clean</id>
-                        <phase>pre-site</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>instrument</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>instrument</goal>
-                            <goal>cobertura</goal>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <artifactId>cobertura</artifactId>
-                        <groupId>net.sourceforge.cobertura</groupId>
-                        <version>2.0.3</version>
-                        <scope>compile</scope>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>com.sun</groupId>
-                                <artifactId>tools</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
         </plugins>
     </build>
 
@@ -419,12 +355,6 @@
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
 
-        <!-- Project Site -->
-        <site>
-            <id>${repoSiteId}</id>
-            <name>${repoSiteName}</name>
-            <url>${repoSiteUrl}/fiware/${project.artifactId}</url>
-        </site>
 
     </distributionManagement>
 
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
index c11a51d9..52492e2e 100644
--- a/rest-api/pom.xml
+++ b/rest-api/pom.xml
@@ -130,10 +130,6 @@
             <groupId>com.sun.jersey.contribs</groupId>
             <artifactId>jersey-multipart</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -172,19 +168,7 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-
-                <configuration>
-                    <reportPlugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-project-info-reports-plugin</artifactId>
-                        </plugin>
-                    </reportPlugins>
-                </configuration>
-            </plugin>
+           
             <!-- Modulo de validacion de token -->
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
@@ -203,26 +187,7 @@
                     <schemaDirectory>${basedir}/src/main/resources/keystone/</schemaDirectory>
                 </configuration>
             </plugin>
-            <!-- <plugin>
-                <groupId>org.codehaus.enunciate</groupId>
-                <artifactId>maven-enunciate-plugin</artifactId>
-                <version>1.23</version>
-                <configuration>
-                    <configFile>src/build/enunciate.xml</configFile>
-            <docsDir>${project.build.directory}/docs</docsDir>
-                    <exports>
-                        <jaxws.client.library.binaries>client.jar</jaxws.client.library.binaries>
-                    </exports>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-            <goal>docs</goal>
-                            <goal>assemble</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>  -->
+           
         </plugins>
     </build>