From 2914df4a370230205ab5f2fae96655fd1dace807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <capelle.mikael@gmail.com>
Date: Wed, 4 Mar 2020 16:10:08 +0100
Subject: [PATCH] [maven] Cleanup pom.xml files.

---
 be-graphes-algos/pom.xml |  8 +++----
 be-graphes-gui/pom.xml   | 49 +++++++++++++++++++++-------------------
 be-graphes-model/pom.xml |  3 +++
 pom.xml                  | 10 ++++----
 4 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/be-graphes-algos/pom.xml b/be-graphes-algos/pom.xml
index 15a8f1c..d66075a 100644
--- a/be-graphes-algos/pom.xml
+++ b/be-graphes-algos/pom.xml
@@ -4,17 +4,16 @@
 	xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
+	
 	<parent>
 		<groupId>org.insa.graphs</groupId>
 		<artifactId>be-graphes-all</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
+	
 	<artifactId>be-graphes-algos</artifactId>
 	<name>be-graphes-algos</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.insa.graphs</groupId>
@@ -22,4 +21,5 @@
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
+	
 </project>
diff --git a/be-graphes-gui/pom.xml b/be-graphes-gui/pom.xml
index a1dae40..8efa922 100644
--- a/be-graphes-gui/pom.xml
+++ b/be-graphes-gui/pom.xml
@@ -9,27 +9,30 @@
 		<artifactId>be-graphes-all</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	
+
 	<properties>
-	   <mapsforge.version>0.13.0</mapsforge.version>
+		<mapsforge.version>0.13.0</mapsforge.version>
 	</properties>
-	
+
 	<artifactId>be-graphes-gui</artifactId>
 	<name>be-graphes-gui</name>
 	
+	<!-- Repository for Salamander (dependency of Mapsforge). -->
 	<repositories>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-    </repositories>
+		<repository>
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
+		</repository>
+	</repositories>
 
 	<dependencies>
+	
 		<dependency>
 			<groupId>org.insa.graphs</groupId>
 			<artifactId>be-graphes-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.insa.graphs</groupId>
 			<artifactId>be-graphes-algos</artifactId>
@@ -43,39 +46,39 @@
 			<version>2.3.0</version>
 		</dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
-        <dependency>
-            <groupId>org.mapsforge</groupId>
-            <artifactId>mapsforge-themes</artifactId>
-            <version>${mapsforge.version}</version>
-        </dependency>
+		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
+		<dependency>
+			<groupId>org.mapsforge</groupId>
+			<artifactId>mapsforge-themes</artifactId>
+			<version>${mapsforge.version}</version>
+		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map -->
 		<dependency>
 			<groupId>org.mapsforge</groupId>
 			<artifactId>mapsforge-map</artifactId>
-            <version>${mapsforge.version}</version>
+			<version>${mapsforge.version}</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-awt -->
 		<dependency>
 			<groupId>org.mapsforge</groupId>
 			<artifactId>mapsforge-map-awt</artifactId>
-            <version>${mapsforge.version}</version>
+			<version>${mapsforge.version}</version>
 		</dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
-        <dependency>
-            <groupId>org.mapsforge</groupId>
-            <artifactId>mapsforge-themes</artifactId>
-            <version>${mapsforge.version}</version>
-        </dependency>
+		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
+		<dependency>
+			<groupId>org.mapsforge</groupId>
+			<artifactId>mapsforge-themes</artifactId>
+			<version>${mapsforge.version}</version>
+		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
 		<dependency>
 			<groupId>org.mapsforge</groupId>
 			<artifactId>mapsforge-map-reader</artifactId>
-            <version>${mapsforge.version}</version>
+			<version>${mapsforge.version}</version>
 		</dependency>
 
 	</dependencies>
diff --git a/be-graphes-model/pom.xml b/be-graphes-model/pom.xml
index 9d596fd..6f62a74 100644
--- a/be-graphes-model/pom.xml
+++ b/be-graphes-model/pom.xml
@@ -4,11 +4,14 @@
 	xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
+	
 	<parent>
 		<groupId>org.insa.graphs</groupId>
 		<artifactId>be-graphes-all</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
+	
 	<artifactId>be-graphes-model</artifactId>
 	<name>be-graphes-model</name>
+	
 </project>
diff --git a/pom.xml b/pom.xml
index 0c02ef4..c275f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,11 +10,11 @@
 	<packaging>pom</packaging>
 
 	<name>be-graphes-all</name>
-	<url>http://maven.apache.org</url>
 
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<jdk.version>1.8</jdk.version>
+		<maven.compiler.source>${jdk.version}</maven.compiler.source>
+		<maven.compiler.target>${jdk.version}</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	
@@ -24,8 +24,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
                 </configuration>
             </plugin>
         </plugins>