SOLR-15862 Move solr/LICENSE.txt and SOLR/NOTICE.txt to git top-level (…

…#532)
apache · Jan 17, 2022 · 9b6b7ef · 9b6b7ef
1 parent 0cd9e4d
commit 9b6b7ef
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 207 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/solr/LICENSE.txt → LICENSE.txt b/solr/LICENSE.txt → LICENSE.txt
diff --git a/solr/NOTICE.txt → NOTICE.txt b/solr/NOTICE.txt → NOTICE.txt
diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
@@ -558,10 +558,9 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):
   if isSrc:
     in_solr_folder.extend(os.listdir(os.path.join(unpackPath, 'solr')))
     is_in_list(in_root_folder, ['LICENSE', 'NOTICE', 'README'])
-    is_in_list(in_solr_folder, ['JRE_VERSION_MIGRATION', 'CHANGES', 'MIGRATE', 'SYSTEM_REQUIREMENTS'])
+    is_in_list(in_solr_folder, ['CHANGES', 'README'])
   else:
-    is_in_list(in_root_folder, ['LICENSE', 'NOTICE', 'README', 'JRE_VERSION_MIGRATION', 'CHANGES',
-                                'MIGRATE', 'SYSTEM_REQUIREMENTS'])
+    is_in_list(in_root_folder, ['LICENSE', 'NOTICE', 'README', 'CHANGES'])
 
   if SOLR_NOTICE is None:
     SOLR_NOTICE = open('%s/NOTICE.txt' % unpackPath, encoding='UTF-8').read()

diff --git a/gradle/java/jar-manifest.gradle b/gradle/java/jar-manifest.gradle
@@ -22,7 +22,7 @@ subprojects {
     // per-project.
     def title = "Apache Solr Search Server: ${project.name}"
     def implementationTitle = "org.apache.solr"
-    def legaleseDir = project(":solr").projectDir
+    def legaleseDir = rootDir
 
     // Apply the manifest to any JAR or WAR file created by any project,
     // excluding those explicitly listed.

diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradle
@@ -92,13 +92,16 @@ distributions {
     contents {
       // TODO: This is missing module README files, as compared to 8x
 
+      from(rootDir, {
+        include "LICENSE.txt"
+        include "NOTICE.txt"
+      })
+
       from(project(":solr").projectDir, {
         include "bin/**"
         include "licenses/**"
         exclude "licenses/README.committers.txt"
         include "CHANGES.txt"
-        include "LICENSE.txt"
-        include "NOTICE.txt"
         include "README.md"
       })