Skip to content

Commit 155bb4e

Browse files
authored
Merge pull request #527 from TheSnoozer/fix-javadoc
fix javadoc generation for java 12 / 13
2 parents 8e0c54e + e43af0a commit 155bb4e

16 files changed

+93
-6
lines changed

core/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,21 @@
2121
<junit.version>4.13.1</junit.version>
2222
</properties>
2323

24+
<build>
25+
<plugins>
26+
<!-- Setting built-in java compiler properties -->
27+
<plugin>
28+
<groupId>org.apache.maven.plugins</groupId>
29+
<artifactId>maven-compiler-plugin</artifactId>
30+
<configuration>
31+
<source>${java.target}</source>
32+
<target>${java.target}</target>
33+
<compilerArgument>-Xlint:deprecation</compilerArgument>
34+
</configuration>
35+
</plugin>
36+
</plugins>
37+
</build>
38+
2439
<dependencies>
2540
<!-- JGit -->
2641
<dependency>

core/src/main/java/pl/project13/core/GitDataProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ void validateAbbrevLength(int abbrevLength) throws GitCommitIdExecutionException
221221
*
222222
* @param env environment settings
223223
* @return results of getBranchName() or, if in Jenkins/Hudson, value of GIT_BRANCH
224+
* @throws GitCommitIdExecutionException the branch name could not be determined
224225
*/
225226
protected String determineBranchName(@Nonnull Map<String, String> env) throws GitCommitIdExecutionException {
226227
BuildServerDataProvider buildServerDataProvider = BuildServerDataProvider.getBuildServerProvider(env,log);

core/src/main/java/pl/project13/core/NativeGitProvider.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,24 @@ private ProcessRunner getRunner() {
371371
}
372372

373373
public interface ProcessRunner {
374-
/** Run a command and return the entire output as a String - naive, we know. */
374+
/** Run a command and return the entire output as a String - naive, we know.
375+
*
376+
* @param directory the directory where the command should be executed in
377+
* @param nativeGitTimeoutInMs the timeout in milliseconds before the command get's terminated
378+
* @param command the command to execute
379+
* @return the output obtained from stdout by running the command
380+
* @throws IOException the command execution failed
381+
*/
375382
String run(File directory, long nativeGitTimeoutInMs, String command) throws IOException;
376383

377-
/** Run a command and return false if it contains at least one output line*/
384+
/** Run a command and return false if it contains at least one output line
385+
*
386+
* @param directory the directory where the command should be executed in
387+
* @param nativeGitTimeoutInMs the timeout in milliseconds before the command get's terminated
388+
* @param command the command to execute
389+
* @return false if the output of the command contains at least one line on stdout, true otherwise
390+
* @throws IOException the command execution failed
391+
*/
378392
boolean runEmpty(File directory, long nativeGitTimeoutInMs, String command) throws IOException;
379393
}
380394

core/src/main/java/pl/project13/core/cibuild/AwsCodeBuildBuildServerData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public class AwsCodeBuildBuildServerData extends BuildServerDataProvider {
3131
}
3232

3333
/**
34+
* @param env The current system environment variables, obtained via System.getenv().
35+
* @return true, if the system environment variables contain the AWS specific environment variable; false otherwise
3436
* @see <a href="https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-env-vars.html">Environment variables in build environments</a>
3537
*/
3638
public static boolean isActiveServer(Map<String, String> env) {

core/src/main/java/pl/project13/core/cibuild/AzureDevOpsBuildServerData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public class AzureDevOpsBuildServerData extends BuildServerDataProvider {
3131
}
3232

3333
/**
34+
* @param env The current system environment variables, obtained via System.getenv().
35+
* @return true, if the system environment variables contain the Azure specific environment variable; false otherwise
3436
* @see <a href="https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#build-variables">Azure DevOps - Build variables</a>
3537
*/
3638
public static boolean isActiveServer(@Nonnull Map<String, String> env) {

core/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ public class BambooBuildServerData extends BuildServerDataProvider {
2929
super(log, env);
3030
}
3131

32+
/**
33+
* @param env The current system environment variables, obtained via System.getenv().
34+
* @return true, if the system environment variables contain the Bamboo specific environment variable; false otherwise
35+
* @see <a href="https://confluence.atlassian.com/bamboo/bamboo-variables-289277087.html#Bamboovariables-Build-specificvariables">Bamboo Variables</a>
36+
*/
3237
public static boolean isActiveServer(Map<String, String> env) {
3338
return env.containsKey("bamboo_buildKey") ||
3439
env.containsKey("bamboo.buildKey") ||

core/src/main/java/pl/project13/core/cibuild/CircleCiBuildServerData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public class CircleCiBuildServerData extends BuildServerDataProvider {
3131
}
3232

3333
/**
34+
* @param env The current system environment variables, obtained via System.getenv().
35+
* @return true, if the system environment variables contain the Circle CI specific environment variable; false otherwise
3436
* @see <a href="https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables">CircleCIBuiltInVariables</a>
3537
*/
3638
public static boolean isActiveServer(Map<String, String> env) {

core/src/main/java/pl/project13/core/cibuild/GitHubBuildServerData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public class GitHubBuildServerData extends BuildServerDataProvider {
3333
}
3434

3535
/**
36+
* @param env The current system environment variables, obtained via System.getenv().
37+
* @return true, if the system environment variables contain the Github specific environment variable; false otherwise
3638
* @see <a href="https://help.github.com/en/actions/automating-your-workflow-with-github-actions/using-environment-variables">GitHubActionsUsingEnvironmentVariables</a>
3739
*/
3840
public static boolean isActiveServer(Map<String, String> env) {

core/src/main/java/pl/project13/core/cibuild/GitlabBuildServerData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public class GitlabBuildServerData extends BuildServerDataProvider {
3131
}
3232

3333
/**
34+
* @param env The current system environment variables, obtained via System.getenv().
35+
* @return true, if the system environment variables contain the Gitlab specific environment variable; false otherwise
3436
* @see <a href="https://docs.gitlab.com/ce/ci/variables/predefined_variables.html">GitlabCIVariables</a>
3537
*/
3638
public static boolean isActiveServer(Map<String, String> env) {

core/src/main/java/pl/project13/core/cibuild/HudsonJenkinsBuildServerData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public class HudsonJenkinsBuildServerData extends BuildServerDataProvider {
3131
}
3232

3333
/**
34+
* @param env The current system environment variables, obtained via System.getenv().
35+
* @return true, if the system environment variables contain the Hudson/Jenkins specific environment variable; false otherwise
3436
* @see <a href="https://wiki.jenkins-ci.org/display/JENKINS/Building+a+software+project#Buildingasoftwareproject-JenkinsSetEnvironmentVariables">JenkinsSetEnvironmentVariables</a>
3537
*/
3638
public static boolean isActiveServer(@Nonnull Map<String, String> env) {

0 commit comments

Comments
 (0)