You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2021/02/21 21:56:45 UTC
[lucene-site] 02/07: Remove various Solr references. Add NOTE in
README
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main/lucene
in repository https://gitbox.apache.org/repos/asf/lucene-site.git
commit e6dc051db5acfb40c1d3494ecc7b25e533c4c2ef
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Sun Feb 21 22:21:39 2021 +0100
Remove various Solr references. Add NOTE in README
---
.asf.yaml | 10 ++++++----
README.md | 18 ++++++++----------
content/pages/core/developer.md | 4 ++--
content/pages/core/discussion.md | 8 +++-----
content/pages/news.md | 2 --
content/pages/whoweare.md | 2 +-
pelicanconf.py | 2 +-
themes/lucene/templates/lucene/core/_sidebar.html | 1 +
.../templates/lucene/openrelevance/_sidebar.html | 1 +
themes/lucene/templates/lucene/pylucene/_sidebar.html | 1 +
themes/lucene/templates/lucene/tlp/_sidebar.html | 8 +-------
themes/lucene/templates/lucene/tlp/page.html | 1 -
12 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index c7673d6..59a472d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,12 +1,14 @@
pelican:
- whoami: master
- target: asf-staging
+ whoami: main/lucene
+ target: asf-staging-lucene
staging:
- whoami: asf-staging
+ whoami: asf-staging-lucene
+ profile: new
github:
labels:
+ - apache
- lucene
- website
- pelican
@@ -15,5 +17,5 @@ github:
merge: true
rebase: false
protected_branches:
- master
+ main
production
diff --git a/README.md b/README.md
index 3a18570..9e1edb5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-# Web site for Apache Lucene and Solr
+# Website for Apache Lucene
-This repository contains the "source code" of the Lucene/Solr website at [lucene.apache.org](https://lucene.apache.org/).
+This repository contains the "source code" of the Lucene website at [lucene.apache.org](https://lucene.apache.org/).
+
+**NOTE:** The Apache [Solr website](https://solr.apache.org/) now has [its own git repository(https://github.com/apache/solr-site)].
## Building the site
@@ -17,7 +19,7 @@ For larger edits it is recommended to build and preview the site locally. This l
# --help Show full help for options that Pelican accepts
./build -l
-Now go to <http://localhost:8000> to view the beautiful Lucene/Solr web page served from your laptop with live-preview of updates :)
+Now go to <http://localhost:8000> to view the beautiful Lucene web page served from your laptop with live-preview of updates :)
### Installing Pelican by hand
@@ -53,13 +55,13 @@ pelican --autoreload --listen
Remember that on Mac/Linux you can use the `build.sh` script with `-l` option to do the same.
-## Updating site during a Lucene/Solr release
+## Updating site during a Lucene release
The release manager documentation will contain detailed instructions on how to update the site during a release. Some of the boring version number update and download link generation is handled by Pelican, see below.
-JavaDoc publishing and Solr RefGuide publishing is **not** done through this repo, but in SVN as detailed in Release Manager instructions, and will then appear in respective sections of the website automatically, see `.htaccess` for how.
+JavaDoc publishing is **not** done through this repo, but in SVN as detailed in Release Manager instructions, and will then appear in respective sections of the website automatically, see `.htaccess` for how.
-### Bump Lucene/Solr latest version after the release
+### Bump Lucene latest version after the release
There are variables in **pelicanconf.py** to modify the latest 2 supported release versions. This will affect all references to release version in the theme, but not in pages or articles. Pelican views pages and articles as static write-once, like a blog post, whereas the theme can be more dynamic and change with every build.
@@ -68,9 +70,6 @@ Modify `LUCENE_LATEST_RELEASE` and `LUCENE_PREVIOUS_MAJOR_RELEASE`, and
* Full patch release versions in html such as "6.3.0".
* Minor release versions in html such as "6.3.x".
-* References to unsupported versions such as "<6" in [Solr downloads][3].
-* References to upcoming unreleased versions such as "7" in [Solr downloads][3]
- which is a +1 increment of the `LUCENE_LATEST_RELEASE` setting.
* Links to source, javadocs, PGP, and SHA512 which use underscores to separate
version parts such as `6_3_0`
* References to the release date of the latest version which can be dynamically
@@ -78,7 +77,6 @@ Modify `LUCENE_LATEST_RELEASE` and `LUCENE_PREVIOUS_MAJOR_RELEASE`, and
[1]: https://blog.getpelican.com/
[2]: https://docs.getpelican.com/en/stable/install.html
-[3]: https://lucene.apache.org/solr/downloads.html#about-versions-and-support
[4]: https://www.python.org/downloads/
[5]: https://ci2.apache.org/#/builders/3
[6]: https://lucene.staged.apache.org
diff --git a/content/pages/core/developer.md b/content/pages/core/developer.md
index 5db1966..5974e17 100644
--- a/content/pages/core/developer.md
+++ b/content/pages/core/developer.md
@@ -8,7 +8,7 @@ template: lucene/core/page
The source files are stored using GIT (see https://git-scm.com/documentation)
- Latest **master**:
-`git clone https://github.com/apache/lucene-solr.git`
+`git clone https://github.com/apache/lucene.git`
## Making a Contribution
Lucene Java is always looking for contributions. See the [Wiki][1] for details on contributing.
@@ -44,7 +44,7 @@ Unofficial nightly Javadocs are also generated by Jenkins:
[3]: https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-master/javadoc/
[4]: http://www.atlassian.com/software/clover/
[5]: https://ci-builds.apache.org/job/Lucene/job/Lucene-Solr-Clover-master/lastSuccessfulBuild/clover-report/dashboard.html
-[6]: https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git
+[6]: https://git-wip-us.apache.org/repos/asf?p=lucene.git
[7]: https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-master/lastSuccessfulBuild/artifact/lucene/dist/
[8]: https://repository.apache.org/snapshots/org/apache/lucene/
[9]: http://home.apache.org/~mikemccand/lucenebench/
diff --git a/content/pages/core/discussion.md b/content/pages/core/discussion.md
index 532e6c7..b6db213 100644
--- a/content/pages/core/discussion.md
+++ b/content/pages/core/discussion.md
@@ -22,10 +22,10 @@ send questions to this list to verify your problem before filing issues in JIRA.
### Developer Discussion: dev@lucene.apache.org
This is the list where participating developers of the Java Lucene project meet
-and discuss issues concerning Lucene/Solr internals, code changes/additions, etc.
+and discuss issues concerning Lucene internals, code changes/additions, etc.
***NOTE:*** _Please do not send mail to this list with usage questions or configuration
-questions and problems; that is what the java-user and solr-user mailing lists are for._
+questions and problems; that is what the java-user mailing list is for._
- Subscribe: [dev-subscribe](mailto:dev-subscribe@lucene.apache.org)
- Unsubscribe: [dev-unsubscribe](mailto:dev-unsubscribe@lucene.apache.org)
@@ -50,7 +50,6 @@ This is an automated announcement only list where notifications about all JIRA i
Subscribe: [issues-subscribe](mailto:issues-subscribe@lucene.apache.org)
Unsubscribe: [issues-unsubscribe](mailto:issues-unsubscribe@lucene.apache.org)
-([Problems?](https://cwiki.apache.org/confluence/display/solr/Unsubscribing%20from%20mailing%20lists))
[Official Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-issues/)
@@ -61,13 +60,12 @@ This is an automated announcement only list where notifications about all CI bui
Subscribe: [builds-subscribe](mailto:builds-subscribe@lucene.apache.org)
Unsubscribe: [builds-unsubscribe](mailto:builds-unsubscribe@lucene.apache.org)
-([Problems?](https://cwiki.apache.org/confluence/display/solr/Unsubscribing%20from%20mailing%20lists))
[Official Apache Archive](http://mail-archives.apache.org/mod_mbox/lucene-builds/)
### Commit Notifications: commits@lucene
-This is an automated announcement only list where notifications about every Lucene/Solr commit are sent.
+This is an automated announcement only list where notifications about every Lucene commit are sent.
- Subscribe: [commits-subscribe](mailto:commits-subscribe@lucene.apache.org)
- Unsubscribe: [commits-unsubscribe](mailto:commits-unsubscribe@lucene.apache.org)
diff --git a/content/pages/news.md b/content/pages/news.md
index 63a8ac7..426d444 100644
--- a/content/pages/news.md
+++ b/content/pages/news.md
@@ -8,5 +8,3 @@ You may also read Lucene news as ATOM feeds:
* [TLP news feed](/feeds/news.atom.xml).
* [All news feed](/feeds/all.atom.xml).
* [Lucene core news feed](/feeds/core/news.atom.xml).
-* [Solr regular news feed](/feeds/solr/news.atom.xml).
-* [Solr security news feed](/feeds/solr/security.atom.xml).
diff --git a/content/pages/whoweare.md b/content/pages/whoweare.md
index c053c5d..32d6d1d 100644
--- a/content/pages/whoweare.md
+++ b/content/pages/whoweare.md
@@ -3,7 +3,7 @@ URL: whoweare.html
save_as: whoweare.html
template: lucene/tlp/page
-## Lucene<span style="vertical-align: super; font-size: xx-small">TM</span>/Solr<span style="vertical-align: super; font-size: xx-small">TM</span> Committers
+## Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Committers
- *[Namgyu Kim](https://www.linkedin.com/in/danmuzi)* (namgyu@...)
- *[Ramkumar Aiyengar](https://www.linkedin.com/in/andyetitmoves)* (andyetitmoves@...)
- *Ahmet Arslan* (iorixxx@...)
diff --git a/pelicanconf.py b/pelicanconf.py
index 63691f5..5551257 100755
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
from datetime import datetime, date
from checksumdir import dirhash
-AUTHOR = 'Lucene and Solr Developers'
+AUTHOR = 'Lucene Developers'
SITENAME = 'Apache Lucene'
SITESUBTITLE = ''
SITEURL = ''
diff --git a/themes/lucene/templates/lucene/core/_sidebar.html b/themes/lucene/templates/lucene/core/_sidebar.html
index 2d74cf1..3ac1ec4 100644
--- a/themes/lucene/templates/lucene/core/_sidebar.html
+++ b/themes/lucene/templates/lucene/core/_sidebar.html
@@ -42,6 +42,7 @@
<h1 id="related-projects">Related Projects</h1>
<ul>
+ <li><a href="https://solr.apache.org">Apache Solr</a></li>
<li><a href="http://hadoop.apache.org">Apache Hadoop</a></li>
<li><a href="http://manifoldcf.apache.org/">Apache ManifoldCF</a></li>
<li><a href="http://lucenenet.apache.org/">Apache Lucene.Net</a></li>
diff --git a/themes/lucene/templates/lucene/openrelevance/_sidebar.html b/themes/lucene/templates/lucene/openrelevance/_sidebar.html
index 4e70e46..65a4116 100644
--- a/themes/lucene/templates/lucene/openrelevance/_sidebar.html
+++ b/themes/lucene/templates/lucene/openrelevance/_sidebar.html
@@ -19,6 +19,7 @@
<h1 id="related-projects">Related Projects<a class="headerlink" href="#related-projects" title="Permanent link">¶</a></h1>
<ul>
+ <li><a href="https://solr.apache.org">Apache Solr</a></li>
<li><a href="http://hadoop.apache.org">Apache Hadoop</a></li>
<li><a href="http://manifoldcf.apache.org/">Apache ManifoldCF</a></li>
<li><a href="http://lucenenet.apache.org/">Apache Lucene.Net</a></li>
diff --git a/themes/lucene/templates/lucene/pylucene/_sidebar.html b/themes/lucene/templates/lucene/pylucene/_sidebar.html
index b6a33b0..1f1ab59 100644
--- a/themes/lucene/templates/lucene/pylucene/_sidebar.html
+++ b/themes/lucene/templates/lucene/pylucene/_sidebar.html
@@ -28,6 +28,7 @@
<h1 id="related-projects">Related Projects<a class="headerlink" href="#related-projects" title="Permanent link">¶</a></h1>
<ul>
+ <li><a href="https://solr.apache.org">Apache Solr</a></li>
<li><a href="http://hadoop.apache.org">Apache Hadoop</a></li>
<li><a href="http://manifoldcf.apache.org/">Apache ManifoldCF</a></li>
<li><a href="http://lucenenet.apache.org/">Apache Lucene.Net</a></li>
diff --git a/themes/lucene/templates/lucene/tlp/_sidebar.html b/themes/lucene/templates/lucene/tlp/_sidebar.html
index bbff1b7..4117b25 100644
--- a/themes/lucene/templates/lucene/tlp/_sidebar.html
+++ b/themes/lucene/templates/lucene/tlp/_sidebar.html
@@ -4,17 +4,10 @@
<div class="flap bottom">Apache Lucene {{ LUCENE_LATEST_RELEASE }}</div>
</div>
<div class="download-desc">Apache Lucene {{ LUCENE_LATEST_RELEASE }}</div>
-<div class="button-orange">
- <a href="{{ SITEURL }}/solr/downloads.html">Download</a>
- <div class="flap top">Click to</div>
- <div class="flap bottom">Apache Solr {{ LUCENE_LATEST_RELEASE }}</div>
-</div>
-<div class="download-desc">Apache Solr {{ LUCENE_LATEST_RELEASE }}</div>
<h1 id="projects">Projects<a class="headerlink" href="#projects" title="Permanent link">¶</a></h1>
<ul>
<li><a href="{{ SITEURL }}/core/">Lucene Core (Java)</a></li>
- <li><a href="{{ SITEURL }}/solr/">Solr</a></li>
<li><a href="{{ SITEURL }}/pylucene/">PyLucene</a></li>
<li><a href="{{ SITEURL }}/openrelevance/">Open Relevance (Discontinued)</a></li>
</ul>
@@ -47,6 +40,7 @@
<h1 id="related-projects">Related Projects<a class="headerlink" href="#related-projects" title="Permanent link">¶</a></h1>
<ul>
+ <li><a href="https://solr.apache.org">Apache Solr</a></li>
<li><a href="http://hadoop.apache.org">Apache Hadoop</a></li>
<li><a href="http://manifoldcf.apache.org/">Apache ManifoldCF</a></li>
<li><a href="http://lucenenet.apache.org/">Apache Lucene.Net</a></li>
diff --git a/themes/lucene/templates/lucene/tlp/page.html b/themes/lucene/templates/lucene/tlp/page.html
index baac81f..d8fba46 100644
--- a/themes/lucene/templates/lucene/tlp/page.html
+++ b/themes/lucene/templates/lucene/tlp/page.html
@@ -4,7 +4,6 @@
{% block nav_items %}
<li><a href="{{ SITEURL}}/core/">Core (Java)</a></li>
-<li><a href="{{ SITEURL }}/solr/">Solr</a></li>
<li><a class="last" href="{{ SITEURL }}/pylucene/index.html">PyLucene</a></li>
{% endblock %}