From 7fff4e44d90520f8a6790b668f749cccf2a36ec5 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 31 Oct 2017 11:09:17 +0000
Subject: [PATCH] Refs #10142: Modify accounting-lib pom.xml to use new
 make-servicearchive directive

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

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@158044 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/descriptor.xml | 31 -------------------------------
 pom.xml               | 34 +++++++++++-----------------------
 2 files changed, 11 insertions(+), 54 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 551e4ff..9def760 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
 	<parent>
 		<groupId>org.gcube.tools</groupId>
 		<artifactId>maven-parent</artifactId>
@@ -29,7 +28,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
@@ -40,7 +38,6 @@
 		</dependencies>
 	</dependencyManagement>
 
-
 	<dependencies>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
@@ -52,7 +49,6 @@
 			<artifactId>common-authorization</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.data.publishing</groupId>
 			<artifactId>document-store-lib</artifactId>
@@ -82,24 +78,23 @@
 			<artifactId>slf4j-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 		<dependency>
-		    <groupId>com.fasterxml.jackson.core</groupId>
-		    <artifactId>jackson-core</artifactId>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
 		</dependency>
 		<dependency>
-		    <groupId>org.codehaus.jackson</groupId>
-		    <artifactId>jackson-core-asl</artifactId>
-		    <version>1.9.13</version>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-core-asl</artifactId>
+			<version>1.9.13</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.codehaus.jackson</groupId>
-		    <artifactId>jackson-mapper-asl</artifactId>
-		    <version>1.9.13</version>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+			<version>1.9.13</version>
 		</dependency>
 		<!-- Test Dependency -->
 		<dependency>
@@ -115,23 +110,16 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-					</descriptors>
-				</configuration>
 				<executions>
 					<execution>
-						<id>servicearchive</id>
-						<phase>install</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
+						<id>make-servicearchive</id>
+						<phase>package</phase>
 					</execution>
 				</executions>
 			</plugin>