Skip to content

Commit

Permalink
Sletter utkommentert konfigurasjon og fjerner properties som støyer.
Browse files Browse the repository at this point in the history
  • Loading branch information
@eivinhb
eivinhb committed Jan 11, 2018
1 parent 13a7091 commit b2b8388
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 148 deletions.
9 changes: 0 additions & 9 deletions checkstyle-suppressions.xml
View file

This file was deleted.

145 changes: 6 additions & 139 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<version>${surefire-plugin.version}</version>
<configuration>
<childDelegation>true</childDelegation>
<useFile>${surefire-use-file}</useFile>
<useFile>true</useFile>
</configuration>
</plugin>
<plugin>
Expand All @@ -137,122 +137,6 @@
</filesets>
</configuration>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${site-plugin.version}</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${project-info-reports-plugin.version}</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
<reports>
<report>index</report>
<report>license</report>
<report>project-team</report>
<report>scm</report>
<report>dependencies</report>
<report>distribution-management</report>
</reports>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${cobertura-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
<version>${changelog-plugin.version}</version>
<configuration>
<type>range</type>
<range>1095</range>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc-plugin}</version>
<configuration>
<minmemory>128m</minmemory>
<maxmemory>512</maxmemory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>${pmd.plugin}</version>
<configuration>
<targetjdk>${project.jdk}</targetjdk>
<rulesets>
<ruleset>/rulesets/basic.xml</ruleset>
<ruleset>/rulesets/controversial.xml</ruleset>
</rulesets>
<format>xml</format>
<linkXref>true</linkXref>
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
<minimumTokens>100</minimumTokens>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>${taglist-plugin}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
<version>${jdepend-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefire-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-plugin}</version>
</plugin>
</reportPlugins>
</configuration>
</plugin>
-->
<!--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>${m2e-lifecycle-mapping.version}</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>enforce</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -307,11 +191,6 @@

<dependencies>
<!-- Apache Commons -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
Expand Down Expand Up @@ -351,25 +230,13 @@

<properties>
<!-- Dependency version -->
<commons-io>1.4</commons-io>
<junit.version>4.8.2</junit.version>
<junit.version>4.12</junit.version>
<!-- Plugin versions -->
<m2e-lifecycle-mapping.version>1.0.0</m2e-lifecycle-mapping.version>
<compiler-plugin.version>2.3.2</compiler-plugin.version>
<surefire-plugin.version>2.6</surefire-plugin.version>
<surefire-use-file>true</surefire-use-file>
<clean-plugin.version>2.4.1</clean-plugin.version>
<gpg-plugin>1.1</gpg-plugin>
<javadoc-plugin>2.7</javadoc-plugin>
<cobertura-plugin.version>2.4</cobertura-plugin.version>
<changelog-plugin.version>2.2</changelog-plugin.version>
<jxr-plugin>2.2</jxr-plugin>
<pmd-plugin>2.5</pmd-plugin>
<taglist-plugin>2.4</taglist-plugin>
<jdepend-plugin>2.0-beta-2</jdepend-plugin>
<findbugs-plugin>2.3.1</findbugs-plugin>
<site-plugin.version>3.4</site-plugin.version>
<project-info-reports-plugin.version>2.4</project-info-reports-plugin.version>
<compiler-plugin.version>3.7.0</compiler-plugin.version>
<surefire-plugin.version>2.20.1</surefire-plugin.version>
<clean-plugin.version>3.0.0</clean-plugin.version>
<gpg-plugin>1.6</gpg-plugin>
<!-- Other properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.jdk>1.6</project.jdk>
Expand Down

0 comments on commit b2b8388

Please sign in to comment.