From 5f852d0f514775ce09f7b792c2e277d6da942a18 Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@isti.cnr.it>
Date: Mon, 31 Oct 2016 15:18:08 +0000
Subject: [PATCH] Imported information-system-bom in dependency management.
 Deactivated enunciate plugin

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@133761 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                           |  2 ++
 distro/descriptor.xml                          |  6 ++----
 distro/gcube-app.xml                           |  2 ++
 distro/profile.xml                             |  1 +
 distro/web.xml                                 |  2 ++
 pom.xml                                        | 18 +++++++++++++-----
 .../resourceregistry/resources/Access.java     | 11 +++++------
 {distro => src/test/resources}/enunciate.xml   |  6 ++++--
 src/test/resources/logback-test.xml            |  2 ++
 9 files changed, 33 insertions(+), 17 deletions(-)
 rename {distro => src/test/resources}/enunciate.xml (52%)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 0f24492..12698b6 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <ReleaseNotes>
 	<Changeset component="org.gcube.information-system.resource-registry.1-0-0" date="${buildDate}">
 		<Change>First Release</Change>	
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index b3f5628..71942e7 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -1,7 +1,5 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
 	<id>servicearchive</id>
 	<formats>
 		<format>tar.gz</format>
diff --git a/distro/gcube-app.xml b/distro/gcube-app.xml
index 60a6ab3..69d4bbd 100644
--- a/distro/gcube-app.xml
+++ b/distro/gcube-app.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <application mode='online'>
 		<name>${artifactId}</name>
 		<group>${serviceClass}</group>
diff --git a/distro/profile.xml b/distro/profile.xml
index 3bcefb5..f226017 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <Resource>
 	<ID />
 	<Type>Service</Type>
diff --git a/distro/web.xml b/distro/web.xml
index cc9b844..494c4f2 100644
--- a/distro/web.xml
+++ b/distro/web.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <web-app>
 	<servlet>
 		<servlet-name>org.gcube.informationsystem.resourceregistry.ResourceInitializer</servlet-name>
diff --git a/pom.xml b/pom.xml
index 349d43a..e9a32da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.gcube.information-system</groupId>
+				<artifactId>information-system-bom</artifactId>
+				<version>1.0.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -82,13 +89,11 @@
 		<dependency>
 			<groupId>com.orientechnologies</groupId>
 			<artifactId>orientdb-graphdb</artifactId>
-			<version>2.2.12</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.tinkerpop</groupId>
 			<artifactId>frames</artifactId>
-			<version>2.6.0</version>
 		</dependency>
 
 
@@ -118,11 +123,13 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- 
 		<dependency>
 			<groupId>io.swagger</groupId>
 			<artifactId>swagger-jersey2-jaxrs</artifactId>
 			<version>1.5.0</version>
 		</dependency>
+ 		-->
 
 		<!-- Test Dependency -->
 		<dependency>
@@ -197,7 +204,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
+			<!-- plugin>
 				<groupId>com.webcohesion.enunciate</groupId>
 				<artifactId>enunciate-maven-plugin</artifactId>
 				<version>2.6.0</version>
@@ -216,7 +223,7 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				< This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. >
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -248,6 +255,7 @@
 					</configuration>
 				</plugin>
 			</plugins>
-		</pluginManagement>
+		</pluginManagement -->
+		</plugins>
 	</build>
 </project>
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/Access.java b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/Access.java
index 500932a..cd22069 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/Access.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/Access.java
@@ -2,9 +2,6 @@ package org.gcube.informationsystem.resourceregistry.resources;
 
 import java.util.UUID;
 
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -65,9 +62,11 @@ public class Access {
 	 * @throws InvalidQueryException if the query is invalid or no idempotent
 	 */
 	@GET
-	@ApiResponses(value = {
-			@ApiResponse(code=200, message="Successful query"),
-			@ApiResponse(code=400, message="Invalid or Non-Idempotent Query")})
+	/*
+	io.swagger.annotations.@ApiResponses(value = {
+			io.swagger.annotations.@ApiResponse(code=200, message="Successful query"),
+			io.swagger.annotations.@ApiResponse(code=400, message="Invalid or Non-Idempotent Query")})
+	*/
 	@Produces(MediaType.APPLICATION_JSON)
 	public String query(@QueryParam(AccessPath.QUERY_PARAM) String query,
 			@QueryParam(AccessPath.LIMIT_PARAM) int limit,
diff --git a/distro/enunciate.xml b/src/test/resources/enunciate.xml
similarity index 52%
rename from distro/enunciate.xml
rename to src/test/resources/enunciate.xml
index 664469c..bada26d 100644
--- a/distro/enunciate.xml
+++ b/src/test/resources/enunciate.xml
@@ -1,4 +1,6 @@
-<enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
+<!-- enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.0.0-M.4.xsd">
     <application root="resource-registry" />
-</enunciate>
\ No newline at end of file
+</enunciate -->
\ No newline at end of file
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index e85d2b8..19999fd 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <configuration>
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">