Commit 40efe0fe authored by Stein Eldar Johnsen's avatar Stein Eldar Johnsen
Browse files

Deps and pipeline updates.

parent e11532f0
Pipeline #115887304 failed with stages
in 1 minute and 14 seconds
......@@ -32,7 +32,7 @@ cache:
coverage: /([0-9]{1,3}[.][0-9][0-9]) % covered/
after_script:
# Never cache the snapshot build.
- rm -rf .m2/repository/net/morimekta/utils/diff-util/*-SNAPSHOT/ || /bin/true
- rm -rf .m2/repository/net/morimekta/utils/testing-util/*-SNAPSHOT/ || /bin/true
artifacts:
reports:
junit:
......@@ -40,16 +40,20 @@ cache:
verify:jdk8:
<<: *verify
image: maven:3.5-jdk-8-slim
image: maven:3.6-jdk-8-alpine
verify:jdk11:
<<: *verify
image: maven:3.5-jdk-11-slim
image: maven:3.6-jdk-11-slim
artifacts:
expire_in: 5 minutes
paths:
- target/site/**/*
verify:jdk14:
<<: *verify
image: maven:3.6-jdk-14
pages:
image: ruby:2.5
cache:
......@@ -75,4 +79,4 @@ pages:
paths:
- public
dependencies:
- verify:jdk11
- verify:jdk11
\ No newline at end of file
......@@ -52,7 +52,6 @@
</developer>
</developers>
<!-- 1.7 required for diff compatibility. -->
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
......@@ -61,6 +60,7 @@
<!-- project config -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.javadoc.encoding>UTF-8</project.javadoc.encoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<maven.javadocs.encoding>UTF-8</maven.javadocs.encoding>
......@@ -76,22 +76,68 @@
</properties>
<prerequisites>
<maven>3.0.4</maven>
<maven>3.3.9</maven>
</prerequisites>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
</dependency>
<dependency>
<groupId>com.tngtech.java</groupId>
<artifactId>junit-dataprovider</artifactId>
<version>1.13.1</version>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>io-util</artifactId>
<version>3.7.1</version>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>diff-util</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>console-util</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<!-- testing dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.2.4</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>io-util</artifactId>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>diff-util</artifactId>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>console-util</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
......@@ -108,12 +154,29 @@
<groupId>com.tngtech.java</groupId>
<artifactId>junit-dataprovider</artifactId>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>io-util</artifactId>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>diff-util</artifactId>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>console-util</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<!-- testing dependencies -->
<!-- Test Dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
......@@ -121,120 +184,54 @@
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>io-util</artifactId>
<version>3.6.0</version>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>diff-util</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>net.morimekta.utils</groupId>
<artifactId>console-util</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<!-- testing dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<dependency>
<groupId>com.tngtech.java</groupId>
<artifactId>junit-dataprovider</artifactId>
<version>1.13.1</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.25.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin><artifactId>maven-clean-plugin</artifactId><version>3.1.0</version></plugin>
<plugin><artifactId>maven-compiler-plugin</artifactId><version>3.8.0</version></plugin>
<plugin><artifactId>maven-deploy-plugin</artifactId><version>2.8.2</version></plugin>
<plugin><artifactId>maven-enforcer-plugin</artifactId><version>1.4.1</version></plugin>
<plugin><artifactId>maven-gpg-plugin</artifactId><version>1.6</version></plugin>
<plugin><artifactId>maven-install-plugin</artifactId><version>2.5.2</version></plugin>
<plugin><artifactId>maven-jar-plugin</artifactId><version>3.2.0</version></plugin>
<plugin><artifactId>maven-javadoc-plugin</artifactId><version>3.1.1</version></plugin>
<plugin><artifactId>maven-release-plugin</artifactId><version>2.5.3</version></plugin>
<plugin><artifactId>maven-resources-plugin</artifactId><version>3.1.0</version></plugin>
<plugin><artifactId>maven-site-plugin</artifactId><version>3.8.2</version></plugin>
<plugin><artifactId>maven-source-plugin</artifactId><version>3.2.1</version></plugin>
<plugin><artifactId>maven-surefire-plugin</artifactId><version>2.22.2</version></plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.3</version>
<version>0.8.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-XDcompilePolicy=simple</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
......@@ -242,6 +239,37 @@
<rulesUri>file:version-rules.xml</rulesUri>
</configuration>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<dependencies>
<!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
<version>3.1.12</version>
</dependency>
</dependencies>
<configuration>
<failOnError>true</failOnError>
<excludeFilterFile>${project.basedir}/spotbugs-exclude.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>net.morimekta.testing</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
......@@ -259,15 +287,12 @@
<doclint>all</doclint>
<failOnError>true</failOnError>
<nodeprecatedlist>true</nodeprecatedlist>
<additionalOptions>
<additionalOption>-html5</additionalOption>
<additionalOption>-quiet</additionalOption>
</additionalOptions>
<notimestamp>true</notimestamp>
<quiet>true</quiet>
<additionalOptions>-html5</additionalOptions>
<groups>
<group>
<title>Testing Utils</title>
<packages>net.morimekta.testing.*</packages>
</group>
</groups>
</configuration>
<executions>
<execution>
......@@ -296,18 +321,17 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
<version>1.11.1</version>
<version>1.11.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.11.1</version>
<version>1.11.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
......@@ -358,7 +382,9 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
......@@ -371,18 +397,61 @@
<profiles>
<profile>
<id>jdk9</id>
<id>jdk8</id>
<activation>
<!-- for some reason failed in CI on java 11... -->
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- JDK8 javadoc does not support the -html5 option -->
<additionalOptions>-quiet</additionalOptions>
<additionalOptions>
<additionalOption>-quiet</additionalOption>
</additionalOptions>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk11</id>
<activation>
<!-- for some reason failed in CI on java 11... -->
<jdk>11</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs combine.children="append">
<arg>-Xplugin:ErrorProne</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.3.4</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
......@@ -401,7 +470,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype</serverId>
......@@ -412,7 +480,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
......
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