You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/05/15 15:41:42 UTC
[lucene-solr] branch jira/SOLR-13452_gradle updated: SOLR-13452:
Organize main build.gradle a bit.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle by this push:
new 7b2acf6 SOLR-13452: Organize main build.gradle a bit.
7b2acf6 is described below
commit 7b2acf61e79b7096dbe7ad4200e769ebca0a0d8f
Author: markrmiller <ma...@apache.org>
AuthorDate: Wed May 15 10:41:39 2019 -0500
SOLR-13452: Organize main build.gradle a bit.
---
build.gradle | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/build.gradle b/build.gradle
index 7dead95..0bcdfc8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,25 +38,11 @@ allprojects {
apply plugin: 'maven-publish'
}
-task('regenerate') {
- doFirst {
- println "--> regenerate"
- }
-}
-
configure(subprojects) { pj ->
- configurations {
- jflex
- }
-
- dependencies {
- jflex "de.jflex:jflex:1.7.0"
- }
-
plugins.withType(JavaPlugin) {
- // forbidden apis ...need to exclude hadoop and ...
+ // FORBIDDEN APIS ...need to exclude hadoop etc and enable ...
// pj.plugins.apply(BuildPlugin)
sourceCompatibility = "11"
@@ -80,7 +66,6 @@ configure(subprojects) { pj ->
// transitive and can be used between modules
project.apply from: new File(buildSrcDir, "buildSrc/common/configure-impltran.gradle")
-
// Custom javac options
tasks.withType(JavaCompile) {
// Don't output ALL errors in a file, stop after a few
@@ -97,7 +82,6 @@ configure(subprojects) { pj ->
}
processTestResources.dependsOn copyTestResources
-
task sourceJar(type: Jar) {
classifier 'sources'
from sourceSets.main.allJava
@@ -115,12 +99,28 @@ configure(subprojects) { pj ->
}
}
+// root project config
+
+configurations {
+ jflex
+}
+
+dependencies {
+ jflex "de.jflex:jflex:1.7.0"
+}
+
tasks.create('checkWorkingCopy', CheckWorkingCopy, true)
task checkSourcePatterns(type: org.apache.lucene.gradle.CheckSourcePatterns) {
baseDir = rootProject.projectDir
}
+task('regenerate') {
+ doFirst {
+ println "--> regenerate"
+ }
+}
+
// setup eclipse and idea
allprojects {
plugins.withType(JavaPlugin) {