[jspwiki] branch master updated: remove git site repo from polling to avoid triggering the ci job every time the website is built (as it does a push on the asf-site branch)

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new 4c15f6b  remove git site repo from polling to avoid triggering the ci job every time the website is built (as it does a push on the asf-site branch)
4c15f6b is described below

commit 4c15f6ba705b363b64c1767be6aabf5a87f153d4
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Dec 26 00:33:07 2018 +0100

    remove git site repo from polling to avoid triggering the ci job every time the website is built (as it does a push on the asf-site branch)
---
 Jenkinsfile                                                           | 4 ++--
 .../src/main/java/org/apache/wiki/search/LuceneSearchProvider.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1aeb74a..19bcec2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,7 +52,7 @@ try {
         stage( 'build website' ) {
             withEnv( [ "Path+JDK=$JAVA_JDK_8/bin", "Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
                 dir( jbake ) {
-                    git branch: jbake, url: siteRepo, credentialsId: creds
+                    git branch: jbake, url: siteRepo, credentialsId: creds, poll: false
                     sh 'mvn clean process-resources'
                 }
                 stash name: 'jbake-website'
@@ -66,7 +66,7 @@ try {
             cleanWs()
             unstash 'jbake-website'
             dir( asfsite ) {
-                git branch: asfsite, url: siteRepo, credentialsId: creds
+                git branch: asfsite, url: siteRepo, credentialsId: creds, poll: false
                 sh "cp -rf ../$jbake/target/content/* ./"
                 timeout( 15 ) { // 15 minutes
                     sh 'git add .'
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index a515866..82aff1c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -27,11 +27,11 @@ import java.io.StringWriter;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -119,7 +119,7 @@ public class LuceneSearchProvider implements SearchProvider {
     protected static final String LUCENE_PAGE_NAME     = "name";
 
     private String           m_luceneDirectory;
-    protected Vector<Object[]> m_updates = new Vector<>(); // Vector because multi-threaded.
+    protected List<Object[]> m_updates = Collections.synchronizedList( new ArrayList<>() ); 
 
     /** Maximum number of fragments from search matches. */
     private static final int MAX_FRAGMENTS = 3;