From a47c3067e2889db3033e4d0ccb7cc63fbafb285e Mon Sep 17 00:00:00 2001 From: Inaki Villar Date: Fri, 15 Jul 2022 15:16:59 -0700 Subject: [PATCH 1/3] set appropiate jdk boolean for buildNoJdkRpm Signed-off-by: Inaki Villar --- distribution/packages/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index cd0cf6b9db64d..df3049d7684c4 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -392,7 +392,7 @@ tasks.register('buildRpm', Rpm) { } tasks.register('buildNoJdkRpm', Rpm) { - configure(commonRpmConfig(true, 'x64')) + configure(commonRpmConfig(false, 'x64')) } Closure dpkgExists = { it -> new File('/bin/dpkg-deb').exists() || new File('/usr/bin/dpkg-deb').exists() || new File('/usr/local/bin/dpkg-deb').exists() } From bad4f3712c63b6fbbeee4bb999ffc60dbfe48b6f Mon Sep 17 00:00:00 2001 From: Inaki Villar Date: Fri, 15 Jul 2022 15:41:22 -0700 Subject: [PATCH 2/3] make missingJavadoc cacheable Signed-off-by: Inaki Villar --- gradle/missing-javadoc.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle/missing-javadoc.gradle b/gradle/missing-javadoc.gradle index d927bc8a2d09a..6b3dacd3e905a 100644 --- a/gradle/missing-javadoc.gradle +++ b/gradle/missing-javadoc.gradle @@ -70,7 +70,7 @@ allprojects { classpath = sourceSets.main.compileClasspath srcDirSet = sourceSets.main.java - outputDir = project.javadoc.destinationDir + outputDir = file("${project.buildDir}/tmp/missingJavadoc/") } } } @@ -183,6 +183,7 @@ configure(project(":server")) { } } +@CacheableTask class MissingJavadocTask extends DefaultTask { @InputFiles @SkipWhenEmpty @@ -227,7 +228,8 @@ class MissingJavadocTask extends DefaultTask { @Input def executable - @Input + @InputFiles + @PathSensitive(PathSensitivity.RELATIVE) def taskResources /** Utility method to recursively collect all tasks with same name like this one that we depend on */ From ce500866988e8c32c73207ec30e3e7e7b6281a66 Mon Sep 17 00:00:00 2001 From: Inaki Villar Date: Fri, 15 Jul 2022 16:00:55 -0700 Subject: [PATCH 3/3] using relativepath for javadoc.options.linksOffline Signed-off-by: Inaki Villar --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f56b375883b70..ceb9ce395c3c7 100644 --- a/build.gradle +++ b/build.gradle @@ -320,7 +320,7 @@ allprojects { task.reproducibleFileOrder = true if (task instanceof SymbolicLinkPreservingTar) { // Replace file timestamps with latest Git revision date (if available) - task.lastModifiedTimestamp = gitRevisionDate + task.lastModifiedTimestamp = gitRevisionDate } } @@ -359,7 +359,8 @@ allprojects { project.javadoc.dependsOn "${upstreamProject.path}:javadoc" String externalLinkName = upstreamProject.archivesBaseName String artifactPath = dep.group.replaceAll('\\.', '/') + '/' + externalLinkName.replaceAll('\\.', '/') + '/' + dep.version - project.javadoc.options.linksOffline artifactsHost + "/javadoc/" + artifactPath, "${upstreamProject.buildDir}/docs/javadoc/" + String projectRelativePath = project.relativePath(upstreamProject.buildDir) + project.javadoc.options.linksOffline artifactsHost + "/javadoc/" + artifactPath, "${projectRelativePath}/docs/javadoc/" } } boolean hasShadow = project.plugins.hasPlugin(ShadowPlugin)