Merge remote-tracking branch 'origin/1.x'

ao-apps · Sep 19, 2023 · cdbfbc5 · cdbfbc5
2 parents 20cf32c + 51026fc
commit cdbfbc5
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 26 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -669,6 +669,7 @@ or any build that adds or removes build artifacts."""
         }
       }
       steps {
+        // See https://www.jenkins.io/doc/pipeline/steps/params/gitscm/
         // See https://www.jenkins.io/doc/pipeline/steps/workflow-scm-step/#checkout-check-out-from-version-control
         // See https://stackoverflow.com/questions/43293334/sparsecheckout-in-jenkinsfile-pipeline
         /*
@@ -696,17 +697,17 @@ or any build that adds or removes build artifacts."""
               // [$class: 'CleanCheckout'],
               [$class: 'CloneOption',
                 // See https://issues.jenkins.io/browse/JENKINS-45586
-                shallow: true,
-                depth: 20,
+                shallow: false,
+                // depth: 20,
                 honorRefspec: true
               ],
               [$class: 'SparseCheckoutPaths',
                 sparseCheckoutPaths: sparseCheckoutPaths
               ],
               [$class: 'SubmoduleOption',
                 disableSubmodules: disableSubmodules,
-                shallow: true,
-                depth: 20
+                shallow: false
+                // depth: 20
               ]
             ]
           ]
@@ -736,17 +737,17 @@ or any build that adds or removes build artifacts."""
             // [$class: 'CleanCheckout'],
             [$class: 'CloneOption',
               // See https://issues.jenkins.io/browse/JENKINS-45586
-              shallow: true,
-              depth: 20,
+              shallow: false,
+              // depth: 20,
               honorRefspec: true
             ],
             [$class: 'SparseCheckoutPaths',
               sparseCheckoutPaths: sparseCheckoutPaths
             ],
             [$class: 'SubmoduleOption',
               disableSubmodules: disableSubmodules,
-              shallow: true,
-              depth: 20
+              shallow: false
+              // depth: 20
             ]
           ]
         ]
@@ -961,7 +962,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
 void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
-  sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
+  // Not doing shallow: sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
   dir(projectDir) {
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(

diff --git a/all b/all
diff --git a/bom b/bom
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -684,6 +684,7 @@ or any build that adds or removes build artifacts."""
         }
       }
       steps {
+        // See https://www.jenkins.io/doc/pipeline/steps/params/gitscm/
         // See https://www.jenkins.io/doc/pipeline/steps/workflow-scm-step/#checkout-check-out-from-version-control
         // See https://stackoverflow.com/questions/43293334/sparsecheckout-in-jenkinsfile-pipeline
         /*
@@ -711,17 +712,17 @@ or any build that adds or removes build artifacts."""
               // [$class: 'CleanCheckout'],
               [$class: 'CloneOption',
                 // See https://issues.jenkins.io/browse/JENKINS-45586
-                shallow: true,
-                depth: 20,
+                shallow: false,
+                // depth: 20,
                 honorRefspec: true
               ],
               [$class: 'SparseCheckoutPaths',
                 sparseCheckoutPaths: sparseCheckoutPaths
               ],
               [$class: 'SubmoduleOption',
                 disableSubmodules: disableSubmodules,
-                shallow: true,
-                depth: 20
+                shallow: false
+                // depth: 20
               ]
             ]
           ]
@@ -751,17 +752,17 @@ or any build that adds or removes build artifacts."""
             // [$class: 'CleanCheckout'],
             [$class: 'CloneOption',
               // See https://issues.jenkins.io/browse/JENKINS-45586
-              shallow: true,
-              depth: 20,
+              shallow: false,
+              // depth: 20,
               honorRefspec: true
             ],
             [$class: 'SparseCheckoutPaths',
               sparseCheckoutPaths: sparseCheckoutPaths
             ],
             [$class: 'SubmoduleOption',
               disableSubmodules: disableSubmodules,
-              shallow: true,
-              depth: 20
+              shallow: false
+              // depth: 20
             ]
           ]
         ]
@@ -976,7 +977,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
 void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
-  sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
+  // Not doing shallow: sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
   dir(projectDir) {
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(

diff --git a/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view