use jdk 13 everywhere to avoid resource encoding issues present in older jdks

This commit is contained in:
f43nd1r 2019-12-06 05:12:20 +01:00
parent 46f9569ca8
commit b65fea77ff
4 changed files with 19 additions and 26 deletions

View file

@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java: [ '1.8', '1.13' ] java: [ '1.13' ]
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1

View file

@ -1,4 +1,4 @@
FROM openjdk:8-jdk-alpine FROM openjdk:13-slim
VOLUME /tmp VOLUME /tmp
ARG DEPENDENCY=target/dependency ARG DEPENDENCY=target/dependency
COPY ${DEPENDENCY}/WEB-INF/lib /acrarium/lib COPY ${DEPENDENCY}/WEB-INF/lib /acrarium/lib

View file

@ -13,7 +13,7 @@
<properties> <properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <java.version>13</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<vaadin.version>14.0.14</vaadin.version> <vaadin.version>14.0.14</vaadin.version>
@ -233,14 +233,6 @@
<id>central</id> <id>central</id>
<url>https://repo1.maven.org/maven2/</url> <url>https://repo1.maven.org/maven2/</url>
</pluginRepository> </pluginRepository>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-f43nd1r-maven</id>
<name>bintray-plugins</name>
<url>https://dl.bintray.com/f43nd1r/maven</url>
</pluginRepository>
</pluginRepositories> </pluginRepositories>
<build> <build>
<defaultGoal>spring-boot:run</defaultGoal> <defaultGoal>spring-boot:run</defaultGoal>
@ -327,6 +319,22 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<doclint>none</doclint>
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>com.faendir.maven</groupId> <groupId>com.faendir.maven</groupId>
<artifactId>resource-class-generator</artifactId> <artifactId>resource-class-generator</artifactId>

15
pom.xml
View file

@ -33,21 +33,6 @@
<tagNameFormat>v@{project.version}</tagNameFormat> <tagNameFormat>v@{project.version}</tagNameFormat>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<doclint>none</doclint>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId> <artifactId>flatten-maven-plugin</artifactId>