From 8a4a85d63a5adc9ac0b31da4182fb2b8b3f59cbf Mon Sep 17 00:00:00 2001
From: Benedikt Zoennchen <zoennchen.benedikt@hm.edu>
Date: Tue, 26 Feb 2019 14:49:10 +0100
Subject: [PATCH] refactor poms: remove duplicated and / or unused entries.

---
 VadereMeshing/pom.xml   | 40 +--------------------
 VadereSimulator/pom.xml | 78 +----------------------------------------
 VadereUtils/pom.xml     | 24 -------------
 pom.xml                 | 15 +++++---
 4 files changed, 12 insertions(+), 145 deletions(-)

diff --git a/VadereMeshing/pom.xml b/VadereMeshing/pom.xml
index 76417474f..ded8eeba1 100644
--- a/VadereMeshing/pom.xml
+++ b/VadereMeshing/pom.xml
@@ -8,7 +8,7 @@
         <version>0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <name>VadereGeometry</name>
+    <name>VadereMeshing</name>
     <artifactId>meshing</artifactId>
 
     <build>
@@ -36,44 +36,6 @@
             </excludes>
         </testResource>
     </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <!-- Maven Surefire is used to cup unit tests. -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
-                <configuration>
-                    <enableAssertions>true</enableAssertions>
-                    <excludes>
-                        <exclude></exclude>
-                    </excludes>
-                    <failIfNoTests>false</failIfNoTests>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.googlecode.mavennatives</groupId>
-                <artifactId>maven-nativedependencies-plugin</artifactId>
-                <version>0.0.5</version>
-                <executions>
-                    <execution>
-                        <id>unpacknatives</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
     <dependencies>
         <dependency>
diff --git a/VadereSimulator/pom.xml b/VadereSimulator/pom.xml
index ee59de856..bfeec73cd 100644
--- a/VadereSimulator/pom.xml
+++ b/VadereSimulator/pom.xml
@@ -9,7 +9,6 @@
 
   <artifactId>simulator</artifactId>
   <name>Vadere Simulator</name>
-
   <build>
     <sourceDirectory>src</sourceDirectory>
     <testSourceDirectory>tests</testSourceDirectory>
@@ -42,7 +41,7 @@
             <executions>
                 <execution>
                     <id>write_version_control_info_to_file</id>
-                    <phase>validate</phase>
+                    <phase>generate-resources</phase>
                     <goals>
                         <goal>exec</goal>
                     </goals>
@@ -58,19 +57,6 @@
                 <outputFile>resources/current_commit_hash.txt</outputFile>
             </configuration>
         </plugin>
-        <plugin>
-            <groupId>com.nativelibs4java</groupId>
-            <artifactId>maven-javacl-plugin</artifactId>
-            <version>1.0.0-RC4</version>
-            <executions>
-                <execution>
-                    <phase>generate-sources</phase>
-                    <goals>
-                        <goal>compile</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
       <plugin>
 		  <groupId>org.apache.maven.plugins</groupId>
 		  <artifactId>maven-compiler-plugin</artifactId>
@@ -87,20 +73,6 @@
               </annotationProcessorPaths>
 		  </configuration>
 		</plugin>
-        <plugin>
-            <!-- Maven Surefire is used to cup unit tests. -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.22.1</version>
-            <configuration>
-                <enableAssertions>true</enableAssertions>
-                <excludes>
-                    <exclude></exclude>
-                </excludes>
-                <failIfNoTests>false</failIfNoTests>
-            </configuration>
-        </plugin>
-
         <plugin>
             <!-- NOTE: We don't need a groupId specification because the group is
                  org.apache.maven.plugins ...which is assumed by default.
@@ -130,56 +102,8 @@
             </executions>
         </plugin>
     </plugins>
-    <pluginManagement>
-    	<plugins>
-    		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-    		<plugin>
-    			<groupId>org.eclipse.m2e</groupId>
-    			<artifactId>lifecycle-mapping</artifactId>
-    			<version>1.0.0</version>
-    			<configuration>
-    				<lifecycleMappingMetadata>
-    					<pluginExecutions>
-    						<pluginExecution>
-    							<pluginExecutionFilter>
-    								<groupId>
-    									com.nativelibs4java
-    								</groupId>
-    								<artifactId>
-    									maven-javacl-plugin
-    								</artifactId>
-    								<versionRange>
-    									[1.0.0-RC4,)
-    								</versionRange>
-    								<goals>
-    									<goal>compile</goal>
-    								</goals>
-    							</pluginExecutionFilter>
-    							<action>
-    								<execute>
-    									<runOnIncremental>false</runOnIncremental>
-    								</execute>
-    							</action>
-    						</pluginExecution>
-    					</pluginExecutions>
-    				</lifecycleMappingMetadata>
-    			</configuration>
-    		</plugin>
-    	</plugins>
-    </pluginManagement>
   </build>
 
- <!-- local repository for all jars without an external repo -->
-  <repositories>
-    <repository>
-      <id>nativelibs4java</id>
-      <name>nativelibs4java Maven2 Repository</name>
-      <url>http://nativelibs4java.sourceforge.net/maven</url>
-    </repository>
-  </repositories>
-    <properties>
-        <platform.dependency>windows-x86_64</platform.dependency>
-    </properties>
   <dependencies>
   	<dependency>
   		<groupId>commons-codec</groupId>
diff --git a/VadereUtils/pom.xml b/VadereUtils/pom.xml
index 49e14577e..eebe37cf6 100644
--- a/VadereUtils/pom.xml
+++ b/VadereUtils/pom.xml
@@ -35,30 +35,6 @@
               </excludes>
           </testResource>
       </testResources>
-    <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.0</version>
-            <configuration>
-                <source>1.11</source>
-                <target>1.11</target>
-            </configuration>
-        </plugin>
-        <plugin>
-            <!-- Maven Surefire is used to execute unit tests. -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.22.1</version>
-            <configuration>
-                <enableAssertions>true</enableAssertions>
-                <excludes>
-                    <exclude></exclude>
-                </excludes>
-                <failIfNoTests>false</failIfNoTests>
-            </configuration>
-        </plugin>
-    </plugins>
   </build>
     <!-- generated by lwjgl -->
     <properties>
diff --git a/pom.xml b/pom.xml
index e826040e6..e69572c62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
                                     <version>[3.0,)</version>
                                     </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>[1.11,)</version>
+                                    <version>[${maven-compiler.source.version},)</version>
                                 </requireJavaVersion>
                                 </rules>
                             </configuration>
@@ -45,12 +45,12 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.0</version>
                     <configuration>
-                        <release>10</release>
-                        <fork>true</fork>
-                        <meminitial>512m</meminitial>
-                        <maxmem>2048m</maxmem>
+                        <source>${maven-compiler.source.version}</source>
+                        <target>${maven-compiler.target.version}</target>
+                        <release>11</release>
                     </configuration>
                 </plugin>
+                <!--  Maven Surefire is used to run unit tests. -->
                 <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -64,6 +64,11 @@
                 </dependencies>
                 <configuration>
                     <threadCount>1</threadCount>
+                    <enableAssertions>true</enableAssertions>
+                    <excludes>
+                        <exclude></exclude>
+                    </excludes>
+                    <failIfNoTests>false</failIfNoTests>
                 </configuration>
             </plugin>
                 <plugin>
-- 
GitLab