Skip to content

GitLab

V
vadere
Commit 8a4a85d6 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files
Options

refactor poms: remove duplicated and / or unused entries.

parent 76fc8c5a
Pipeline #93828 failed with stages
          in 42 minutes and 40 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 12 additions and 145 deletions
          VadereMeshing/pom.xml
          View file @ 8a4a85d6
          ......@@ -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>
          ......
          VadereSimulator/pom.xml
          View file @ 8a4a85d6
          ......@@ -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>
          ......
          VadereUtils/pom.xml
          View file @ 8a4a85d6
          ......@@ -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>
          ......
          pom.xml
          View file @ 8a4a85d6
          ......@@ -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>
          ......
          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