Merge pull request 'develop' (#7) from develop into master
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good

Reviewed-on: #7
This commit is contained in:
2021-09-14 22:24:35 -05:00

74
pom.xml
View File

@ -20,8 +20,8 @@
<main.basedir>${project.basedir}</main.basedir> <main.basedir>${project.basedir}</main.basedir>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<log4j.version>2.13.3</log4j.version> <log4j.version>2.14.1</log4j.version>
<slf4j.version>1.7.30</slf4j.version> <slf4j.version>1.7.32</slf4j.version>
<nexus.repo>https://nexus.locusworks.net</nexus.repo> <nexus.repo>https://nexus.locusworks.net</nexus.repo>
</properties> </properties>
@ -30,38 +30,54 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version> <version>3.0.0-M5</version>
<configuration> <configuration>
<forkMode>always</forkMode> <forkMode>always</forkMode>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugin</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>${maven.compiler.source}</source>
<target>1.8</target> <target>${maven.compiler.target}</target>
<failOnError>true</failOnError>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.owasp</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>dependency-check-maven</artifactId>
<version>3.0.0-M2</version> <version>6.3.1</version>
<executions> <executions>
<execution> <execution>
<id>enforce</id> <goals>
<configuration> <goal>check</goal>
<rules> </goals>
<DependencyConvergence /> </execution>
</rules> </executions>
</configuration> </plugin>
<goals> <plugin>
<goal>enforce</goal> <groupId>org.apache.maven.plugins</groupId>
</goals> <artifactId>maven-enforcer-plugin</artifactId>
</execution> <version>3.0.0</version>
</executions> <executions>
</plugin> <execution>
<id>enforce</id>
<configuration>
<rules>
<DependencyConvergence />
</rules>
</configuration>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@ -81,10 +97,10 @@
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version> <version>${log4j.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>