Merge branch 'master' into suggester_java9plus_fix

Author: Vladimir Kotal

.gitignore

@@ -51,3 +51,4 @@ pmd.bat
 .idea
 *.pyc
 .wercker
+.DS_Store

.travis.yml

@@ -3,23 +3,11 @@ cache:
   directories:
   - '$HOME/.m2'
   - '$HOME/.sonar/cache'
-matrix:
-  include:
-    - os: linux
-      dist: trusty
-      sudo: required
-      jdk: oraclejdk8
-    - os: osx
-      osx_image: xcode9.4
-before_install: dev/before_install
-install: true
-before_script: dev/before
 env:
   global:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
    #   via the "travis encrypt" command using the project repo's public key
    - secure: "O_cda5pWDBAP-O3_0nG5RQ"
-script: dev/main
 addons:
   coverity_scan:
     project:
@@ -32,35 +20,49 @@ addons:
     organization: "opengrok"
     token:
       secure: "ayjmifQPQgKt/ICGfKtLpa8LwBAXZlxKwaPyjvXDRHyf3lbXGKkOCspH/wSoersoV4ZLt5UfSGKeFh1MS0IXAwUOcPTcV3/DUmycJjxZ5z9KjgGKsu0Spo1xZWioS+p1bzN6cJcNlwihE97idLhVSvDProf6L+pn0dqw8Lfz2k0="
-deploy:
-  # Pre-release
-  - provider: releases
-    script:
-    - echo "$TRAVIS_TAG"
-    - echo "$TRAVIS_BRANCH"
-    - mvn -DskipTests=true -Dmaven.javadoc.skip=false -B -V package
-    prerelease: true
-    api_key:
-      secure: bCywC9GdBIzLvLG3cgM9SgOAdMRQchmqEyKQZtIfK4iNzH3GjZwLMH91Oha0X3XU/n+nxGKw2E9qpYRzWlcbxHXqIgjFTt+hkt7zAldjjyWJnOcAYqdUDfsH3NqNQBqMBg8q7Bjc0LVS6PfpTpZliZISrL6KSyDprRg7C0S+HAk=
-    file: distribution/target/opengrok-$TRAVIS_TAG.tar.gz
-    skip_cleanup: true
-    on:
-      repo: oracle/opengrok
-      tags: true
-      condition: "$TRAVIS_TAG =~ rc[0-9]+$"
-      branch: master
-  # Full release
-  - provider: releases
-    script:
-    - echo "$TRAVIS_TAG"
-    - echo "$TRAVIS_BRANCH"
-    - mvn -DskipTests=true -Dmaven.javadoc.skip=false -B -V package
-    api_key:
-      secure: bCywC9GdBIzLvLG3cgM9SgOAdMRQchmqEyKQZtIfK4iNzH3GjZwLMH91Oha0X3XU/n+nxGKw2E9qpYRzWlcbxHXqIgjFTt+hkt7zAldjjyWJnOcAYqdUDfsH3NqNQBqMBg8q7Bjc0LVS6PfpTpZliZISrL6KSyDprRg7C0S+HAk=
-    file: distribution/target/opengrok-$TRAVIS_TAG.tar.gz
-    skip_cleanup: true
-    on:
-      repo: oracle/opengrok
-      tags: true
-      condition: "! $TRAVIS_TAG =~ rc[0-9]+$"
-      branch: master
+jobs:
+  include:
+    - stage: test
+      os: linux
+      dist: trusty
+      sudo: required
+      jdk: oraclejdk8
+      install: true
+      script: dev/main
+      before_install: dev/before_install
+      before_script: dev/before
+    - stage: test
+      os: osx
+      osx_image: xcode9.4
+      install: true
+      script: dev/main
+      before_install: dev/before_install
+      before_script: dev/before
+    - stage: deploy
+      name: Github Release
+      if: repo = "oracle/opengrok" AND tag IS present
+      before_install: dev/before_install
+      install: true
+      script: mvn -DskipTests=true -Dmaven.javadoc.skip=false -B -V package
+      deploy:
+        # Pre-release
+        - provider: releases
+          name: $TRAVIS_TAG
+          prerelease: true
+          api_key:
+            secure: bCywC9GdBIzLvLG3cgM9SgOAdMRQchmqEyKQZtIfK4iNzH3GjZwLMH91Oha0X3XU/n+nxGKw2E9qpYRzWlcbxHXqIgjFTt+hkt7zAldjjyWJnOcAYqdUDfsH3NqNQBqMBg8q7Bjc0LVS6PfpTpZliZISrL6KSyDprRg7C0S+HAk=
+          file: distribution/target/opengrok-$TRAVIS_TAG.tar.gz
+          skip_cleanup: true
+          on:
+            condition: $TRAVIS_TAG =~ rc[0-9]+$
+            all_branches: true
+        # Full release
+        - provider: releases
+          name: $TRAVIS_TAG
+          api_key:
+            secure: bCywC9GdBIzLvLG3cgM9SgOAdMRQchmqEyKQZtIfK4iNzH3GjZwLMH91Oha0X3XU/n+nxGKw2E9qpYRzWlcbxHXqIgjFTt+hkt7zAldjjyWJnOcAYqdUDfsH3NqNQBqMBg8q7Bjc0LVS6PfpTpZliZISrL6KSyDprRg7C0S+HAk=
+          file: distribution/target/opengrok-$TRAVIS_TAG.tar.gz
+          skip_cleanup: true
+          on:
+            condition: ! $TRAVIS_TAG =~ rc[0-9]+$
+            all_branches: true

