Skip to content

Commit 03e9767

Browse files
committed
Strip out javadoc support. Ignore warnings for the moment.
1 parent 2347e69 commit 03e9767

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

build.gradle

+12-12
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ repositories {
5757
mavenLocal()
5858
}
5959

60-
final requiredJavaVersion = "8"
60+
final requiredJavaVersion = "11"
6161
final htsjdkVersion = System.getProperty('htsjdk.version','2.20.2')
6262
final picardVersion = System.getProperty('picard.version','2.20.5')
6363
final barclayVersion = System.getProperty('barclay.version','2.1.0')
@@ -129,11 +129,11 @@ def resolveLargeResourceStubFiles(largeResourcesFolder, buildPrerequisitesMessag
129129
// resource files that are needed to run the build but are still lfs stub files.
130130
def ensureBuildPrerequisites(requiredJavaVersion, largeResourcesFolder, buildPrerequisitesMessage) {
131131
// Make sure we can get a ToolProvider class loader. If not we may have just a JRE, or a JDK from the future.
132-
if (ToolProvider.getSystemToolClassLoader() == null) {
133-
throw new GradleException(
134-
"The ClassLoader obtained from the Java ToolProvider is null. "
135-
+ "A Java $requiredJavaVersion JDK must be installed. $buildPrerequisitesMessage")
136-
}
132+
// if (ToolProvider.getSystemToolClassLoader() == null) {
133+
// throw new GradleException(
134+
// "The ClassLoader obtained from the Java ToolProvider is null. "
135+
// + "A Java $requiredJavaVersion JDK must be installed. $buildPrerequisitesMessage")
136+
// }
137137
if (!file(".git").isDirectory()) {
138138
throw new GradleException("The GATK Github repository must be cloned using \"git clone\" to run the build. "
139139
+ "$buildPrerequisitesMessage")
@@ -169,7 +169,7 @@ configurations.all {
169169
}
170170

171171
tasks.withType(JavaCompile) {
172-
options.compilerArgs = ['-proc:none', '-Xlint:all', '-Werror', '-Xdiags:verbose']
172+
options.compilerArgs = ['-proc:none', '-Xlint:all', '-Xdiags:verbose']
173173
options.encoding = 'UTF-8'
174174
}
175175

@@ -215,12 +215,12 @@ configurations {
215215
// Get the jdk files we need to run javaDoc. We need to use these during compile, testCompile,
216216
// test execution, and gatkDoc generation, but we don't want them as part of the runtime
217217
// classpath and we don't want to redistribute them in the uber jar.
218-
final javadocJDKFiles = files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs())
218+
final javadocJDKFiles = null // files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs())
219219

220220
dependencies {
221221
// javadoc utilities; compile/test only to prevent redistribution of sdk jars
222-
compileOnly(javadocJDKFiles)
223-
testCompile(javadocJDKFiles)
222+
//compileOnly(javadocJDKFiles)
223+
//testCompile(javadocJDKFiles)
224224

225225
compile 'org.broadinstitute:barclay:' + barclayVersion
226226
// Library for configuration:
@@ -646,7 +646,7 @@ task gatkDoc(type: Javadoc, dependsOn: classes) {
646646

647647
// The gatkDoc process instantiates any documented feature classes, so to run it we need the entire
648648
// runtime classpath, as well as jdk javadoc files such as tools.jar, where com.sun.javadoc lives.
649-
classpath = sourceSets.main.runtimeClasspath + javadocJDKFiles
649+
//classpath = sourceSets.main.runtimeClasspath + javadocJDKFiles
650650
options.docletpath = classpath.asType(List)
651651
options.doclet = "org.broadinstitute.hellbender.utils.help.GATKHelpDoclet"
652652

@@ -682,7 +682,7 @@ task gatkTabComplete(type: Javadoc, dependsOn: classes) {
682682

683683
// The gatkDoc process instantiates any documented feature classes, so to run it we need the entire
684684
// runtime classpath, as well as jdk javadoc files such as tools.jar, where com.sun.javadoc lives, and Picard.
685-
classpath = sourceSets.main.runtimeClasspath + javadocJDKFiles
685+
//classpath = sourceSets.main.runtimeClasspath + javadocJDKFiles
686686

687687
options.docletpath = classpath.asType(List)
688688
options.doclet = "org.broadinstitute.barclay.help.BashTabCompletionDoclet"

0 commit comments

Comments
 (0)