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/06/07 08:04:44 UTC

[lucene-solr] 03/05: SOLR-13452: A few small improvements and update versions.lock.

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 23563b5732a9d2a96ced286ca392df8b13021955
Author: markrmiller <ma...@apache.org>
AuthorDate: Thu Jun 6 14:33:45 2019 -0500

    SOLR-13452: A few small improvements and update versions.lock.
---
 build.gradle                                                 | 12 +++---------
 .../main/groovy/org/apache/lucene/gradle/UnusedDeps.groovy   |  3 +++
 versions.lock                                                |  1 -
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 147d3fe..d7a835a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,10 +98,10 @@ configure(luceneSolrSubProjects) {
     targetCompatibility = "11"
     
     // Use UTF-8, don't rely on local platform encoding.
-    compileJava.options.encoding = "UTF-8"
-    compileTestJava.options.encoding = "UTF-8"
+    project.compileJava.options.encoding = "UTF-8"
+    project.compileTestJava.options.encoding = "UTF-8"
     
-    sourceSets {
+    project.sourceSets {
       main.java.srcDirs = ['src/java']
       main.resources.srcDirs = ['src/resources']
       test.java.srcDirs = ['src/test']
@@ -110,12 +110,6 @@ configure(luceneSolrSubProjects) {
     
     // configure tests
     project.apply from: new File(rootProjectDir, "buildSrc/common/configure-test.gradle")
-    
-    // Custom javac options
-    tasks.withType(JavaCompile) {
-      // Don't output ALL errors in a file, stop after a few
-      options.compilerArgs << "-Xmaxerrs" << "5"
-    }
 
     task sourceJar(type: Jar) {
       classifier 'sources'
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/UnusedDeps.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/UnusedDeps.groovy
index fe6fd53..8bc75b3 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/UnusedDeps.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/UnusedDeps.groovy
@@ -51,6 +51,9 @@ class UnusedDeps extends DefaultTask {
   @Inject
   public UnusedDeps(File inputDirectory) {
     
+    group = 'Help'
+    description = "Lists dependencies that may be unused for a module."
+    
     if (!project.configurations.hasProperty('runtimeClasspath')) {
       return
     }
diff --git a/versions.lock b/versions.lock
index 424d337..a6f1949 100644
--- a/versions.lock
+++ b/versions.lock
@@ -222,4 +222,3 @@ org.tallison:jmatio:1.5 (2 constraints: a810a0b8)
 org.tukaani:xz:1.8 (2 constraints: ae100fb9)
 ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)
 xerces:xercesImpl:2.9.1 (1 constraints: 0e051136)
-xpp3:xpp3:1.1.3.3 (1 constraints: 0e0ef84b)