6 Commits

Author SHA1 Message Date
f5806348dc Merge pull request 'feature/update_library_again (#8)' (#9) from develop into master
Some checks reported errors
Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #9
2022-03-02 16:57:19 -06:00
043e9e9075 feature/update_library_again (#8)
Some checks reported errors
Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit
Co-authored-by: Isaac Parenteau <locus2k@gmail.com>
Reviewed-on: #8
2022-03-02 16:56:32 -06:00
77bd18b0f1 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
2021-09-14 22:24:35 -05:00
b91e7a9618 Merge pull request 'Updated dependencies' (#5) from feature/library_update into develop
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
Reviewed-on: #5
2021-09-14 22:23:33 -05:00
211196aca9 Updated dependencies
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
2021-09-14 22:18:04 -05:00
e30e2c8455 Merge pull request 'release/1.0' (#4) from release/1.0 into master
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
2020-05-31 21:32:23 +00:00
2 changed files with 47 additions and 30 deletions

1
.gitignore vendored
View File

@ -2,4 +2,5 @@
.classpath .classpath
.settings/ .settings/
target/ target/
.idea/
bin/ bin/

76
pom.xml
View File

@ -9,7 +9,7 @@
<description>Logger library for applications</description> <description>Logger library for applications</description>
<scm> <scm>
<url>ssh://git@bitbucket.org:locus2k/applogger.git</url> <url>https://gitea.locusworks.net/locusworks/app-logger.git</url>
</scm> </scm>
<organization> <organization>
<name>locusworks</name> <name>locusworks</name>
@ -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.17.2</log4j.version>
<slf4j.version>1.7.30</slf4j.version> <slf4j.version>1.7.36</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.10.0</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>7.0.0</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>