move javadoc to verify phase

fixes #2063

Author: Vladimir Kotal

.travis.yml

@@ -27,7 +27,6 @@ before_script:
  - if `which cvs`; then cvs --version; fi
  - if `which mtn`; then mtn --version; fi
  - if `which bzr`; then bzr version; fi
- # - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd opengrok-indexer && mvn javadoc:javadoc && cd ../opengrok-web && mvn javadoc:javadoc && cd ..; fi
 
 env:
   global:

plugins/pom.xml

@@ -37,34 +37,20 @@ Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
     </parent>
 
     <build>
-        <sourceDirectory>.</sourceDirectory>
-	<!-- Note that the plugins/UserPlugin/test/ directory is added via the build-helper plugin below -->
-        <testSourceDirectory>LdapPlugin/test</testSourceDirectory>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
 
         <testResources>
             <testResource>
                 <targetPath>opengrok/auth/plugin/</targetPath>
-                <directory>LdapPlugin/test/opengrok/auth/plugin/</directory>
+                <directory>test/opengrok/auth/plugin/</directory>
                 <excludes>
                     <exclude>*.java</exclude>
                 </excludes>
             </testResource>
         </testResources>
- 
-        <plugins>
-
-          <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.0.2</version>
-            <configuration>
-              <includes>
-                <include>**/LdapPlugin/src/**</include>
-                <include>**/UserPlugin/src/**</include>
-                <include>*Plugin.java</include>
-              </includes>
-            </configuration>
-          </plugin>
 
+        <plugins>
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-surefire-plugin</artifactId>
@@ -74,27 +60,6 @@ Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
                   </systemPropertyVariables>
               </configuration>
           </plugin>
-
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-                <execution>
-                    <id>add-test-source</id>
-                    <phase>generate-test-sources</phase>
-                    <goals>
-                        <goal>add-test-source</goal>
-                    </goals>
-                    <configuration>
-                        <sources>
-                            <directory>UserPlugin/test</directory>
-                        </sources>
-                    </configuration>
-                </execution>
-            </executions>
-          </plugin>
-
         </plugins>
     </build>
 

plugins/LdapPlugin/sample-ldap-plugin-config.xml renamed to plugins/sample-ldap-plugin-config.xml

@@ -44,7 +44,8 @@
  * </ul>
  *
  * <p>
- * The intended methods to implement are the and {@link #checkEntity(HttpServletRequest, Project)
+ * The intended methods to implement are the
+ * {@link #checkEntity(HttpServletRequest, Project)} and
  * {@link #checkEntity(HttpServletRequest, Group)}.
  * </p>
  *

plugins/LdapPlugin/src/opengrok/auth/entity/LdapUser.java renamed to plugins/src/opengrok/auth/entity/LdapUser.java

@@ -17,9 +17,12 @@
  * CDDL HEADER END
  */
 
- /*
+/*
  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  */
+
+package opengrok.auth.plugin;
+
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;