From 67b3847b1e4ea142c84fd53a723eb2df54932631 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 6 Nov 2019 18:29:01 +0100
Subject: [PATCH] fixed pom for jenkins

---
 descriptor.xml        | 31 +++++++++++++++++++++++++++++++
 distro/changelog.xml  | 17 +++++++++++++++++
 distro/descriptor.xml | 31 +++++++++++++++++++++++++++++++
 distro/profile.xml    | 25 +++++++++++++++++++++++++
 pom.xml               | 22 +++++++++++++++-------
 5 files changed, 119 insertions(+), 7 deletions(-)
 create mode 100644 descriptor.xml
 create mode 100644 distro/changelog.xml
 create mode 100644 distro/descriptor.xml
 create mode 100644 distro/profile.xml

diff --git a/descriptor.xml b/descriptor.xml
new file mode 100644
index 0000000..b3f5628
--- /dev/null
+++ b/descriptor.xml
@@ -0,0 +1,31 @@
+<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>/</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/${build.finalName}.${project.packaging}</source>
+			<outputDirectory>/${artifactId}</outputDirectory>
+		</file>
+	</files>
+</assembly>
\ No newline at end of file
diff --git a/distro/changelog.xml b/distro/changelog.xml
new file mode 100644
index 0000000..b5c7b79
--- /dev/null
+++ b/distro/changelog.xml
@@ -0,0 +1,17 @@
+<ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.accept-invite.1-2-0"
+		date="2019-08-10">
+			<Change>Modified text to make evident you can create an account via SSO
+			</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.accept-invite.1-1-0"
+		date="2018-02-22">
+			<Change>The created account now automatic set email as verified
+			</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-user.accept-invite.1-0-0"
+		date="2017-12-06">
+		<Change>First release
+		</Change>
+	</Changeset>
+</ReleaseNotes>
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
new file mode 100644
index 0000000..b3f5628
--- /dev/null
+++ b/distro/descriptor.xml
@@ -0,0 +1,31 @@
+<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>/</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/${build.finalName}.${project.packaging}</source>
+			<outputDirectory>/${artifactId}</outputDirectory>
+		</file>
+	</files>
+</assembly>
\ No newline at end of file
diff --git a/distro/profile.xml b/distro/profile.xml
new file mode 100644
index 0000000..51c3b6b
--- /dev/null
+++ b/distro/profile.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<ID></ID>
+	<Type>Service</Type>
+	<Profile>
+		<Description>${description}</Description>
+		<Class>PortletUser</Class>
+		<Name>${artifactId}</Name>
+		<Version>${version}</Version>
+		<Packages>
+			<Software>
+				<Name>${artifactId}</Name>
+				<Version>${version}</Version>
+				<MavenCoordinates>
+					<groupId>${groupId}</groupId>
+					<artifactId>${artifactId}</artifactId>
+					<version>${version}</version>
+				</MavenCoordinates>
+				<Files>
+					<File>target/${build.finalName}.war</File>
+				</Files>
+			</Software>
+		</Packages>
+	</Profile>
+</Resource>
diff --git a/pom.xml b/pom.xml
index 67ca998..a5cddaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,8 @@
 	</scm>
 	<properties>
 		<distroDirectory>distro</distroDirectory>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 		<liferay.version>6.2.5</liferay.version>
 		<liferay.maven.plugin.version>6.2.10.12</liferay.maven.plugin.version>
 		<liferay.auto.deploy.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/deploy</liferay.auto.deploy.dir>
@@ -184,21 +186,27 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-			<!-- SA Plugin -->
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
-					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-					</descriptors>
+					<additionalparam>-Xdoclint:none</additionalparam>
+					<additionalJOption>-Xdoclint:none</additionalJOption>
 				</configuration>
+				<version>3.1.0</version>
 				<executions>
 					<execution>
-						<id>servicearchive</id>
+						<id>generate-doc</id>
 						<phase>install</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>jar</goal>
 						</goals>
 					</execution>
 				</executions>