Skip to content

Commit b96c39f

Browse files
dweissdweiss
committed
Removing and cleaning up build conditionals introduced before lucene/solr repo split.
1 parent e8c0b70 commit b96c39f

File tree

7 files changed

+44
-252
lines changed

7 files changed

+44
-252
lines changed

‎build.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,6 @@ apply from: file('gradle/validation/solr.config-file-sanity.gradle')
152152
// Source or data regeneration tasks
153153
apply from: file('gradle/generation/javacc.gradle')
154154

155-
// Shared configuration of subprojects containing native code.
156-
apply from: file('gradle/native/disable-native.gradle')
157-
158155
// Additional development aids.
159156
apply from: file('gradle/maven/maven-local.gradle')
160157
apply from: file('gradle/testing/per-project-summary.gradle')

‎gradle/documentation/documentation.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ configure(project(':solr:documentation')) {
144144
}
145145
}
146146

147-
configure(subprojects.findAll { it.path == ':lucene' || it.path == ':solr' }) {
147+
configure(project(":solr")) {
148148
ext {
149149
docroot = project('documentation').docroot
150150
docrootMinimal = project('documentation').docrootMinimal

‎gradle/documentation/render-javadoc.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,7 @@ class RenderJavadocTask extends DefaultTask {
321321
opts << ['-link', relative]
322322
} else {
323323
// For absolute links, we determine the target URL by assembling the full URL.
324-
def base = otherProject.path.startsWith(":lucene") ? luceneDocUrl : solrDocUrl
325-
allOfflineLinks.put("${base}/${otherProject.relativeDocPath}/".toString(), otherTask.outputDir)
324+
allOfflineLinks.put("${solrDocUrl}/${otherProject.relativeDocPath}/".toString(), otherTask.outputDir)
326325
}
327326
}
328327
}

‎gradle/jar-manifest.gradle‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,9 @@
2020
subprojects {
2121
// Declare these inline for now. Don't know if it makes sense to declare them
2222
// per-project.
23-
def title;
24-
def implementationTitle;
25-
def legaleseDir;
26-
if (project.path.startsWith(":lucene")) {
27-
implementationTitle = "org.apache.lucene"
28-
title = "Lucene Search Engine: ${project.name}"
29-
legaleseDir = project(":lucene").projectDir
30-
} else {
31-
implementationTitle = "org.apache.solr"
32-
title = "Apache Solr Search Server: ${project.name}"
33-
legaleseDir = project(":solr").projectDir
34-
}
23+
def title = "Apache Solr Search Server: ${project.name}"
24+
def implementationTitle = "org.apache.solr"
25+
def legaleseDir = project(":solr").projectDir
3526

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

‎gradle/maven/defaults-maven.gradle‎

Lines changed: 39 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,6 @@
2424
configure(rootProject) {
2525
ext {
2626
published = [
27-
":lucene:analysis:common",
28-
":lucene:analysis:icu",
29-
":lucene:analysis:kuromoji",
30-
":lucene:analysis:morfologik",
31-
":lucene:analysis:nori",
32-
":lucene:analysis:opennlp",
33-
":lucene:analysis:phonetic",
34-
":lucene:analysis:smartcn",
35-
":lucene:analysis:stempel",
36-
":lucene:backward-codecs",
37-
":lucene:benchmark",
38-
":lucene:classification",
39-
":lucene:codecs",
40-
":lucene:core",
41-
":lucene:demo",
42-
":lucene:expressions",
43-
":lucene:facet",
44-
":lucene:grouping",
45-
":lucene:highlighter",
46-
":lucene:join",
47-
":lucene:luke",
48-
":lucene:memory",
49-
":lucene:misc",
50-
":lucene:monitor",
51-
":lucene:queries",
52-
":lucene:queryparser",
53-
":lucene:replicator",
54-
":lucene:sandbox",
55-
":lucene:spatial-extras",
56-
":lucene:spatial3d",
57-
":lucene:suggest",
58-
":lucene:test-framework",
59-
6027
":solr:core",
6128
":solr:solrj",
6229
":solr:contrib:analysis-extras",
@@ -123,121 +90,57 @@ configure(subprojects.findAll { it.path in rootProject.published }) { prj ->
12390
// in gradle or just complex relationships between lazy collection hooks.
12491
gradle.projectsEvaluated {
12592
publishing {
126-
def configurePom;
127-
if (project.path.startsWith(":lucene")) {
128-
configurePom = {
129-
name = "Apache Lucene (module: ${project.name})"
130-
description = name
131-
url = 'https://lucene.apache.org/'
132-
133-
licenses {
134-
license {
135-
name = 'Apache 2'
136-
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
137-
}
138-
}
139-
140-
inceptionYear = "2000"
141-
142-
issueManagement {
143-
system = "JIRA"
144-
url = "https://issues.apache.org/jira/browse/LUCENE"
145-
}
146-
147-
ciManagement {
148-
system = "Jenkins"
149-
url = "https://builds.apache.org/job/Lucene/"
93+
def configurePom = {
94+
name = "Apache Solr (module: ${project.name})"
95+
description = name
96+
url = 'https://solr.apache.org/'
97+
98+
licenses {
99+
license {
100+
name = 'Apache 2'
101+
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
150102
}
103+
}
151104

152-
mailingLists {
153-
mailingList {
154-
name = "General List"
155-
subscribe = "[email protected]"
156-
unsubscribe = "[email protected]"
157-
archive = "https://mail-archives.apache.org/mod_mbox/lucene-general/"
158-
}
159-
160-
mailingList {
161-
name = "Java User List"
162-
subscribe = "[email protected]"
163-
unsubscribe = "[email protected]"
164-
archive = "https://mail-archives.apache.org/mod_mbox/lucene-java-user/"
165-
}
166-
167-
mailingList {
168-
name = "Java Developer List"
169-
subscribe = "[email protected]"
170-
unsubscribe = "[email protected]"
171-
archive = "https://mail-archives.apache.org/mod_mbox/lucene-dev/"
172-
}
105+
inceptionYear = "2006"
173106

174-
mailingList {
175-
name = "Java Commits List"
176-
subscribe = "[email protected]"
177-
unsubscribe = "[email protected]"
178-
archive = "https://mail-archives.apache.org/mod_mbox/lucene-java-commits/"
179-
}
180-
}
181-
182-
scm {
183-
connection = 'scm:git:https://gitbox.apache.org/repos/asf/lucene-solr.git'
184-
developerConnection = 'scm:git:https://gitbox.apache.org/repos/asf/lucene-solr.git'
185-
url = 'https://gitbox.apache.org/repos/asf?p=lucene-solr.git'
186-
}
107+
issueManagement {
108+
system = "JIRA"
109+
url = "https://issues.apache.org/jira/browse/SOLR"
187110
}
188-
} else {
189-
configurePom = {
190-
name = "Apache Solr (module: ${project.name})"
191-
description = name
192-
url = 'https://lucene.apache.org/solr/'
193111

194-
licenses {
195-
license {
196-
name = 'Apache 2'
197-
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
198-
}
199-
}
200-
201-
inceptionYear = "2006"
112+
ciManagement {
113+
system = "Jenkins"
114+
url = "https://builds.apache.org/job/Solr/"
115+
}
202116

203-
issueManagement {
204-
system = "JIRA"
205-
url = "https://issues.apache.org/jira/browse/SOLR"
117+
mailingLists {
118+
mailingList {
119+
name = "Solr User List"
120+
subscribe = "[email protected]"
121+
unsubscribe = "[email protected]"
122+
archive = "https://lists.apache.org/[email protected]"
206123
}
207124

208-
ciManagement {
209-
system = "Jenkins"
210-
url = "https://builds.apache.org/job/Lucene/"
125+
mailingList {
126+
name = "Solr Developer List"
127+
subscribe = "[email protected]"
128+
unsubscribe = "[email protected]"
129+
archive = "https://lists.apache.org/[email protected]"
211130
}
212131

213-
mailingLists {
214-
mailingList {
215-
name = "Solr User List"
216-
subscribe = "[email protected]"
217-
unsubscribe = "[email protected]"
218-
archive = "https://mail-archives.apache.org/mod_mbox/solr-user/"
219-
}
220-
221-
mailingList {
222-
name = "Java Developer List"
223-
subscribe = "[email protected]"
224-
unsubscribe = "[email protected]"
225-
archive = "https://mail-archives.apache.org/mod_mbox/lucene-dev/"
226-
}
227-
228-
mailingList {
229-
name = "Java Commits List"
230-
subscribe = "[email protected]"
231-
unsubscribe = "[email protected]"
232-
archive = "https://mail-archives.apache.org/mod_mbox/lucene-java-commits/"
233-
}
132+
mailingList {
133+
name = "Solr Commits List"
134+
subscribe = "[email protected]"
135+
unsubscribe = "[email protected]"
136+
archive = "https://lists.apache.org/[email protected]"
234137
}
138+
}
235139

236-
scm {
237-
connection = 'scm:git:https://gitbox.apache.org/repos/asf/lucene-solr.git'
238-
developerConnection = 'scm:git:https://gitbox.apache.org/repos/asf/lucene-solr.git'
239-
url = 'https://gitbox.apache.org/repos/asf?p=lucene-solr.git'
240-
}
140+
scm {
141+
connection = 'scm:git:https://gitbox.apache.org/repos/asf/solr.git'
142+
developerConnection = 'scm:git:https://gitbox.apache.org/repos/asf/solr.git'
143+
url = 'https://gitbox.apache.org/repos/asf?p=solr.git'
241144
}
242145
}
243146

‎gradle/native/disable-native.gradle‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎gradle/validation/forbidden-apis.gradle‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ allprojects { prj ->
108108

109109
// Disable sysout signatures for these projects.
110110
if (prj.path in [
111-
":lucene:demo",
112-
":lucene:benchmark",
113-
":lucene:test-framework",
114111
":solr:solr-ref-guide",
115112
":solr:test-framework"
116113
]) {
@@ -119,17 +116,6 @@ allprojects { prj ->
119116
]
120117
}
121118

122-
// Configure lucene-specific rules.
123-
if (prj.path.startsWith(":lucene")) {
124-
forbiddenApisMain {
125-
doFirst dynamicSignatures.curry(configurations.compileClasspath, "lucene")
126-
}
127-
128-
forbiddenApisTest {
129-
doFirst dynamicSignatures.curry(configurations.testCompileClasspath, "lucene")
130-
}
131-
}
132-
133119
// Configure solr-specific rules.
134120
if (prj.path.startsWith(":solr")) {
135121
forbiddenApisMain {

0 commit comments

Comments
 (0)