11.3.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 8a4a85d6 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen

refactor poms: remove duplicated and / or unused entries.

parent 76fc8c5a
Pipeline #93828 failed with stages
in 42 minutes and 40 seconds
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>0.1-SNAPSHOT</version> <version>0.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>VadereGeometry</name> <name>VadereMeshing</name>
<artifactId>meshing</artifactId> <artifactId>meshing</artifactId>
<build> <build>
...@@ -36,44 +36,6 @@ ...@@ -36,44 +36,6 @@
</excludes> </excludes>
</testResource> </testResource>
</testResources> </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> </build>
<dependencies> <dependencies>
<dependency> <dependency>
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
<artifactId>simulator</artifactId> <artifactId>simulator</artifactId>
<name>Vadere Simulator</name> <name>Vadere Simulator</name>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<testSourceDirectory>tests</testSourceDirectory> <testSourceDirectory>tests</testSourceDirectory>
...@@ -42,7 +41,7 @@ ...@@ -42,7 +41,7 @@
<executions> <executions>
<execution> <execution>
<id>write_version_control_info_to_file</id> <id>write_version_control_info_to_file</id>
<phase>validate</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
...@@ -58,19 +57,6 @@ ...@@ -58,19 +57,6 @@
<outputFile>resources/current_commit_hash.txt</outputFile> <outputFile>resources/current_commit_hash.txt</outputFile>
</configuration> </configuration>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
...@@ -87,20 +73,6 @@ ...@@ -87,20 +73,6 @@
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>
</plugin> </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> <plugin>
<!-- NOTE: We don't need a groupId specification because the group is <!-- NOTE: We don't need a groupId specification because the group is
org.apache.maven.plugins ...which is assumed by default. org.apache.maven.plugins ...which is assumed by default.
...@@ -130,56 +102,8 @@ ...@@ -130,56 +102,8 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </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> </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> <dependencies>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
......
...@@ -35,30 +35,6 @@ ...@@ -35,30 +35,6 @@
</excludes> </excludes>
</testResource> </testResource>
</testResources> </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> </build>
<!-- generated by lwjgl --> <!-- generated by lwjgl -->
<properties> <properties>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<version>[3.0,)</version> <version>[3.0,)</version>
</requireMavenVersion> </requireMavenVersion>
<requireJavaVersion> <requireJavaVersion>
<version>[1.11,)</version> <version>[${maven-compiler.source.version},)</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>3.8.0</version>
<configuration> <configuration>
<release>10</release> <source>${maven-compiler.source.version}</source>
<fork>true</fork> <target>${maven-compiler.target.version}</target>
<meminitial>512m</meminitial> <release>11</release>
<maxmem>2048m</maxmem>
</configuration> </configuration>
</plugin> </plugin>
<!-- Maven Surefire is used to run unit tests. -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
...@@ -64,6 +64,11 @@ ...@@ -64,6 +64,11 @@
</dependencies> </dependencies>
<configuration> <configuration>
<threadCount>1</threadCount> <threadCount>1</threadCount>
<enableAssertions>true</enableAssertions>
<excludes>
<exclude></exclude>
</excludes>
<failIfNoTests>false</failIfNoTests>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment