Merge "Move jjb-version to templates"
authorJeremy Phelps <jphelps@linuxfoundation.org>
Tue, 7 Nov 2017 20:24:44 +0000 (20:24 +0000)
committerGerrit Code Review <gerrit@linuxfoundation.org>
Tue, 7 Nov 2017 20:24:44 +0000 (20:24 +0000)
.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
shell/maven-javadoc-generate.sh

index 00ccd3f..168d780 100644 (file)
@@ -313,7 +313,11 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -Pq -Dmaven.javadoc.skip=false \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     $MAVEN_PARAMS $MAVEN_OPTIONS
index 5967d96..384bf40 100644 (file)
@@ -279,7 +279,11 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -Pq -Dmaven.javadoc.skip=false \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     $MAVEN_PARAMS $MAVEN_OPTIONS
index 90f8552..636851e 100644 (file)
@@ -289,7 +289,11 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -Pq -Dmaven.javadoc.skip=false \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     $MAVEN_PARAMS $MAVEN_OPTIONS
index 31770fe..69573be 100644 (file)
@@ -241,7 +241,11 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -Pq -Dmaven.javadoc.skip=false \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     $MAVEN_PARAMS $MAVEN_OPTIONS
index aa485c0..02a49e3 100644 (file)
@@ -23,7 +23,11 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -Pq -Dmaven.javadoc.skip=false \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
     $MAVEN_PARAMS $MAVEN_OPTIONS