Skip to content

Commit

Permalink
Updating stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@kagkarlsson
kagkarlsson committed May 20, 2020
1 parent 1764d0d commit 0643c75
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 143 deletions.
1 change: 1 addition & 0 deletions .java-version
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11.0
22 changes: 0 additions & 22 deletions NOTICE
View file

This file was deleted.

124 changes: 34 additions & 90 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<developers>
<developer>
<name>Gustav Karlsson</name>
<email>gustav80@gmail.com</email>
<email>kagkarlsson@gmail.com</email>
</developer>
</developers>

Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
<version>1.7.30</version>
</dependency>

<dependency>
Expand All @@ -62,13 +62,13 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.2</version>
<version>2.5.0</version>
<scope>test</scope>
</dependency>

Expand All @@ -78,39 +78,35 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
<version>1.0.6.1</version>
<configuration>
<noticeTemplate>${project.basedir}/src/main/notice/NOTICE.template</noticeTemplate>
<licenseMapping>
<param>${project.basedir}/src/main/notice/license-mappings.xml</param>
</licenseMapping>
<skipChecks>${skipChecks}</skipChecks>
</configuration>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>generate-notice-file</id>
<goals>
<goal>check</goal>
<goal>analyze-only</goal>
</goals>
<phase>verify</phase>
<configuration>
<failOnWarning>true</failOnWarning>
<ignoreNonCompile>true</ignoreNonCompile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.10</version>
<version>2.11</version>
<configuration>
<header>src/main/license-header.txt</header>
<strictCheck>true</strictCheck>
<excludes>
<exclude>pom.xml</exclude>
<exclude>LICENSE*</exclude>
<exclude>NOTICE</exclude>
<exclude>src/main/notice/NOTICE.template</exclude>
<exclude>src/main/notice/license-mappings.xml</exclude>
<exclude>.java-version</exclude>
<exclude>src/test/**</exclude>
</excludes>
<failIfMissing>${failOnMissingHeader}</failIfMissing>
Expand All @@ -125,49 +121,11 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>*:*</exclude>
</excludes>
<includes>
<include>org.slf4j:slf4j-api</include>
<include>ch.qos.logback:logback-classic</include>
<include>org.hamcrest:hamcrest-core</include>
<include>org.hamcrest:hamcrest-library</include>
<include>junit:junit</include>
<include>org.mockito:mockito-core</include>
<include>org.objenesis:objenesis</include>
<include>org.hsqldb:hsqldb</include>
<include>ch.qos.logback:logback-core</include>
</includes>
<searchTransitive>true</searchTransitive>
<message>
Detected unknown dependencies! Verify that all licenses are OK, and run mvn notice:generate to update the NOTICE file.
</message>
</bannedDependencies>
</rules>
<skip>${skipChecks}</skip>
</configuration>
<executions>
<execution>
<id>check-banned-dependencies</id>
<goals>
<goal>enforce</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>

<!-- Release plugins -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.2</version>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -199,6 +157,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<configuration>
<keyname>github.com/kagkarlsson</keyname>
<passphraseServerId>github.com/kagkarlsson</passphraseServerId>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -210,15 +176,14 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.1</version>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
<tagNameFormat>@{project.version}</tagNameFormat>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
Expand All @@ -227,29 +192,13 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<goals>
<goal>analyze-only</goal>
</goals>
<configuration>
<failOnWarning>true</failOnWarning>
<ignoreNonCompile>true</ignoreNonCompile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>

Expand Down Expand Up @@ -279,7 +228,6 @@
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
Expand All @@ -305,8 +253,4 @@
</repository>
</distributionManagement>

<prerequisites>
<maven>2.2.1</maven>
</prerequisites>

</project>
12 changes: 0 additions & 12 deletions src/main/notice/NOTICE.template
View file

This file was deleted.

8 changes: 0 additions & 8 deletions src/main/notice/license-mappings.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...github/kagkarlsson/jdbc/JdbcRunnerIT.java → ...thub/kagkarlsson/jdbc/JdbcRunnerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.junit.Assert.assertThat;

public class JdbcRunnerIT {
public class JdbcRunnerTest {

@Rule
public HsqlTestDatabaseRule database = new HsqlTestDatabaseRule();
Expand Down
23 changes: 13 additions & 10 deletions src/test/resources/logback-test.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="TRACE">
<appender-ref ref="STDOUT" />
</root>
</configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} %highlight(%-5level) %cyan(%logger{50}) - %msg%n%rootException</pattern>
</encoder>
</appender>

<logger level="INFO" name="com.github.kagkarlsson"/>

<root level="WARN">
<appender-ref ref="STDOUT"/>
</root>

</configuration>

0 comments on commit 0643c75

Please sign in to comment.