From ae68667f5e98493db0abea91ca56ef3468e48b18 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Tue, 6 Aug 2019 01:12:01 +0200 Subject: [PATCH] Add Maven profile to skip Javadoc generation for local builds (#1878) * #1877 Add Maven profile to skip Javadoc generation for local builds * Make it nicer --- pom.xml | 26 ++++++++++++++++++- .../java/tools/bathelpers/analyze_project.bat | 6 ----- .../java/tools/bathelpers/quick_build.bat | 2 +- .../java/tools/shhelpers/analyze_project.sh | 11 -------- src/test/java/tools/shhelpers/quick_build.sh | 2 +- 5 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 src/test/java/tools/bathelpers/analyze_project.bat delete mode 100644 src/test/java/tools/shhelpers/analyze_project.sh diff --git a/pom.xml b/pom.xml index be13db624..b378bf874 100644 --- a/pom.xml +++ b/pom.xml @@ -105,6 +105,21 @@ true + + + skipJavadocGeneration + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + + @@ -131,6 +146,16 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + + @@ -222,7 +247,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 ${project.finalNameBase} diff --git a/src/test/java/tools/bathelpers/analyze_project.bat b/src/test/java/tools/bathelpers/analyze_project.bat deleted file mode 100644 index ec494c75c..000000000 --- a/src/test/java/tools/bathelpers/analyze_project.bat +++ /dev/null @@ -1,6 +0,0 @@ -: Analyze the project with Sonar (requires you install SonarQube) -if "%jarfile%" == "" ( - call setvars.bat -) - -mvn clean verify sonar:sonar -f "%pomfile%" \ No newline at end of file diff --git a/src/test/java/tools/bathelpers/quick_build.bat b/src/test/java/tools/bathelpers/quick_build.bat index 543b53b04..a3624fcd7 100644 --- a/src/test/java/tools/bathelpers/quick_build.bat +++ b/src/test/java/tools/bathelpers/quick_build.bat @@ -3,4 +3,4 @@ if "%jarfile%" == "" ( call setvars.bat ) -mvn install -o -f "%pomfile%" -Dmaven.test.skip +mvn install -o -f "%pomfile%" -Dmaven.test.skip -PskipJavadocGeneration diff --git a/src/test/java/tools/shhelpers/analyze_project.sh b/src/test/java/tools/shhelpers/analyze_project.sh deleted file mode 100644 index ef817fca6..000000000 --- a/src/test/java/tools/shhelpers/analyze_project.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# Usage: ./analyze_project.sh -# - -if [ -z $jarfile ]; - then - ./setvars.sh -fi - -mvn clean verify sonar:sonar -f $pomfile diff --git a/src/test/java/tools/shhelpers/quick_build.sh b/src/test/java/tools/shhelpers/quick_build.sh index 3ec108a23..b882bde68 100644 --- a/src/test/java/tools/shhelpers/quick_build.sh +++ b/src/test/java/tools/shhelpers/quick_build.sh @@ -8,4 +8,4 @@ if [ -z $jarfile ]; ./setvars.sh fi -mvn install -f $pomfile -Dmaven.test.skip +mvn install -f $pomfile -Dmaven.test.skip -PskipJavadocGeneration