[lucene-solr] 02/02: SOLR-13452: Start including more than the default artifacts in solr-server module dist packages and handle start.jar.

[ma...@apache.org]

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

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

commit 23d06dadb206f8d5b5fe95d352eec77233c51647
Author: markrmiller <ma...@apache.org>
AuthorDate: Thu Aug 15 15:53:05 2019 -0500

    SOLR-13452: Start including more than the default artifacts in solr-server module dist packages and handle start.jar.
---
 .../lucene/gradle/PackageLuceneSolrDist.groovy     | 24 +++++++++++++++++++++-
 solr/build.gradle                                  | 15 ++++++++++++++
 solr/server/build.gradle                           | 15 ++++++++++----
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy
index a47863b..43a9e46 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy
@@ -16,10 +16,13 @@ package org.apache.lucene.gradle
  * limitations under the License.
  */
 
+import javax.inject.Inject
+
 import org.apache.lucene.gradle.PartOfDist
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.InputDirectory
@@ -29,7 +32,10 @@ import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.bundling.Compression
 
 class PackageLuceneSolrDist extends DefaultTask {
-  
+  @Input
+  @Optional
+  List<String> additionalIncludes = Collections.synchronizedList(new ArrayList<>())
+
   PackageLuceneSolrDist() {
     def distDir = 'dist'
     
@@ -68,6 +74,13 @@ class PackageLuceneSolrDist extends DefaultTask {
         standardIncludes.each {
           include it
         }
+        
+//        for(int i = 0; i < additionalIncludes.size(); i++) {
+//          println 'additional include ' + i
+//          include additionalIncludes.get(i)
+//        }
+        
+
         standardExcludes.each {
           exclude it
         }
@@ -151,6 +164,15 @@ class PackageLuceneSolrDist extends DefaultTask {
   @TaskAction
   void pack() {
   }
+  
+  public PackageLuceneSolrDist includeArtifacts(String... arg0) {
+    for (String pattern : arg0) {
+      project.packZip.include(arg0)
+      project.packTar.include(arg0)
+    }
+    return this;
+  }
+
 }
 
 
diff --git a/solr/build.gradle b/solr/build.gradle
index 9a7d3f3..183fb0c 100644
--- a/solr/build.gradle
+++ b/solr/build.gradle
@@ -28,7 +28,22 @@ tasks.create("checkLicenses", LicenseCheckTask, file("licenses"))
 
 tasks.create("jarChecksums", JarChecksum, file('solr'), file('licenses'))
 
+task getStartJar(type: Copy) {
+  from {project("solr-server").configurations.startJar.files} {
+    include 'jetty-start*'
+  }
+  into file('server')
+  rename { String fileName ->
+    'start.jar'
+  }
+}
+
 task packageDist(type: org.apache.lucene.gradle.PackageLuceneSolrDist) {
   group = 'Dist'
   description = 'Generates the Lucene and Solr distribution.'
+  
+  // additional includes for solr-server
+  includeArtifacts '**/server/solr/**', '**/server/resources/**', '**/server/etc/**', '**/server/modules/**', '**/server/scripts/**', '**/server/contexts/**', '**/server/start.jar'
+  
+  dependsOn getStartJar
 }
diff --git a/solr/server/build.gradle b/solr/server/build.gradle
index bf4a530..ccda213 100644
--- a/solr/server/build.gradle
+++ b/solr/server/build.gradle
@@ -21,6 +21,10 @@ apply plugin: org.apache.lucene.gradle.PartOfDist
 
 jar.enabled = false
 
+configurations {
+  startJar
+}
+
 dependencies {
   
   runtimeOnly ('com.lmax:disruptor')
@@ -33,10 +37,10 @@ dependencies {
   implementation ('org.apache.logging.log4j:log4j-core')
   implementation ('org.apache.logging.log4j:log4j-slf4j-impl')
   
-  implementation ('io.dropwizard.metrics:metrics-core') { transitive = false }
-  implementation ('io.dropwizard.metrics:metrics-graphite') { transitive = false }
-  implementation ('io.dropwizard.metrics:metrics-jetty9') { transitive = false }
-  implementation ('io.dropwizard.metrics:metrics-jvm') { transitive = false }
+  implementation ('io.dropwizard.metrics:metrics-core')
+  implementation ('io.dropwizard.metrics:metrics-graphite')
+  implementation ('io.dropwizard.metrics:metrics-jetty9')
+  implementation ('io.dropwizard.metrics:metrics-jvm')
   
   api ('org.eclipse.jetty:jetty-continuation')
   api ('org.eclipse.jetty:jetty-deploy')
@@ -62,8 +66,11 @@ dependencies {
   api ('org.eclipse.jetty.http2:http2-http-client-transport')
   
   implementation ('javax.servlet:javax.servlet-api')
+  
+  startJar 'org.eclipse.jetty:jetty-start::shaded'
 }
 
 unusedDeps {
   jarExclude '.*?\\.jar' // solr-server creates no jar, so we don't currently check it
 }
+