From 9fff19a4107aa3d39dc5c1f27ac61f87780d6a99 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Tue, 1 Feb 2022 12:16:11 +0100
Subject: [PATCH] Update some more plugin versions
---
.gitlab-ci.yml | 5 ++---
pom.xml | 9 ++++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb5d2b0..f0ccbc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,9 +69,8 @@ build_and_deploy:
script:
- 'git submodule init'
- 'git submodule update'
- # REMOVE SKIPTESTS AND USE VERIFY AS SOON AS BOTH ARE FIXED...!!
-# - 'mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS-U clean verify -Ptextgrid.deb'
- - 'mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean package -Ptextgrid.deb -DskipTests=true'
+ # REMOVE SKIPTESTS AS SOON AS TESTS ARE WORKING...!!
+ - 'mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -DskipTests=true'
artifacts:
name: WEBAPP_DEB_PACKAGES
paths:
diff --git a/pom.xml b/pom.xml
index f8fa09d..4d79303 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,9 @@
<junit-version>4.13.2</junit-version>
<spring-version>3.2.2.RELEASE</spring-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+ <git-commit-id-plugin.version>2.1.15</git-commit-id-plugin.version>
+ <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+ <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<!-- The following properties are used for configuring the web service
and can be overridden in profiles -->
<aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
@@ -210,6 +212,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java-source.version}</source>
<target>${java-target.version}</target>
@@ -218,6 +221,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>${maven-eclipse-plugin.version}</version>
<configuration>
<projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
<wtpmanifest>true</wtpmanifest>
@@ -266,7 +270,7 @@
<!--
<version>2.1.5</version>
-->
- <version>2.1.15</version>
+ <version>${git-commit-id-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -288,7 +292,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
<configuration>
<source>${java-source.version}</source>
<target>${java-target.version}</target>
--
GitLab