Browse Source

[maven] Cleanup pom.xml files.

Mikaël Capelle 1 year ago
parent
commit
2914df4a37
4 changed files with 38 additions and 32 deletions
  1. 4
    4
      be-graphes-algos/pom.xml
  2. 26
    23
      be-graphes-gui/pom.xml
  3. 3
    0
      be-graphes-model/pom.xml
  4. 5
    5
      pom.xml

+ 4
- 4
be-graphes-algos/pom.xml View File

@@ -4,17 +4,16 @@
4 4
 	xmlns="http://maven.apache.org/POM/4.0.0"
5 5
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6 6
 	<modelVersion>4.0.0</modelVersion>
7
+	
7 8
 	<parent>
8 9
 		<groupId>org.insa.graphs</groupId>
9 10
 		<artifactId>be-graphes-all</artifactId>
10 11
 		<version>0.0.1-SNAPSHOT</version>
11 12
 	</parent>
13
+	
12 14
 	<artifactId>be-graphes-algos</artifactId>
13 15
 	<name>be-graphes-algos</name>
14
-	<url>http://maven.apache.org</url>
15
-	<properties>
16
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17
-	</properties>
16
+	
18 17
 	<dependencies>
19 18
 		<dependency>
20 19
 			<groupId>org.insa.graphs</groupId>
@@ -22,4 +21,5 @@
22 21
 			<version>${project.version}</version>
23 22
 		</dependency>
24 23
 	</dependencies>
24
+	
25 25
 </project>

+ 26
- 23
be-graphes-gui/pom.xml View File

@@ -9,27 +9,30 @@
9 9
 		<artifactId>be-graphes-all</artifactId>
10 10
 		<version>0.0.1-SNAPSHOT</version>
11 11
 	</parent>
12
-	
12
+
13 13
 	<properties>
14
-	   <mapsforge.version>0.13.0</mapsforge.version>
14
+		<mapsforge.version>0.13.0</mapsforge.version>
15 15
 	</properties>
16
-	
16
+
17 17
 	<artifactId>be-graphes-gui</artifactId>
18 18
 	<name>be-graphes-gui</name>
19 19
 	
20
+	<!-- Repository for Salamander (dependency of Mapsforge). -->
20 21
 	<repositories>
21
-        <repository>
22
-            <id>jitpack.io</id>
23
-            <url>https://jitpack.io</url>
24
-        </repository>
25
-    </repositories>
22
+		<repository>
23
+			<id>jitpack.io</id>
24
+			<url>https://jitpack.io</url>
25
+		</repository>
26
+	</repositories>
26 27
 
27 28
 	<dependencies>
29
+	
28 30
 		<dependency>
29 31
 			<groupId>org.insa.graphs</groupId>
30 32
 			<artifactId>be-graphes-model</artifactId>
31 33
 			<version>${project.version}</version>
32 34
 		</dependency>
35
+		
33 36
 		<dependency>
34 37
 			<groupId>org.insa.graphs</groupId>
35 38
 			<artifactId>be-graphes-algos</artifactId>
@@ -43,39 +46,39 @@
43 46
 			<version>2.3.0</version>
44 47
 		</dependency>
45 48
 
46
-        <!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
47
-        <dependency>
48
-            <groupId>org.mapsforge</groupId>
49
-            <artifactId>mapsforge-themes</artifactId>
50
-            <version>${mapsforge.version}</version>
51
-        </dependency>
49
+		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
50
+		<dependency>
51
+			<groupId>org.mapsforge</groupId>
52
+			<artifactId>mapsforge-themes</artifactId>
53
+			<version>${mapsforge.version}</version>
54
+		</dependency>
52 55
 
53 56
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map -->
54 57
 		<dependency>
55 58
 			<groupId>org.mapsforge</groupId>
56 59
 			<artifactId>mapsforge-map</artifactId>
57
-            <version>${mapsforge.version}</version>
60
+			<version>${mapsforge.version}</version>
58 61
 		</dependency>
59 62
 
60 63
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-awt -->
61 64
 		<dependency>
62 65
 			<groupId>org.mapsforge</groupId>
63 66
 			<artifactId>mapsforge-map-awt</artifactId>
64
-            <version>${mapsforge.version}</version>
67
+			<version>${mapsforge.version}</version>
65 68
 		</dependency>
66 69
 
67
-        <!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
68
-        <dependency>
69
-            <groupId>org.mapsforge</groupId>
70
-            <artifactId>mapsforge-themes</artifactId>
71
-            <version>${mapsforge.version}</version>
72
-        </dependency>
70
+		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
71
+		<dependency>
72
+			<groupId>org.mapsforge</groupId>
73
+			<artifactId>mapsforge-themes</artifactId>
74
+			<version>${mapsforge.version}</version>
75
+		</dependency>
73 76
 
74 77
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
75 78
 		<dependency>
76 79
 			<groupId>org.mapsforge</groupId>
77 80
 			<artifactId>mapsforge-map-reader</artifactId>
78
-            <version>${mapsforge.version}</version>
81
+			<version>${mapsforge.version}</version>
79 82
 		</dependency>
80 83
 
81 84
 	</dependencies>

+ 3
- 0
be-graphes-model/pom.xml View File

@@ -4,11 +4,14 @@
4 4
 	xmlns="http://maven.apache.org/POM/4.0.0"
5 5
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6 6
 	<modelVersion>4.0.0</modelVersion>
7
+	
7 8
 	<parent>
8 9
 		<groupId>org.insa.graphs</groupId>
9 10
 		<artifactId>be-graphes-all</artifactId>
10 11
 		<version>0.0.1-SNAPSHOT</version>
11 12
 	</parent>
13
+	
12 14
 	<artifactId>be-graphes-model</artifactId>
13 15
 	<name>be-graphes-model</name>
16
+	
14 17
 </project>

+ 5
- 5
pom.xml View File

@@ -10,11 +10,11 @@
10 10
 	<packaging>pom</packaging>
11 11
 
12 12
 	<name>be-graphes-all</name>
13
-	<url>http://maven.apache.org</url>
14 13
 
15 14
 	<properties>
16
-		<maven.compiler.source>1.8</maven.compiler.source>
17
-		<maven.compiler.target>1.8</maven.compiler.target>
15
+		<jdk.version>1.8</jdk.version>
16
+		<maven.compiler.source>${jdk.version}</maven.compiler.source>
17
+		<maven.compiler.target>${jdk.version}</maven.compiler.target>
18 18
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19 19
 	</properties>
20 20
 	
@@ -24,8 +24,8 @@
24 24
                 <artifactId>maven-compiler-plugin</artifactId>
25 25
                 <version>3.1</version>
26 26
                 <configuration>
27
-                    <source>8</source>
28
-                    <target>8</target>
27
+                    <source>${jdk.version}</source>
28
+                    <target>${jdk.version}</target>
29 29
                 </configuration>
30 30
             </plugin>
31 31
         </plugins>

Loading…
Cancel
Save