Skip to content

Commit 9b6b7ef

Browse files
authored
SOLR-15862 Move solr/LICENSE.txt and SOLR/NOTICE.txt to git top-level (#532)
1 parent 0cd9e4d commit 9b6b7ef

File tree

6 files changed

+8
-207
lines changed

6 files changed

+8
-207
lines changed

LICENSE

-201
This file was deleted.

solr/LICENSE.txt LICENSE.txt

File renamed without changes.

solr/NOTICE.txt NOTICE.txt

File renamed without changes.

dev-tools/scripts/smokeTestRelease.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -558,10 +558,9 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):
558558
if isSrc:
559559
in_solr_folder.extend(os.listdir(os.path.join(unpackPath, 'solr')))
560560
is_in_list(in_root_folder, ['LICENSE', 'NOTICE', 'README'])
561-
is_in_list(in_solr_folder, ['JRE_VERSION_MIGRATION', 'CHANGES', 'MIGRATE', 'SYSTEM_REQUIREMENTS'])
561+
is_in_list(in_solr_folder, ['CHANGES', 'README'])
562562
else:
563-
is_in_list(in_root_folder, ['LICENSE', 'NOTICE', 'README', 'JRE_VERSION_MIGRATION', 'CHANGES',
564-
'MIGRATE', 'SYSTEM_REQUIREMENTS'])
563+
is_in_list(in_root_folder, ['LICENSE', 'NOTICE', 'README', 'CHANGES'])
565564

566565
if SOLR_NOTICE is None:
567566
SOLR_NOTICE = open('%s/NOTICE.txt' % unpackPath, encoding='UTF-8').read()

gradle/java/jar-manifest.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ subprojects {
2222
// per-project.
2323
def title = "Apache Solr Search Server: ${project.name}"
2424
def implementationTitle = "org.apache.solr"
25-
def legaleseDir = project(":solr").projectDir
25+
def legaleseDir = rootDir
2626

2727
// Apply the manifest to any JAR or WAR file created by any project,
2828
// excluding those explicitly listed.

solr/packaging/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,16 @@ distributions {
9292
contents {
9393
// TODO: This is missing module README files, as compared to 8x
9494

95+
from(rootDir, {
96+
include "LICENSE.txt"
97+
include "NOTICE.txt"
98+
})
99+
95100
from(project(":solr").projectDir, {
96101
include "bin/**"
97102
include "licenses/**"
98103
exclude "licenses/README.committers.txt"
99104
include "CHANGES.txt"
100-
include "LICENSE.txt"
101-
include "NOTICE.txt"
102105
include "README.md"
103106
})
104107

0 commit comments

Comments
 (0)