From 2f4583fd607f7a072cf099f5f5ea7301820e0c78 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 25 Jul 2019 16:49:46 +0200
Subject: [PATCH] Mododified pom to exclude JAX RS1 dependency

---
 .gitignore                                 |  1 +
 .settings/org.eclipse.wst.common.component | 21 ---------------------
 pom.xml                                    |  7 +++----
 3 files changed, 4 insertions(+), 25 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index c6e3acb..8cf3658 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,27 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="portal-manager-2.4.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/portal-manager/portal-manager">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="social-util-library-1.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/social-util-library/social-util-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="pickitem-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/pickitem-widget/pickitem-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="gcube-widgets-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="usermanagement-core-2.4.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/usermanagement-core/usermanagement-core">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="notifications-common-library-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/notifications-common-library/notifications-common-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="aslsocial-1.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/applicationSupportLayerSocial/applicationSupportLayerSocial">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="java-output-path" value="/social-networking-library-ws/target/classes"/>
         <property name="context-root" value="social-networking-library-ws"/>
     </wb-module>
diff --git a/pom.xml b/pom.xml
index dffef4b..03c2e01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,10 +4,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.0.0</version>
-		<relativePath />
+		<artifactId>maven-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.gcube.portal</groupId>
@@ -55,7 +54,7 @@
 		<dependency>
 			<groupId>org.gcube.common.portal</groupId>
 			<artifactId>portal-manager</artifactId>
-			<version>[2.0.0-SNAPSHOT,)</version>
+			<version>[2.4.1-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>