You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2020/08/31 13:42:00 UTC
[lucene-solr] branch master updated (4a2a2da -> 3e47bfb)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 4a2a2da LUCENE-9435: revert Solr's packaging stuff for now.
new 66eb9f7 LUCENE-9438: moved eclipse template files under corresponding gradle's script.
new 3e47bfb Cleanup remaining scripts to use script-relative resource location.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gradle/defaults.gradle | 6 ++++++
gradle/documentation/render-javadoc.gradle | 21 +++++++++++++--------
gradle/ide/eclipse.gradle | 4 +++-
{dev-tools => gradle/ide}/eclipse/dot.classpath.xsl | 0
{dev-tools => gradle/ide}/eclipse/dot.project | 0
.../dot.settings/org.eclipse.core.resources.prefs | 0
.../eclipse/dot.settings/org.eclipse.jdt.core.prefs | 0
.../eclipse/dot.settings/org.eclipse.jdt.ui.prefs | 0
.../ide}/eclipse/run-solr-cloud.launch | 0
{dev-tools => gradle/ide}/eclipse/run-solr.launch | 0
.../ide}/eclipse/run-test-cases.launch | 0
gradle/testing/defaults-tests.gradle | 3 ++-
gradle/testing/randomization.gradle | 8 +++++---
.../policies/replicator-tests.policy | 0
.../{ => randomization}/policies/solr-tests.policy | 0
.../{ => randomization}/policies/tests.policy | 0
gradle/validation/ecj-lint.gradle | 4 +++-
gradle/validation/forbidden-apis.gradle | 8 +++++---
gradle/validation/owasp-dependency-check.gradle | 4 +++-
19 files changed, 40 insertions(+), 18 deletions(-)
rename {dev-tools => gradle/ide}/eclipse/dot.classpath.xsl (100%)
rename {dev-tools => gradle/ide}/eclipse/dot.project (100%)
rename {dev-tools => gradle/ide}/eclipse/dot.settings/org.eclipse.core.resources.prefs (100%)
rename {dev-tools => gradle/ide}/eclipse/dot.settings/org.eclipse.jdt.core.prefs (100%)
rename {dev-tools => gradle/ide}/eclipse/dot.settings/org.eclipse.jdt.ui.prefs (100%)
rename {dev-tools => gradle/ide}/eclipse/run-solr-cloud.launch (100%)
rename {dev-tools => gradle/ide}/eclipse/run-solr.launch (100%)
rename {dev-tools => gradle/ide}/eclipse/run-test-cases.launch (100%)
rename gradle/testing/{ => randomization}/policies/replicator-tests.policy (100%)
rename gradle/testing/{ => randomization}/policies/solr-tests.policy (100%)
rename gradle/testing/{ => randomization}/policies/tests.policy (100%)
[lucene-solr] 01/02: LUCENE-9438: moved eclipse template files
under corresponding gradle's script.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 66eb9f7f3d7f12bf300db9dfd4dd80bb491547cb
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Mon Aug 31 15:09:26 2020 +0200
LUCENE-9438: moved eclipse template files under corresponding gradle's script.
---
gradle/defaults.gradle | 6 ++++++
gradle/ide/eclipse.gradle | 4 +++-
{dev-tools => gradle/ide}/eclipse/dot.classpath.xsl | 0
{dev-tools => gradle/ide}/eclipse/dot.project | 0
.../ide}/eclipse/dot.settings/org.eclipse.core.resources.prefs | 0
.../ide}/eclipse/dot.settings/org.eclipse.jdt.core.prefs | 0
.../ide}/eclipse/dot.settings/org.eclipse.jdt.ui.prefs | 0
{dev-tools => gradle/ide}/eclipse/run-solr-cloud.launch | 0
{dev-tools => gradle/ide}/eclipse/run-solr.launch | 0
{dev-tools => gradle/ide}/eclipse/run-test-cases.launch | 0
10 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/gradle/defaults.gradle b/gradle/defaults.gradle
index 5f11803..a011add 100644
--- a/gradle/defaults.gradle
+++ b/gradle/defaults.gradle
@@ -57,5 +57,11 @@ allprojects {
propertyOrEnvOrDefault = { propName, envName, defValue ->
return propertyOrDefault(propName, envOrDefault(envName, defValue));
}
+
+ // Locate script-relative resource folder. This is context-sensitive so pass
+ // the right buildscript (top-level).
+ scriptResources = { buildscript ->
+ return file(buildscript.sourceFile.absolutePath.replaceAll('.gradle$', ""))
+ }
}
}
diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradle
index 3bebd1d..e414112 100644
--- a/gradle/ide/eclipse.gradle
+++ b/gradle/ide/eclipse.gradle
@@ -18,6 +18,8 @@
import org.gradle.plugins.ide.eclipse.model.SourceFolder
import org.gradle.plugins.ide.eclipse.model.ClasspathEntry
+def resources = scriptResources(buildscript)
+
configure(rootProject) {
apply plugin: "eclipse"
@@ -73,7 +75,7 @@ configure(rootProject) {
eclipseJdt {
doLast {
project.sync {
- from rootProject.file("dev-tools/eclipse/dot.settings")
+ from rootProject.file("${resources}/dot.settings")
into rootProject.file(".settings")
}
}
diff --git a/dev-tools/eclipse/dot.classpath.xsl b/gradle/ide/eclipse/dot.classpath.xsl
similarity index 100%
rename from dev-tools/eclipse/dot.classpath.xsl
rename to gradle/ide/eclipse/dot.classpath.xsl
diff --git a/dev-tools/eclipse/dot.project b/gradle/ide/eclipse/dot.project
similarity index 100%
rename from dev-tools/eclipse/dot.project
rename to gradle/ide/eclipse/dot.project
diff --git a/dev-tools/eclipse/dot.settings/org.eclipse.core.resources.prefs b/gradle/ide/eclipse/dot.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from dev-tools/eclipse/dot.settings/org.eclipse.core.resources.prefs
rename to gradle/ide/eclipse/dot.settings/org.eclipse.core.resources.prefs
diff --git a/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs b/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
rename to gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs
diff --git a/dev-tools/eclipse/dot.settings/org.eclipse.jdt.ui.prefs b/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from dev-tools/eclipse/dot.settings/org.eclipse.jdt.ui.prefs
rename to gradle/ide/eclipse/dot.settings/org.eclipse.jdt.ui.prefs
diff --git a/dev-tools/eclipse/run-solr-cloud.launch b/gradle/ide/eclipse/run-solr-cloud.launch
similarity index 100%
rename from dev-tools/eclipse/run-solr-cloud.launch
rename to gradle/ide/eclipse/run-solr-cloud.launch
diff --git a/dev-tools/eclipse/run-solr.launch b/gradle/ide/eclipse/run-solr.launch
similarity index 100%
rename from dev-tools/eclipse/run-solr.launch
rename to gradle/ide/eclipse/run-solr.launch
diff --git a/dev-tools/eclipse/run-test-cases.launch b/gradle/ide/eclipse/run-test-cases.launch
similarity index 100%
rename from dev-tools/eclipse/run-test-cases.launch
rename to gradle/ide/eclipse/run-test-cases.launch
[lucene-solr] 02/02: Cleanup remaining scripts to use
script-relative resource location.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 3e47bfb7b433b61df83c9f8cb1b4d263b9a4449e
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Mon Aug 31 15:35:14 2020 +0200
Cleanup remaining scripts to use script-relative resource location.
---
gradle/documentation/render-javadoc.gradle | 21 +++++++++++++--------
gradle/testing/defaults-tests.gradle | 3 ++-
gradle/testing/randomization.gradle | 8 +++++---
.../policies/replicator-tests.policy | 0
.../{ => randomization}/policies/solr-tests.policy | 0
.../{ => randomization}/policies/tests.policy | 0
gradle/validation/ecj-lint.gradle | 4 +++-
gradle/validation/forbidden-apis.gradle | 8 +++++---
gradle/validation/owasp-dependency-check.gradle | 4 +++-
9 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle
index 4d0ce2e..baae066 100644
--- a/gradle/documentation/render-javadoc.gradle
+++ b/gradle/documentation/render-javadoc.gradle
@@ -20,6 +20,8 @@ import javax.annotation.Nullable
// generate javadocs by calling javadoc tool
// see https://docs.oracle.com/en/java/javase/11/tools/javadoc.html
+def resources = scriptResources(buildscript)
+
allprojects {
plugins.withType(JavaPlugin) {
ext {
@@ -39,17 +41,19 @@ allprojects {
description "Generates Javadoc API documentation for the main source code. This directly invokes javadoc tool."
group "documentation"
+ taskResources = resources
dependsOn sourceSets.main.compileClasspath
- classpath = sourceSets.main.compileClasspath;
+ classpath = sourceSets.main.compileClasspath
srcDirSet = sourceSets.main.java;
- outputDir = project.javadoc.destinationDir;
+ outputDir = project.javadoc.destinationDir
}
task renderSiteJavadoc(type: RenderJavadocTask) {
description "Generates Javadoc API documentation for the site (relative links)."
group "documentation"
+ taskResources = resources
dependsOn sourceSets.main.compileClasspath
classpath = sourceSets.main.compileClasspath;
srcDirSet = sourceSets.main.java;
@@ -65,9 +69,9 @@ allprojects {
// Set up titles and link up some offline docs for all documentation
// (they may be unused but this doesn't do any harm).
-def taskResources = "${rootProject.projectDir}/gradle/documentation/render-javadoc"
-def javaJavadocPackages = rootProject.file("${taskResources}/java11/")
-def junitJavadocPackages = rootProject.file("${taskResources}/junit/")
+
+def javaJavadocPackages = rootProject.file("${resources}/java11/")
+def junitJavadocPackages = rootProject.file("${resources}/junit/")
allprojects {
project.tasks.withType(RenderJavadocTask) {
title = "${project.path.startsWith(':lucene') ? 'Lucene' : 'Solr'} ${project.version} ${project.name} API"
@@ -158,7 +162,10 @@ class RenderJavadocTask extends DefaultTask {
@Optional
@Input
def executable
-
+
+ @Input
+ def taskResources
+
/** Utility method to recursively collect all tasks with same name like this one that we depend on */
private Set findRenderTasksInDependencies() {
Set found = []
@@ -311,8 +318,6 @@ class RenderJavadocTask extends DefaultTask {
throw new GradleException("Javadoc generation failed for ${project.path},\n Options file at: ${optionsFile}\n Command output at: ${outputFile}", cause)
}
- def taskResources = "${project.rootDir}/gradle/documentation/render-javadoc"
-
// append some special table css, prettify css
ant.concat(destfile: "${outputDir}/stylesheet.css", append: "true", fixlastline: "true", encoding: "UTF-8") {
filelist(dir: taskResources, files: "table_padding.css")
diff --git a/gradle/testing/defaults-tests.gradle b/gradle/testing/defaults-tests.gradle
index 83d4735..2ceb436 100644
--- a/gradle/testing/defaults-tests.gradle
+++ b/gradle/testing/defaults-tests.gradle
@@ -20,6 +20,7 @@ import org.apache.tools.ant.types.Commandline
import org.gradle.api.tasks.testing.logging.*
import org.apache.lucene.gradle.ErrorReportingTestListener
+def resources = scriptResources(buildscript)
def verboseModeHookInstalled = false
allprojects {
@@ -105,7 +106,7 @@ allprojects {
jvmArgs Commandline.translateCommandline(resolvedTestOption("tests.jvmargs"))
- systemProperty 'java.util.logging.config.file', rootProject.file("gradle/testing/defaults-tests/logging.properties")
+ systemProperty 'java.util.logging.config.file', file("${resources}/logging.properties")
systemProperty 'java.awt.headless', 'true'
systemProperty 'jdk.map.althashing.threshold', '0'
diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradle
index 570ff6a..298bfe1 100644
--- a/gradle/testing/randomization.gradle
+++ b/gradle/testing/randomization.gradle
@@ -33,6 +33,8 @@ buildscript {
}
}
+def resources = scriptResources(buildscript)
+
// Pick the "root" seed from which everything else is derived.
configure(rootProject) {
ext {
@@ -182,14 +184,14 @@ allprojects {
if (Boolean.parseBoolean(testOptionsResolved["tests.useSecurityManager"])) {
if (project.path == ":lucene:replicator") {
systemProperty 'java.security.manager', "org.apache.lucene.util.TestSecurityManager"
- systemProperty 'java.security.policy', rootProject.file("gradle/testing/policies/replicator-tests.policy")
+ systemProperty 'java.security.policy', file("${resources}/policies/replicator-tests.policy")
} else if (project.path.startsWith(":lucene")) {
systemProperty 'java.security.manager', "org.apache.lucene.util.TestSecurityManager"
- systemProperty 'java.security.policy', rootProject.file("gradle/testing/policies/tests.policy")
+ systemProperty 'java.security.policy', file("${resources}/policies/tests.policy")
} else {
systemProperty 'common-solr.dir', commonSolrDir
systemProperty 'java.security.manager', "org.apache.lucene.util.TestSecurityManager"
- systemProperty 'java.security.policy', rootProject.file("gradle/testing/policies/solr-tests.policy")
+ systemProperty 'java.security.policy', file("${resources}/policies/solr-tests.policy")
}
systemProperty 'common.dir', commonDir
diff --git a/gradle/testing/policies/replicator-tests.policy b/gradle/testing/randomization/policies/replicator-tests.policy
similarity index 100%
rename from gradle/testing/policies/replicator-tests.policy
rename to gradle/testing/randomization/policies/replicator-tests.policy
diff --git a/gradle/testing/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy
similarity index 100%
rename from gradle/testing/policies/solr-tests.policy
rename to gradle/testing/randomization/policies/solr-tests.policy
diff --git a/gradle/testing/policies/tests.policy b/gradle/testing/randomization/policies/tests.policy
similarity index 100%
rename from gradle/testing/policies/tests.policy
rename to gradle/testing/randomization/policies/tests.policy
diff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradle
index 56bbd8d..3dcb2c0 100644
--- a/gradle/validation/ecj-lint.gradle
+++ b/gradle/validation/ecj-lint.gradle
@@ -27,6 +27,8 @@ configure(rootProject) {
}
}
+def resources = scriptResources(buildscript)
+
allprojects {
plugins.withType(JavaPlugin) {
// Create a [sourceSetName]EcjLint task for each source set
@@ -69,7 +71,7 @@ allprojects {
args += [ "-proc:none" ]
args += [ "-nowarn" ]
args += [ "-enableJavadoc" ]
- args += [ "-properties", rootProject.file("gradle/validation/ecj-lint/ecj.javadocs.prefs").absolutePath ]
+ args += [ "-properties", file("${resources}/ecj.javadocs.prefs").absolutePath ]
doFirst {
tmpDst.mkdirs()
diff --git a/gradle/validation/forbidden-apis.gradle b/gradle/validation/forbidden-apis.gradle
index 5237570..4767d0f 100644
--- a/gradle/validation/forbidden-apis.gradle
+++ b/gradle/validation/forbidden-apis.gradle
@@ -18,6 +18,8 @@
// This configures application of forbidden API rules
// via https://github.com/policeman-tools/forbidden-apis
+def resources = scriptResources(buildscript)
+
// Only apply forbidden-apis to java projects.
allprojects { prj ->
plugins.withId("java", {
@@ -39,7 +41,7 @@ allprojects { prj ->
deps += ["defaults.all.txt", "defaults.${suffix}.txt"]
deps.each { sig ->
- def signaturesFile = rootProject.file("gradle/validation/forbidden-apis/${sig}")
+ def signaturesFile = file("${resources}/${sig}")
if (signaturesFile.exists()) {
logger.info("Signature file applied: ${sig}")
signaturesFiles += files(signaturesFile)
@@ -79,7 +81,7 @@ allprojects { prj ->
]
signaturesFiles = files(
- rootProject.file("gradle/validation/forbidden-apis/defaults.tests.txt")
+ file("${resources}/defaults.tests.txt")
)
suppressAnnotations += [
@@ -133,7 +135,7 @@ allprojects { prj ->
// This is the simplest workaround possible: just point at all the rule files and indicate
// them as inputs. This way if a rule is modified, checks will be reapplied.
configure([forbiddenApisMain, forbiddenApisTest]) { task ->
- task.inputs.dir(rootProject.file("gradle/validation/forbidden-apis"))
+ task.inputs.dir(file(resources))
}
})
}
\ No newline at end of file
diff --git a/gradle/validation/owasp-dependency-check.gradle b/gradle/validation/owasp-dependency-check.gradle
index 4d300b8..d58fd8b 100644
--- a/gradle/validation/owasp-dependency-check.gradle
+++ b/gradle/validation/owasp-dependency-check.gradle
@@ -20,13 +20,15 @@
// If -Pvalidation.owasp=true is set the validation will also run as part of the check task.
+def resources = scriptResources(buildscript)
+
configure(rootProject) {
dependencyCheck {
failBuildOnCVSS = propertyOrDefault("validation.owasp.threshold", 7) as Integer
formats = ['HTML', 'JSON']
skipProjects = [':solr:solr-ref-guide']
skipConfigurations = ['unifiedClasspath']
- suppressionFile = rootProject.file('gradle/validation/owasp-dependency-check/exclusions.xml')
+ suppressionFile = file("${resources}/exclusions.xml")
}
task owasp() {