From c6b3f53bce4442d3c0daa30b8fa23aa42bea54cf Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 21 Nov 2019 17:01:08 +0100
Subject: [PATCH] Fixed pom for a better management of distro files

---
 changelog.xml                              | 3 +++
 pom.xml                                    | 7 +++++--
 src/main/.gitignore                        | 1 -
 src/main/webapp/WEB-INF/.gitignore         | 4 ++++
 web.xml => src/main/webapp/WEB-INF/web.xml | 0
 5 files changed, 12 insertions(+), 3 deletions(-)
 delete mode 100644 src/main/.gitignore
 create mode 100644 src/main/webapp/WEB-INF/.gitignore
 rename web.xml => src/main/webapp/WEB-INF/web.xml (100%)

diff --git a/changelog.xml b/changelog.xml
index 90f4f2f..23ce6a6 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE xml>
 <ReleaseNotes>
 	<Changeset component="org.gcube.data-publishing.gcat.1-4-0" date="${buildDate}">
+		<Change></Change>
+	</Changeset>
+	<Changeset component="org.gcube.data-publishing.gcat.1-4-0" date="2019-11-06">
 		<Change>User information are checked/updated on CKAN using portal information #16360</Change>
 		<Change>Items listing API when invoked at VO level allow to get all the catalogue items or filtering them by organization #17635</Change>
 		<Change>Enabled the possibility of filtering the result of items listing API #17645</Change>
diff --git a/pom.xml b/pom.xml
index 0a9cd85..7460eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.data-publishing</groupId>
 	<artifactId>gcat</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.0</version>
+	<version>1.4.1</version>
 	<name>gCube Catalogue Service</name>
 	<description>
 		This service allows any client to publish on the gCube Catalogue.
@@ -21,7 +21,7 @@
 	<properties>
 		<version.jersey>2.24.1</version.jersey>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
+		<webappDirectory>${project.basedir}${file.separator}src${file.separator}main${file.separator}webapp${file.separator}WEB-INF</webappDirectory>
 		<serviceClass>DataPublishing</serviceClass>
 	</properties>
 
@@ -274,8 +274,11 @@
 										<exclude>src</exclude>
 									</excludes>
 									<includes>
+										<include>LICENSE.md</include>
+										<include>README.md</include>
 										<include>web.xml</include>
 										<include>gcube-app.xml</include>
+										<include>changelog.xml</include>
 									</includes>
 								</resource>
 							</resources>
diff --git a/src/main/.gitignore b/src/main/.gitignore
deleted file mode 100644
index 263eccc..0000000
--- a/src/main/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/webapp/
diff --git a/src/main/webapp/WEB-INF/.gitignore b/src/main/webapp/WEB-INF/.gitignore
new file mode 100644
index 0000000..6f6ab36
--- /dev/null
+++ b/src/main/webapp/WEB-INF/.gitignore
@@ -0,0 +1,4 @@
+/LICENSE.md
+/README.md
+/changelog.xml
+/gcube-app.xml
diff --git a/web.xml b/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from web.xml
rename to src/main/webapp/WEB-INF/web.xml