Merge remote-tracking branch 'upstream/master' into add-dockerfile2

Author: wy193777

.gitignore

@@ -3,6 +3,7 @@
 /nbproject/configs/*.properties
 tags
 TAGS
+!opengrok-web/src/main/webapp/WEB-INF/tags
 build
 dist
 coverage
@@ -52,3 +53,10 @@ pmd.bat
 *.pyc
 .wercker
 .DS_Store
+.project
+.settings/
+.vscode/
+*/bin/
+.classpath
+.checkstyle
+

.travis.yml

@@ -22,19 +22,19 @@ addons:
 jobs:
   include:
   - stage: test
-    name: Linux + Oracle JDK 8
+    name: Linux + OpenJDK 8
     os: linux
-    dist: trusty
+    dist: xenial
     sudo: required
-    jdk: oraclejdk8
+    jdk: openjdk8
     install: true
     script: dev/main
     before_install: dev/before_install
     before_script: dev/before
   - stage: test
     name: Linux + Oracle JDK 11
     os: linux
-    dist: trusty
+    dist: xenial
     sudo: required
     jdk: oraclejdk11
     install: true
@@ -51,6 +51,8 @@ jobs:
     before_script: dev/before
   - stage: deploy
     name: Github Release
+    dist: xenial
+    jdk: openjdk8
     if: repo = "oracle/opengrok" AND tag IS present
     before_install: dev/before_install
     install: true
@@ -80,3 +82,10 @@ jobs:
     if: repo = "oracle/opengrok" AND tag IS present
     script: dev/post-deploy.sh
     install: true
+  - stage: javadoc
+    name: Upload javadocs to Github pages
+    os: linux
+    dist: xenial
+    jdk: openjdk8
+    script: dev/javadoc.sh
+    install: true

appveyor.yml

@@ -4,7 +4,7 @@ environment:
   MAVEN_VERSION: 3.6.0
   matrix:
     - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-      PYTHON: C:\Python34
+      PYTHON: C:\Python35
 install:
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem

dev/before_install

@@ -7,7 +7,20 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 		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
+	sudo apt-get install -qq \
+	    cvs \
+	    git \
+	    mercurial \
+	    cssc \
+	    bzr \
+	    subversion \
+	    monotone \
+	    rcs \
+	    rcs-blame \
+	    python3 \
+	    python3-venv \
+	    python3-pip \
+	    nodejs
 	if [[ $? != 0 ]]; then
 		echo "cannot install extra packages"
 		exit 1

dev/javadoc.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+set -x
+
+if [[ "${TRAVIS_REPO_SLUG}" != "oracle/opengrok" ||
+    "${TRAVIS_PULL_REQUEST}" != "false" ||
+    "${TRAVIS_BRANCH}" != "master" ]]; then
+	exit 0
+fi
+
+echo -e "Publishing javadoc...\n"
+
+mvn -DskipTests=true site
+
+git config --global user.email "[email protected]"
+git config --global user.name "travis-ci"
+git clone --quiet --branch=gh-pages \
+    https://${GH_PAGES_TOKEN}@github.com/oracle/opengrok gh-pages
+
+cd gh-pages
+if [[ -d ./javadoc ]]; then
+	git rm -rf ./javadoc
+fi
+cp -Rf ${TRAVIS_BUILD_DIR}/target/site/apidocs ./javadoc
+git add -f ./javadoc
+git commit -m "Lastest javadoc auto-pushed to gh-pages"
+git push -fq origin gh-pages
+
+echo -e "Published Javadoc to gh-pages.\n"

distribution/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opengrok</groupId>
     <artifactId>opengrok-top</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.16</version>
   </parent>
 
   <artifactId>opengrok-dist</artifactId>
@@ -24,20 +24,20 @@
     <dependency>
       <groupId>org.opengrok</groupId>
       <artifactId>opengrok</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.16</version>
     </dependency>
 
     <dependency>
       <groupId>org.opengrok</groupId>
       <artifactId>opengrok-web</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.16</version>
       <type>war</type>
     </dependency>
 
     <dependency>
       <groupId>org.opengrok</groupId>
       <artifactId>opengrok-tools</artifactId>
-      <version>1.2.8</version>
+      <version>1.2.16</version>
       <type>pom</type>
     </dependency>
   </dependencies>

opengrok-indexer/pom.xml

@@ -28,11 +28,11 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
     <parent>
         <groupId>org.opengrok</groupId>
         <artifactId>opengrok-top</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.16</version>
     </parent>
 
     <artifactId>opengrok</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.16</version>
     <packaging>jar</packaging>
 
     <name>OpenGrok Indexer</name>
@@ -112,8 +112,13 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
             <version>${jersey.version}</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency> <!-- TODO: remove! (moving Messages to web module) -->
@@ -210,6 +215,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
                     <includeOnlyProperties>
                         <includeOnlyProperty>^git.commit.id</includeOnlyProperty>
                     </includeOnlyProperties>
+		    <failOnNoGitDirectory>false</failOnNoGitDirectory>
                 </configuration>
                 <executions>
                     <execution>

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java

