SOLR-15178 Non-existent dependency listed in solr-core

.asf.yaml

@@ -1,8 +1,8 @@
 # https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
 
 github:
- description: "Apache Lucene and Solr open-source search software"
- homepage: https://lucene.apache.org/
+ description: "Apache Solr open-source search software"
+ homepage: https://solr.apache.org/
  labels:
  - lucene
  - solr
@@ -19,7 +19,7 @@ github:
  rebase: false
 
 notifications:
- commits: commits@lucene.apache.org
- issues: issues@lucene.apache.org
- pullrequests: issues@lucene.apache.org
+ commits: commits@solr.apache.org
+ issues: issues@solr.apache.org
+ pullrequests: issues@solr.apache.org
  jira_options: link label worklog

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,17 @@
 <!--
 _(If you are a project committer then you may remove some/all of the following template.)_
 
-Before creating a pull request, please file an issue in the ASF Jira system for Lucene or Solr:
+Before creating a pull request, please file an issue in the ASF Jira system for Solr:
 
-* https://issues.apache.org/jira/projects/LUCENE
 * https://issues.apache.org/jira/projects/SOLR
 
 You will need to create an account in Jira in order to create an issue.
 
 The title of the PR should reference the Jira issue number in the form:
 
-* LUCENE-####: <short description of problem or changes>
 * SOLR-####: <short description of problem or changes>
 
-LUCENE and SOLR must be fully capitalized. A short description helps people scanning pull requests for items they can work on.
+SOLR must be fully capitalized. A short description helps people scanning pull requests for items they can work on.
 
 Properly referencing the issue in the title ensures that Jira is correctly updated with code review comments and commits. -->
 
@@ -37,7 +35,7 @@ Please review the following and check all that apply:
 - [ ] I have reviewed the guidelines for [How to Contribute](https://wiki.apache.org/solr/HowToContribute) and my code conforms to the standards described there to the best of my ability.
 - [ ] I have created a Jira issue and added the issue ID to my pull request title.
 - [ ] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended)
-- [ ] I have developed this patch against the `master` branch.
+- [ ] I have developed this patch against the `main` branch.
 - [ ] I have run `./gradlew check`.
 - [ ] I have added tests for my changes.
