From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 5 Feb 2021 20:10:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.19~7
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=6f42fc5cdd7149a66a54afb399a2cbf15c8ca3b3;hp=83040dd8d0636a58d1e828452842dea2bf69ce0d

Merge remote-tracking branch 'origin/master' into v2.x

Conflicts:
	pom.xml
---

diff --git a/pom.xml b/pom.xml
index f85bda5..6b82c1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.maven</groupId>
@@ -7,10 +9,10 @@
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
-	<packaging>pom</packaging>
-	<name>Argeo Suite</name>
-	<description />
 	<version>2.1.19-SNAPSHOT</version>
+	<name>Argeo Suite</name>
+	<packaging>pom</packaging>
+	<url>http://www.argeo.org/</url>
 	<properties>
 		<!-- Dependencies -->
 		<version.argeo-tp>2.1.27</version.argeo-tp>