@@ -329,7 +329,7 @@ private void addScalaSupport(List<String> command) {
         command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*(private|protected)?[[:space:]]*case object[[:space:]]+([a-zA-Z0-9_]+)/\\4/O,case objects/");
         command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*(private|protected)?[[:space:]]*trait[[:space:]]+([a-zA-Z0-9_]+)/\\4/t,traits/");
         command.add("--regex-scala=/^[[:space:]]*type[[:space:]]+([a-zA-Z0-9_]+)/\\1/T,types/");
-        command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*def[[:space:]]+([a-zA-Z0-9_]+)/\\3/m,methods/");
+        command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy|private|protected)[[:space:]]*)*def[[:space:]]+([a-zA-Z0-9_]+)/\\3/m,methods/");
         command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*val[[:space:]]+([a-zA-Z0-9_]+)/\\3/l,constants/");
         command.add("--regex-scala=/^[[:space:]]*((abstract|final|sealed|implicit|lazy)[[:space:]]*)*var[[:space:]]+([a-zA-Z0-9_]+)/\\3/v,variables/");
         command.add("--regex-scala=/^[[:space:]]*package[[:space:]]+([a-zA-Z0-9_.]+)/\\1/p,packages/");

opengrok-indexer/src/main/java/org/opengrok/indexer/history/HistoryGuru.java

@@ -387,12 +387,13 @@ public Map<String, Date> getLastModifiedTimes(File directory)
      * @param files list of files to check if they contain a repository
      * @param ignoredNames what files to ignore
      * @param recursiveSearch whether to use recursive search
+     * @param type type of the repository to search for or {@code null}
      * @param depth current depth - using global scanningDepth - one can limit
      * this to improve scanning performance
      * @return collection of added repositories
      */
     private Collection<RepositoryInfo> addRepositories(File[] files,
-            IgnoredNames ignoredNames, boolean recursiveSearch, int depth) {
+            IgnoredNames ignoredNames, boolean recursiveSearch, String type, int depth) {
 
         List<RepositoryInfo> repoList = new ArrayList<>();
 
@@ -407,13 +408,16 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
 
                 Repository repository = null;
                 try {
-                    repository = RepositoryFactory.getRepository(file);
+                    repository = RepositoryFactory.getRepository(file, type);
                 } catch (InstantiationException | NoSuchMethodException | InvocationTargetException e) {
                     LOGGER.log(Level.WARNING, "Could not create repository for '"
                             + file + "', could not instantiate the repository.", e);
                 } catch (IllegalAccessException iae) {
                     LOGGER.log(Level.WARNING, "Could not create repository for '"
                             + file + "', missing access rights.", iae);
+                } catch (ForbiddenSymlinkException e) {
+                    LOGGER.log(Level.WARNING, "Could not create repository for '"
+                            + file + "', path traversal issues.", e);
                 }
                 if (repository == null) {
                     // Not a repository, search its sub-dirs.
@@ -426,7 +430,7 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
                                     file.getAbsolutePath());
                         } else if (depth <= scanningDepth) {
                             repoList.addAll(HistoryGuru.this.addRepositories(subFiles, ignoredNames,
-                                    recursiveSearch, depth + 1));
+                                    recursiveSearch, null,depth + 1));
                         }
                     }
                 } else {
@@ -436,18 +440,16 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
                     repoList.add(new RepositoryInfo(repository));
                     putRepository(repository);
 
-                    // @TODO: Search only for one type of repository - the one found here
                     if (recursiveSearch && repository.supportsSubRepositories()) {
                         File[] subFiles = file.listFiles();
                         if (subFiles == null) {
                             LOGGER.log(Level.WARNING,
                                     "Failed to get sub directories for ''{0}'', check access permissions.",
                                     file.getAbsolutePath());
                         } else if (depth <= scanningDepth) {
-                            // Search only one level down - if not: too much
-                            // stat'ing for huge Mercurial repositories
+                            // Search only for one type of repository - the one found here.
                             repoList.addAll(HistoryGuru.this.addRepositories(subFiles, ignoredNames,
-                                    false, depth + 1));
+                                    false, repository.getType(), depth + 1));
                         }
                     }
                 }
@@ -466,7 +468,7 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
         addRepositories(File[] files, Collection<RepositoryInfo> repos,
                 IgnoredNames ignoredNames, int depth) {
 
-        return HistoryGuru.this.addRepositories(files, ignoredNames, true, depth);
+        return HistoryGuru.this.addRepositories(files, ignoredNames, true, null, depth);
     }
 
     /**
@@ -480,7 +482,7 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
     public Collection<RepositoryInfo> addRepositories(File[] files,
             IgnoredNames ignoredNames) {
 
-        return HistoryGuru.this.addRepositories(files, ignoredNames, true, 0);
+        return HistoryGuru.this.addRepositories(files, ignoredNames, true, null,0);
     }
 
     /**

opengrok-indexer/src/main/java/org/opengrok/indexer/history/PerforceRepository.java

@@ -272,6 +272,24 @@ static String getRevisionCmd(String first, String last) {
 
     @Override
     String determineCurrentVersion(boolean interactive) throws IOException {
-        return null;
+        File directory = new File(getDirectoryName());
+        List<String> cmd = new ArrayList<>();
+
+        ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
+        cmd.add(RepoCommand);
+        cmd.add("changes");
+        cmd.add("-t");
+        cmd.add("-m");
+        cmd.add("1");
+        cmd.add("...#have");
+
+        Executor executor = new Executor(cmd, directory, interactive ?
+                RuntimeEnvironment.getInstance().getInteractiveCommandTimeout() :
+                RuntimeEnvironment.getInstance().getCommandTimeout());
+        if (executor.exec(false) != 0) {
+            throw new IOException(executor.getErrorString());
+        }
+
+        return executor.getOutputString().trim();
     }
 }