Browse Source

[maven] Cleanup pom.xml files.

Mikaël Capelle 4 years 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
 	xmlns="http://maven.apache.org/POM/4.0.0"
4
 	xmlns="http://maven.apache.org/POM/4.0.0"
5
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6
 	<modelVersion>4.0.0</modelVersion>
6
 	<modelVersion>4.0.0</modelVersion>
7
+	
7
 	<parent>
8
 	<parent>
8
 		<groupId>org.insa.graphs</groupId>
9
 		<groupId>org.insa.graphs</groupId>
9
 		<artifactId>be-graphes-all</artifactId>
10
 		<artifactId>be-graphes-all</artifactId>
10
 		<version>0.0.1-SNAPSHOT</version>
11
 		<version>0.0.1-SNAPSHOT</version>
11
 	</parent>
12
 	</parent>
13
+	
12
 	<artifactId>be-graphes-algos</artifactId>
14
 	<artifactId>be-graphes-algos</artifactId>
13
 	<name>be-graphes-algos</name>
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
 	<dependencies>
17
 	<dependencies>
19
 		<dependency>
18
 		<dependency>
20
 			<groupId>org.insa.graphs</groupId>
19
 			<groupId>org.insa.graphs</groupId>
22
 			<version>${project.version}</version>
21
 			<version>${project.version}</version>
23
 		</dependency>
22
 		</dependency>
24
 	</dependencies>
23
 	</dependencies>
24
+	
25
 </project>
25
 </project>

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

9
 		<artifactId>be-graphes-all</artifactId>
9
 		<artifactId>be-graphes-all</artifactId>
10
 		<version>0.0.1-SNAPSHOT</version>
10
 		<version>0.0.1-SNAPSHOT</version>
11
 	</parent>
11
 	</parent>
12
-	
12
+
13
 	<properties>
13
 	<properties>
14
-	   <mapsforge.version>0.13.0</mapsforge.version>
14
+		<mapsforge.version>0.13.0</mapsforge.version>
15
 	</properties>
15
 	</properties>
16
-	
16
+
17
 	<artifactId>be-graphes-gui</artifactId>
17
 	<artifactId>be-graphes-gui</artifactId>
18
 	<name>be-graphes-gui</name>
18
 	<name>be-graphes-gui</name>
19
 	
19
 	
20
+	<!-- Repository for Salamander (dependency of Mapsforge). -->
20
 	<repositories>
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
 	<dependencies>
28
 	<dependencies>
29
+	
28
 		<dependency>
30
 		<dependency>
29
 			<groupId>org.insa.graphs</groupId>
31
 			<groupId>org.insa.graphs</groupId>
30
 			<artifactId>be-graphes-model</artifactId>
32
 			<artifactId>be-graphes-model</artifactId>
31
 			<version>${project.version}</version>
33
 			<version>${project.version}</version>
32
 		</dependency>
34
 		</dependency>
35
+		
33
 		<dependency>
36
 		<dependency>
34
 			<groupId>org.insa.graphs</groupId>
37
 			<groupId>org.insa.graphs</groupId>
35
 			<artifactId>be-graphes-algos</artifactId>
38
 			<artifactId>be-graphes-algos</artifactId>
43
 			<version>2.3.0</version>
46
 			<version>2.3.0</version>
44
 		</dependency>
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
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map -->
56
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map -->
54
 		<dependency>
57
 		<dependency>
55
 			<groupId>org.mapsforge</groupId>
58
 			<groupId>org.mapsforge</groupId>
56
 			<artifactId>mapsforge-map</artifactId>
59
 			<artifactId>mapsforge-map</artifactId>
57
-            <version>${mapsforge.version}</version>
60
+			<version>${mapsforge.version}</version>
58
 		</dependency>
61
 		</dependency>
59
 
62
 
60
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-awt -->
63
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-awt -->
61
 		<dependency>
64
 		<dependency>
62
 			<groupId>org.mapsforge</groupId>
65
 			<groupId>org.mapsforge</groupId>
63
 			<artifactId>mapsforge-map-awt</artifactId>
66
 			<artifactId>mapsforge-map-awt</artifactId>
64
-            <version>${mapsforge.version}</version>
67
+			<version>${mapsforge.version}</version>
65
 		</dependency>
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
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
77
 		<!-- https://mvnrepository.com/artifact/org.mapsforge/mapsforge-map-reader -->
75
 		<dependency>
78
 		<dependency>
76
 			<groupId>org.mapsforge</groupId>
79
 			<groupId>org.mapsforge</groupId>
77
 			<artifactId>mapsforge-map-reader</artifactId>
80
 			<artifactId>mapsforge-map-reader</artifactId>
78
-            <version>${mapsforge.version}</version>
81
+			<version>${mapsforge.version}</version>
79
 		</dependency>
82
 		</dependency>
80
 
83
 
81
 	</dependencies>
84
 	</dependencies>

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

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

+ 5
- 5
pom.xml View File

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

Loading…
Cancel
Save