Merge remote-tracking branch 'upstream/master' into mavenize

# Conflicts:
#	nbproject/project.properties
#	opengrok-web-nbproject/nbproject/project.properties
#	opengrok-web/src/main/webapp/eforbidden.jsp

Author: ahornace

README.md

@@ -3,7 +3,8 @@ Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
 
 
 # OpenGrok - a wicked fast source browser
-[![Build Status](https://travis-ci.org/oracle/opengrok.svg?branch=master)](https://travis-ci.org/oracle/opengrok)
+[![Travis Status](https://travis-ci.org/oracle/opengrok.svg?branch=master)](https://travis-ci.org/oracle/opengrok)
+[![wercker status](https://app.wercker.com/status/e2a879f4677e679c0bbf8fa82bcc0dba/s/master "wercker status")](https://app.wercker.com/project/byKey/e2a879f4677e679c0bbf8fa82bcc0dba)
 [![Coverage Status](https://coveralls.io/repos/oracle/opengrok/badge.svg?branch=master)](https://coveralls.io/r/oracle/opengrok?branch=master)
 
 1.  [Introduction](#1-introduction)

opengrok-indexer/src/test/java/org/opengrok/indexer/search/SearchTest.java

@@ -136,6 +136,7 @@ public void testParseCmdLine() {
     /**
      * Test of search method, of class Search.
      */
+    /* see https://github.com/oracle/opengrok/issues/2030
     @Test
     public void testSearch() {
         Search instance = new Search();
@@ -202,8 +203,8 @@ public void testSearch() {
         assertTrue(instance.parseCmdLine(new String[]{"-f", "********in argv path:main.c"}));
         assertTrue(instance.search());
         assertEquals(4, instance.results.size());
-
     }
+    */
 
     @Test
     public void testSearchNotFound() {

opengrok-web/src/main/webapp/eforbidden.jsp

@@ -16,15 +16,16 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
 --%>
 <%@page  session="false" import="org.opengrok.indexer.web.PageConfig" %>
 <%
 /* ---------------------- eforbidden.jspf start --------------------- */
 {
     response.setStatus(HttpServletResponse.SC_FORBIDDEN);
 %>
-<%= PageConfig.get(request).getEnv().getConfiguration().getForbiddenIncludeFileContent() %>
+<%= PageConfig.get(request).getEnv().getConfiguration().getForbiddenIncludeFileContent(false) %>
 <%
 }
 /* ---------------------- eforbidden.jspf end --------------------- */

pom.xml

@@ -59,7 +59,7 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
     </scm>
 
     <properties>
-        <lucene.version>7.3.1</lucene.version>
+        <lucene.version>7.4.0</lucene.version>
         <mavenjavadocplugin.version>2.10.4</mavenjavadocplugin.version>
         <compileSource>1.8</compileSource>
         <compileTarget>1.8</compileTarget>

tools/sync/sync.py

@@ -71,6 +71,7 @@ def worker(base):
 
     return base
 
+
 if __name__ == '__main__':
     output = []
     dirs_to_process = []

wercker.yml

@@ -1,19 +1,26 @@
 # This references an OpenJDK container from the
 # Docker Hub https://hub.docker.com/_/openjdk/
-# Read more about containers on our dev center
-# http://devcenter.wercker.com/docs/containers/index.html
 box: openjdk:8-jdk
 
-# This is the build pipeline. Pipelines are the core of wercker
-# Read more about pipelines on our dev center
-# http://devcenter.wercker.com/docs/pipelines/index.html
+# This should switch to Oracle JDK however does not work:
+#box:
+#  id: store/oracle/serverjre
+#  username: $DOCKER_USERNAME
+#  password: $DOCKER_PASSWORD
+#  tag: 8
+
 build:
-    # Steps make up the actions in your pipeline
-    # Read more about steps on our dev center:
-    # http://devcenter.wercker.com/docs/steps/index.html
   steps:
-    # https://github.com/wercker/step-maven
-    - wercker/maven:
+    - install-packages:
+      packages: sudo maven exuberant-ctags cvs git mercurial cssc bzr subversion monotone rcs pep8
+    - script:
+      name: Create non-root user
+      code: |
+        /usr/sbin/groupadd -g 1000 foobar
+        /usr/sbin/useradd -u 1000 -g 1000 -s /bin/bash -m foobar
+        chown -R foobar:foobar $WERCKER_ROOT
+    - wercker/[email protected]:
       goals: install
       cache_repo: true
+      sudo_user: foobar
       version: 3.5.2