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
This commit is contained in:
Luca Frosini 2016-10-31 15:18:08 +00:00
parent 605543db10
commit 5f852d0f51
9 changed files with 33 additions and 17 deletions

View File

@ -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>

View File

@ -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>

View File

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xml>
<application mode='online'>
<name>${artifactId}</name>
<group>${serviceClass}</group>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xml>
<Resource>
<ID />
<Type>Service</Type>

View File

@ -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>

18
pom.xml
View File

@ -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>

View File

@ -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,

View File

@ -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>
</enunciate -->

View File

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xml>
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">