diff --git a/.gitignore b/.gitignore index aeccd3f..e65ace7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ # Created by https://www.toptal.com/developers/gitignore/api/macos,intellij,eclipse,visualstudiocode,linux # Edit at https://www.toptal.com/developers/gitignore?templates=macos,intellij,eclipse,visualstudiocode,linux +dependencies +target ### Eclipse ### .metadata diff --git a/gcube/extra-resources/WEB-INF/application.yaml b/gcube/extra-resources/WEB-INF/application.yaml new file mode 100644 index 0000000..a1502f1 --- /dev/null +++ b/gcube/extra-resources/WEB-INF/application.yaml @@ -0,0 +1,7 @@ +name: ${artifactId} +group: ${groupId} +version: ${version} +description: ${description} +excludes: + - path: /docs.* + - path: /api-docs.* \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9d1d8d2..9a83330 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gcube.tools maven-parent - 1.1.0 + 1.2.0 org.gcube.social_networking social-service @@ -16,6 +16,9 @@ UTF-8 + 11 + 11 + ${project.basedir}${file.separator}src${file.separator}main${file.separator}webapp${file.separator}WEB-INF 2.14.0 @@ -35,7 +38,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.5.0 + 3.0.1-SNAPSHOT pom import @@ -56,8 +59,7 @@ org.gcube.common - authorization-utils - [2.2.0, 3.0.0-SNAPSHOT) + common-security org.glassfish.jersey.media @@ -71,12 +73,36 @@ javax.ws.rs javax.ws.rs-api + + org.gcube.core + common-smartgears-app + + + org.gcube.core + common-smartgears + + + org.gcube.core + common-scope + + + org.gcube.core + common-scope-maps + + org.gcube.common.portal portal-manager provided - + + + org.gcube.common + authorization-utils + [2.2.0, 3.0.0-SNAPSHOT) + + + org.gcube.social-networking social-service-model @@ -103,12 +129,9 @@ commons-lang 2.6 - - org.gcube.core - common-smartgears-app - - + + - - - org.gcube.core - common-smartgears - + END Added to support Java 11 JDK --> @@ -161,10 +179,12 @@ test - + + ${project.artifactId} + - + - + + org.apache.maven.plugins maven-resources-plugin @@ -226,7 +245,7 @@ - + --> @@ -240,4 +259,4 @@ - + \ No newline at end of file diff --git a/src/main/java/org/gcube/social_networking/ResourceInitializer.java b/src/main/java/org/gcube/social_networking/ResourceInitializer.java index 7bd680b..ab21eb5 100644 --- a/src/main/java/org/gcube/social_networking/ResourceInitializer.java +++ b/src/main/java/org/gcube/social_networking/ResourceInitializer.java @@ -2,8 +2,8 @@ package org.gcube.social_networking; import javax.ws.rs.ApplicationPath; -import org.gcube.acme.rest.HelloWorld; import org.gcube.smartgears.annotations.ManagedBy; +import org.gcube.social_networking.rest.HelloWorld; import org.glassfish.jersey.server.ResourceConfig; /**