README.md

@@ -51,6 +51,8 @@ Feel free to participate in discussion on the mailing lists:
 
 To subscribe, send email to `<mailing_list_name>[email protected]`
 
+There are also Slack channels on https://opengrok.slack.com/
+
 ## 6. Demo
 
 Visit <http://demo.opengrok.org>

apiary.apib

@@ -24,7 +24,7 @@ Besides `/suggester` and `/search` endpoints, everything is accessible from `loc
         </java>
         ```
 
-### sets configuration from XML representation [POST]
+### sets configuration from XML representation [PUT]
 
 + Request (application/xml)
   + Body
@@ -383,4 +383,4 @@ Repository type is separated from the repository path with a colon.
             /foo    bar
             /foo/foo    bar bar
 
-+ Response 204
++ Response 204

appveyor.yml

@@ -4,6 +4,7 @@ environment:
   MAVEN_VERSION: 3.5.0
   matrix:
     - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+      PYTHON: C:\Python34
 install:
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem
@@ -14,9 +15,10 @@ install:
       }
   - cmd: SET M2_HOME=C:\maven\apache-maven-%MAVEN_VERSION%
   # Prepend Java entry, remove Ruby entry (C:\Ruby193\bin;) from PATH
-  - cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%;
+  - cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PYTHON%;%PATH:C:\Ruby193\bin;=%;
   - cmd: mvn --version
   - cmd: java -version
+  - cmd: python --version
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem
       if (!(Test-Path -Path "C:\uctags" )) {

dev/before

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+echo "Environment variables:"
+env | sort
+
+echo "SCM versions:"
 if `which bk`; then bk --version; fi
 if `which hg`; then hg --version; fi
 if `which git`; then git --version; fi

dev/before_install

@@ -2,18 +2,48 @@
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 	sudo apt-get update -qq
-	sudo apt-get install -qq cvs git mercurial cssc bzr subversion monotone rcs rcs-blame python3 python3-pip pep8 nodejs;
+	if [[ $? != 0 ]]; then
+		echo "cannot update"
+		exit 1
+	fi
+
+	sudo apt-get install -qq cvs git mercurial cssc bzr subversion monotone rcs rcs-blame python3 python3.4-venv python3-pip nodejs
+	if [[ $? != 0 ]]; then
+		echo "cannot install extra packages"
+		exit 1
+	fi
+
+	# Bitkeeper install failure is not critical, so exit code is not checked.
 	sudo ./dev/install-bitkeeper.sh
-	sudo pip3 install --upgrade pip
-	sudo pip3 install flake8
+
+	sudo ./dev/install-python-packages.sh
+	if [[ $? != 0 ]]; then
+		echo "cannot install Python packages"
+		exit 1
+	fi
 elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 	brew update
-	brew install ctags cvs node
+
+	brew install cvs
+	if [[ $? != 0 ]]; then
+		echo "cannot install extra packages"
+		exit 1
+	fi
+
 	brew upgrade python
-	pip3 install pep8 flake8
+
+	./dev/install-python-packages.sh
+	if [[ $? != 0 ]]; then
+		echo "cannot install Python packages"
+		exit 1
+	fi
 fi
 
 sudo ./dev/install-universal_ctags.sh
+if [[ $? != 0 ]]; then
+	echo "cannot install Universal ctags"
+	exit 1
+fi
 
 # for API blueprint verification
 npm install drafter

dev/install-python-packages.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+python3 -m pip install --upgrade pip
+
+python3 -m pip install pep8 virtualenv
+if [[ $? != 0 ]]; then
+	echo "cannot install Python packages"
+	exit 1
+fi

dev/main

@@ -18,5 +18,7 @@ if [ "x$TRAVIS_REPO_SLUG" == "xoracle/opengrok" ]; then
 	fi
 fi
 
-mvn -B -V verify $extra_args
-node dev/parse.js
+ret=0
+mvn -B -V verify $extra_args || ret=1
+node dev/parse.js || ret=1
+exit $ret

distribution/assembly.xml

@@ -19,6 +19,21 @@
         <outputDirectory>lib</outputDirectory>
         <destName>source.war</destName>
       </file>
+      <file>
+        <source>${project.basedir}/../opengrok-tools/${project.build.directory}/dist/opengrok-tools-${project.python.package.version}.tar.gz</source>
+        <outputDirectory>tools</outputDirectory>
+        <destName>opengrok-tools.tar.gz</destName>
+      </file>
+      <file>
+         <source>${project.basedir}/../opengrok-tools/README-dist.txt</source>
+         <outputDirectory>tools</outputDirectory>
+         <destName>README.txt</destName>
+      </file>
+      <file>
+        <source>${project.basedir}/../opengrok-tools/${project.build.directory}/dist/logging.properties.template</source>
+        <outputDirectory>doc</outputDirectory>
+        <destName>logging.properties.template</destName>
+      </file>
     </files>
     <fileSets>
         <fileSet>
@@ -39,13 +54,6 @@
             <include>opengrok.1</include>
           </includes>
         </fileSet>
-        <fileSet>
-          <directory>${project.basedir}/../tools/src/main/python</directory>
-          <outputDirectory>bin</outputDirectory>
-          <includes>
-            <include>*.py</include>
-          </includes>
-        </fileSet>
         <fileSet>
           <directory>${project.build.directory}/../lib</directory>
           <outputDirectory>lib/lib</outputDirectory>