From b494752e9128e4c89306cbeb9fef4ae341e1516c Mon Sep 17 00:00:00 2001
From: Daniel Haag <daniel.haag@uibk.ac.at>
Date: Wed, 22 Jan 2020 09:36:54 +0100
Subject: [PATCH] openolat#167: disabling javadoc generation as newer maven
versions seem to be more strict and upstream does not seem to care about it
for now
---
.gitlab-ci.yml | 2 +-
scripts/uibk-release.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d7c8aa4ee8..452545b9743 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ cache:
- 'mkdir .m2 || echo ".m2 directory exists already"'
- 'cp ./scripts/settings.xml .m2/settings.xml'
script:
- - 'mvn $MAVEN_CLI_OPTS clean test javadoc:javadoc -Dwith-postgresql -Dtest.env.db.postgresql.host.name=postgres -Dtest.env.db.postgresql.user=$POSTGRES_USER -Dtest.env.db.postgresql.pass=$POSTGRES_PASSWORD -Ptomcat'
+ - 'mvn $MAVEN_CLI_OPTS clean test -Dwith-postgresql -Dtest.env.db.postgresql.host.name=postgres -Dtest.env.db.postgresql.user=$POSTGRES_USER -Dtest.env.db.postgresql.pass=$POSTGRES_PASSWORD -Ptomcat'
services:
- postgres:9.4
tags:
diff --git a/scripts/uibk-release.sh b/scripts/uibk-release.sh
index a85df7f6c50..05a91a6d10e 100755
--- a/scripts/uibk-release.sh
+++ b/scripts/uibk-release.sh
@@ -74,5 +74,5 @@ then
exit 1
fi
-mvn -s .m2/settings.xml -B release:prepare -Darguments="-s .m2/settings.xml -DskipTests=true -DskipSeleniumTests=true" -DreleaseVersion=$NEW_VERSION -DdevelopmentVersion=${LASTTAG_VERSION_MM}-SNAPSHOT -Dtag=${NEW_TAG}
-mvn -s .m2/settings.xml -B release:perform -Darguments="-s .m2/settings.xml -DskipTests=true -DskipSeleniumTests=true"
+mvn -s .m2/settings.xml -B release:prepare -Darguments="-s .m2/settings.xml -DskipTests=true -DskipSeleniumTests=true -Dmaven.javadoc.skip=true" -DreleaseVersion=$NEW_VERSION -DdevelopmentVersion=${LASTTAG_VERSION_MM}-SNAPSHOT -Dtag=${NEW_TAG}
+mvn -s .m2/settings.xml -B release:perform -Darguments="-s .m2/settings.xml -DskipTests=true -DskipSeleniumTests=true -Dmaven.javadoc.skip=true"
--
GitLab