From 67a93180b94bc647496b0732977feb9302d2c97a Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 31 Oct 2017 10:40:09 +0000
Subject: [PATCH] Refs #10139: Modify accounting-analytics-persitence-couchbase
 pom.xml to create uber-jar instead of jar-with-dependencies and to use new
 make-servicearchive directive

Task-Url: https://support.d4science.org/issues/10139

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-analytics-persistence-couchbase@158039 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/descriptor.xml | 31 -------------------------------
 pom.xml               | 33 ++++++++-------------------------
 2 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100644 distro/descriptor.xml

diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index ba2c192..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<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">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>${file.separator}</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-				<include>profile.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target${file.separator}${build.finalName}.${project.packaging}</source>
-			<outputDirectory>${file.separator}${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a0a16e5..8f014f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,7 @@
 		<artifactId>maven-parent</artifactId>
 		<version>1.0.0</version>
 	</parent>
+
 	<groupId>org.gcube.accounting</groupId>
 	<artifactId>accounting-analytics-persistence-couchbase</artifactId>
 	<version>1.6.0-SNAPSHOT</version>
@@ -23,7 +24,7 @@
 		<developerConnection>scm:https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</developerConnection>
 		<url>https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</url>
 	</scm>
-	
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -63,7 +64,6 @@
 			<artifactId>slf4j-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
 		<!-- CouchBase libraries -->
 		<dependency>
 			<groupId>com.couchbase.client</groupId>
@@ -71,13 +71,11 @@
 			<version>2.2.7</version>
 		</dependency>
 		<!-- END CouchBase libraries -->
-		
 		<dependency>
-    		<groupId>org.json</groupId>
-    		<artifactId>json</artifactId>
-    		<version>20090211</version>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20090211</version>
 		</dependency>
-		
 		<!-- Test Dependency -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -91,7 +89,6 @@
 			<version>1.0.13</version>
 			<scope>test</scope>
 		</dependency>
-		<!--  use for Junit Test -->
 		<dependency>
 			<groupId>org.gcube.resources</groupId>
 			<artifactId>registry-publisher</artifactId>
@@ -112,34 +109,20 @@
 			<artifactId>common-authorization</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<!-- End Use for Junit Test -->
 	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-					</descriptors>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
 				<executions>
 					<execution>
-						<id>servicearchive</id>
+						<id>make-uberjar</id>
 						<phase>install</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
 					</execution>
 					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
+						<id>make-servicearchive</id>
+						<phase>install</phase>
 					</execution>
 				</executions>
 			</plugin>