From a12e38c2ed1da89b156da212c6ac83741d197462 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 28 Apr 2015 10:07:02 +0000
Subject: [PATCH] Moved libs and war directories under target to make mvn clean
 properly working. The generated tar.gz remain the same. Fixes #3334

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution@114459 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml  | 3 +++
 distro/standalone.xml | 4 ++--
 pom.xml               | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 131b89f..6827f2a 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -14,4 +14,7 @@
 	<Changeset component="org.gcube.distribution.smartgears-distribution.1-2-1" date="2015-04-15">
 		<Change>smartgear-distribution-bundle version is published on ghn profile</Change>
 	</Changeset>
+	<Changeset component="org.gcube.distribution.smartgears-distribution.1-2-2" date="2015-04-28">
+		<Change>Moved libs and war directories under target to make mvn clean properly working. The generated tar.gz remain the same</Change>
+	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/distro/standalone.xml b/distro/standalone.xml
index 6fa4b82..6d78709 100644
--- a/distro/standalone.xml
+++ b/distro/standalone.xml
@@ -33,13 +33,13 @@
 			<filtered>true</filtered>
 		</fileSet>
 		<fileSet>
-			<directory>libs</directory>
+			<directory>target/libs</directory>
 			<outputDirectory>libs</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<fileMode>755</fileMode>
 		</fileSet>
 			<fileSet>
-			<directory>war</directory>
+			<directory>target/war</directory>
 			<outputDirectory>apps</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<fileMode>755</fileMode>
diff --git a/pom.xml b/pom.xml
index 62e8e4a..3cd2303 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>smartgears-distribution</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>A distribution for the SmartGears Framework</name>
 
@@ -74,7 +74,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/libs</outputDirectory>
+							<outputDirectory>${basedir}/target/libs</outputDirectory>
 						    <includeScope>provided</includeScope>
 							<overWriteReleases>false</overWriteReleases>
 							<overWriteSnapshots>false</overWriteSnapshots>
@@ -90,7 +90,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/war</outputDirectory>
+							<outputDirectory>${basedir}/target/war</outputDirectory>
 							<overWriteReleases>false</overWriteReleases>
 							<overWriteSnapshots>false</overWriteSnapshots>
 							<overWriteIfNewer>true</overWriteIfNewer>