Update Jenkinsfile and pom.xml

This commit is contained in:
Andrea Cavalli 2020-10-15 13:22:09 +02:00
parent bb140fedf2
commit 336a5522f1
2 changed files with 8 additions and 8 deletions

4
Jenkinsfile vendored
View File

@ -30,7 +30,7 @@ pipeline {
stage("Build & Deploy SNAPSHOT") { stage("Build & Deploy SNAPSHOT") {
agent { agent {
docker { docker {
image 'maven:3.6.3-openjdk-11' image 'maven:3.6.3-openjdk-15'
args '-v $HOME:/var/maven' args '-v $HOME:/var/maven'
reuseNode true reuseNode true
} }
@ -44,7 +44,7 @@ pipeline {
stage("Release") { stage("Release") {
agent { agent {
docker { docker {
image 'maven:3.6.3-openjdk-11' image 'maven:3.6.3-openjdk-15'
args '-v $HOME:/var/maven' args '-v $HOME:/var/maven'
reuseNode true reuseNode true
} }

12
pom.xml
View File

@ -7,8 +7,8 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>15</maven.compiler.target>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
@ -26,12 +26,12 @@
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId> <artifactId>javafx-controls</artifactId>
<version>13</version> <version>15</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId> <artifactId>javafx-fxml</artifactId>
<version>13</version> <version>15</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
@ -46,7 +46,7 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>3.8.0</version>
<configuration> <configuration>
<release>11</release> <release>15</release>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -116,7 +116,7 @@
<icon/> <icon/>
<jre> <jre>
<path/> <path/>
<minVersion>11</minVersion> <minVersion>15</minVersion>
<maxVersion/> <maxVersion/>
<jdkPreference>preferJre</jdkPreference> <jdkPreference>preferJre</jdkPreference>
<initialHeapSize>256</initialHeapSize> <initialHeapSize>256</initialHeapSize>