-- [ ] I have added documentation for the [Ref Guide](https://github.com/apache/lucene-solr/tree/master/solr/solr-ref-guide) (for Solr changes only).
+- [ ] I have added documentation for the [Reference Guide](https://github.com/apache/solr/tree/main/solr/solr-ref-guide)

.github/workflows/docker-test.yml

@@ -3,7 +3,7 @@ name: Docker Build & Test
 on:
  pull_request:
  branches:
- - 'master'
+ - 'main'
  paths:
  - '.github/workflows/docker-test.yml'
  - 'solr/bin/**'

.github/workflows/solrj-test.yml

@@ -3,7 +3,7 @@ name: SolrJ Tests
 on:
  pull_request:
  branches:
- - 'master'
+ - 'main'
  paths:
  - '.github/workflows/solrj-test.yml'
  - 'solr/solrj/**'

README.md

@@ -15,46 +15,34 @@
  limitations under the License.
  -->
 
-# Apache Lucene and Solr
+# Apache Solr
 
-Apache Lucene is a high-performance, full featured text search engine library
-written in Java.
-
-Apache Solr is an enterprise search platform written in Java and using Apache Lucene.
+Apache Solr is an enterprise search platform written in Java and using [Apache Lucene](https://lucene.apache.org/).
 Major features include full-text search, index replication and sharding, and
 result faceting and highlighting.
 
 
-[![Build Status](https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-master/badge/icon?subject=Lucene)](https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-master/) [![Build Status](https://ci-builds.apache.org/job/Lucene/job/Solr-Artifacts-master/badge/icon?subject=Solr)](https://ci-builds.apache.org/job/Lucene/job/Solr-Artifacts-master/)
+[![Build Status](https://ci-builds.apache.org/job/Solr/job/Solr-Artifacts-main/badge/icon?subject=Solr)](https://ci-builds.apache.org/job/Solr/job/Solr-Artifacts-main/)
 
 
 ## Online Documentation
 
 This README file only contains basic setup instructions. For more
-comprehensive documentation, visit:
-
-- Lucene: <http://lucene.apache.org/core/documentation.html>
-- Solr: <http://lucene.apache.org/solr/guide/>
+comprehensive documentation, visit <https://solr.apache.org/guide/>
 
 ## Building with Gradle
 
-### Building Lucene
-
-See [lucene/BUILD.md](./lucene/BUILD.md).
-
-### Building Solr
-
 Firstly, you need to set up your development environment (OpenJDK 11 or greater).
 
 We'll assume that you know how to get and set up the JDK - if you
 don't, then we suggest starting at https://www.oracle.com/java/ and learning
 more about Java, before returning to this README. Solr runs with
 Java 11 and later.
 
-As of 9.0, Lucene/Solr uses [Gradle](https://gradle.org/) as the build
+As of 9.0, Solr uses [Gradle](https://gradle.org/) as the build
 system. Ant build support has been removed.
 
-To build Lucene and Solr, run (`./` can be omitted on Windows):
+To build Solr, run (`./` can be omitted on Windows):
 
 `./gradlew assemble`
 
@@ -83,7 +71,7 @@ If you want to build the documentation, type `./gradlew -p solr documentation`.
 
 ## Running Solr
 
-After [building Solr](#building-lucene-solr), the server can be started using
+After building Solr, the server can be started using
 the `bin/solr` control scripts. Solr can be run in either standalone or
 distributed (SolrCloud mode).
 
@@ -114,7 +102,7 @@ directory.
 
 `./gradlew assemble` will build a runnable Solr as noted above.
 
-`./gradlew check` will assemble Lucene/Solr and run all validation
+`./gradlew check` will assemble Solr and run all validation
  tasks unit tests.
 
 `./gradlew help` will print a list of help commands for high-level tasks. One
@@ -129,8 +117,7 @@ contributing.
 
 ## Discussion and Support
 
-- [Users Mailing List](http://lucene.apache.org/solr/community.html#solr-user-list-solr-userluceneapacheorg)
-- [Developers Mailing List](http://lucene.apache.org/solr/community.html#developer-list-devluceneapacheorg)
-- [Lucene Issue Tracker](https://issues.apache.org/jira/browse/LUCENE)
-- [Solr Issue Tracker](https://issues.apache.org/jira/browse/SOLR)
+- [Mailing Lists](https://solr.apache.org/community.html#mailing-lists-chat)
+- [Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/SOLR)
 - IRC: `#solr` and `#solr-dev` on freenode.net
+- [Slack](https://solr.apache.org/community.html#slack) 

build.gradle

@@ -54,9 +54,6 @@ allprojects {
 }
 
 ext {
- skipSolr = (System.getProperty("skip.solr") as Boolean)
- skipLucene = (System.getProperty("skip.lucene") as Boolean)
-
  // "base" version is stripped of the qualifier. Compute it.
  baseVersion = {
  def m = (version =~ /^(\d+\.\d+\.\d+)(-(.+))?/)
@@ -115,9 +112,7 @@ apply from: file('gradle/generate-defaults.gradle')
 // Ant-compatibility layer: apply folder layout early so that
 // evaluation of other scripts doesn't need to be deferred.
 apply from: file('gradle/ant-compat/folder-layout.gradle')
-if (!skipSolr) {
- apply from: file('gradle/ant-compat/solr.folder-layout.gradle') // SOLR ONLY
-}
+apply from: file('gradle/ant-compat/solr.folder-layout.gradle')
 
 // Set up defaults and configure aspects for certain modules or functionality
 // (java, tests)
@@ -152,28 +147,11 @@ apply from: file('gradle/validation/gradlew-scripts-tweaked.gradle')
 apply from: file('gradle/validation/validate-log-calls.gradle')
 apply from: file('gradle/validation/check-broken-links.gradle')
 
-if (!skipLucene) {
- apply from: file('gradle/validation/spotless.gradle')
-}
-
-if (!skipSolr) {
- apply from: file('gradle/validation/solr.config-file-sanity.gradle') // SOLR ONLY
-}
+apply from: file('gradle/validation/solr.config-file-sanity.gradle')
 
 // Source or data regeneration tasks
-if (!skipLucene) {
- apply from: file('gradle/generation/jflex.gradle')
- apply from: file('gradle/generation/util.gradle')
- apply from: file('gradle/generation/snowball.gradle')
- apply from: file('gradle/generation/kuromoji.gradle')
- apply from: file('gradle/generation/nori.gradle')
- apply from: file('gradle/generation/icu.gradle')
-}
 apply from: file('gradle/generation/javacc.gradle')
 
-// Shared configuration of subprojects containing native code.
-apply from: file('gradle/native/disable-native.gradle')
-
 // Additional development aids.
 apply from: file('gradle/maven/maven-local.gradle')
 apply from: file('gradle/testing/per-project-summary.gradle')
@@ -188,38 +166,23 @@ apply from: file('gradle/help.gradle')
 // of potential problems with the build conventions, dependencies, etc.
 apply from: file('gradle/ant-compat/misc.gradle')
 
-if (!skipLucene) {
- apply from: file('gradle/ant-compat/test-classes-cross-deps.gradle')
-}
-
-if (!skipSolr) {
- apply from: file('gradle/ant-compat/force-versions.gradle') // SOLR ONLY
- apply from: file('gradle/ant-compat/solr.test-classes-cross-deps.gradle') // SOLR ONLY
- apply from: file('gradle/ant-compat/artifact-naming.gradle') // SOLR ONLY
-}
+apply from: file('gradle/ant-compat/force-versions.gradle')
+apply from: file('gradle/ant-compat/artifact-naming.gradle')
 
 apply from: file('gradle/documentation/documentation.gradle')
 apply from: file('gradle/documentation/changes-to-html.gradle')
 apply from: file('gradle/documentation/markdown.gradle')
 apply from: file('gradle/documentation/render-javadoc.gradle')
 
 apply from: file('gradle/hacks/gradle-archives.gradle')
-if (!skipSolr) {
- apply from: file('gradle/hacks/solr.findbugs.gradle') // SOLR ONLY
-}
+apply from: file('gradle/hacks/solr.findbugs.gradle')
+
 apply from: file('gradle/hacks/gradle.gradle')
 apply from: file('gradle/hacks/hashmapAssertions.gradle')
 
-if (skipLucene) {
- apply from: file('gradle/solr-tlp-migration/inaccessible-test-sources.gradle')
-}
-apply from: file('gradle/solr-tlp-migration/temp-disable-constraint-checking.gradle')
+apply from: file('gradle/solr-tlp-migration/inaccessible-test-sources.gradle')
 
-if (!skipSolr) {
- apply from: file('gradle/solr/packaging.gradle') // SOLR ONLY
- apply from: file('gradle/solr/solr-forbidden-apis.gradle') // SOLR ONLY
-}
+apply from: file('gradle/solr/packaging.gradle')
+apply from: file('gradle/solr/solr-forbidden-apis.gradle')
 
-if (!skipSolr) {
- apply from: file('gradle/ant-compat/solr.post-jar.gradle') // SOLR ONLY
-}
+apply from: file('gradle/ant-compat/solr.post-jar.gradle')

dev-tools/doap/README.txt

@@ -1,8 +1,8 @@
-This folder contains the DOAP[1] files for each project.
+This folder contains the DOAP[1] file, which is parsed and displayed at https://projects.apache.org/project.html?solr
 
-Upon release, these files should be updated to include new release details.
+Upon release, this file should be updated to include new release details.
 
 NOTE: If this folder's contents are moved elsewhere, the website .htaccess
 file will need to be updated.
 
-[1] DOAP: https://github.com/edumbill/doap
+[1] DOAP: https://github.com/edumbill/doap