This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new c2a9626cb99 SOLR-15730: Document SolrJ opt-in for 10x (#1021)
c2a9626cb99 is described below
commit c2a9626cb99e5f37d1bb59097cb98df43426e1b2
Author: David Smiley <[email protected]>
AuthorDate: Thu Sep 22 08:30:33 2022 -0400
SOLR-15730: Document SolrJ opt-in for 10x (#1021)
Added "Major changes in Solr 10".
Moved the "Upgrading 9.1" section to the page it should be on. Added
clarification RE transitive dependency.
Co-authored-by: Jan Høydahl <[email protected]>
---
solr/CHANGES.txt | 5 ++++-
.../major-changes-in-solr-10.adoc} | 19 ++++++++++++++-----
.../upgrade-notes/pages/major-changes-in-solr-9.adoc | 7 +++++++
.../upgrade-notes/pages/solr-upgrade-notes.adoc | 9 +++------
.../modules/upgrade-notes/upgrade-nav.adoc | 1 +
5 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bedbfecc4b9..a7e0e08a88c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -24,7 +24,10 @@ Bug Fixes
Other Changes
---------------------
-(No changes)
+
+* SOLR-15730: SolrJ modules like SolrJ-Zookeeper are now opt-in from a Maven
POM perspective.
+ Previously, the modules would come transitively.
+ (David Smiley)
================== 9.1.0 ==================
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
similarity index 52%
copy from solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc
copy to
solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
index 4107da27003..e92dfc5a49b 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc
+++
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
@@ -1,3 +1,4 @@
+= Major Changes in Solr 10
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
@@ -15,8 +16,16 @@
// specific language governing permissions and limitations
// under the License.
-* xref:solr-upgrade-notes.adoc[]
-** xref:major-changes-in-solr-9.adoc[]
-** xref:major-changes-in-solr-8.adoc[]
-** xref:major-changes-in-solr-7.adoc[]
-** xref:major-changes-in-solr-6.adoc[]
+Solr 10.0 is a major new release of Solr.
+
+This page highlights the most important changes including new features and
changes in default behavior as well as previously deprecated features that have
now been removed.
+
+== Solr 10 Upgrade Planning
+
+Before starting an upgrade to this version of Solr, please take the time to
review all information about changes from the version you are currently on up
to this one, to include the minor version number changes as well.
+
+// TODO add similar text that previous releases have at this spot.
+
+=== SolrJ
+
+Starting in 10, the Maven POM for SolrJ does not refer to SolrJ modules like
ZooKeeper. If you require such functionality, you need to add additional
dependencies.
\ No newline at end of file
diff --git
a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index d0aeafb9c23..72179875794 100644
---
a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -68,6 +68,13 @@ Due to changes in Lucene 9, that isn't possible any more.
=== Querying and Indexing
* Added Lucene91HnswVectorsFormat codec for DenseVectorField. In order to use
the new codec, reindex is necessary.
+=== SolrJ
+SolrJ is beginning to be split up.
+If you use ZooKeeper coordinates to create a `CloudSolrClient`, you will need
to add a dependency on `solrj-zookeeper`.
+If you use SolrJ's Maven POM to depend on SolrJ, then this should happen
automatically through transitive resolution.
+Instead of depending on ZooKeeper, consider migrating to use of specifying a
list of Solr URLs in the client's builder.
+Not only does this reduce dependencies, but it improves security by being able
to limit ZooKeeper access.
+
== Solr 9.0
=== Querying and Indexing
* xref:query-guide:dense-vector-search.adoc[Dense Vector "Neural" Search]
through `DenseVectorField` fieldType and K-Nearest-Neighbor (KNN) Query Parser.
diff --git
a/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc
b/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc
index b370bdf6ba6..d6e8bd155d2 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc
@@ -1,5 +1,6 @@
= Solr Upgrade Notes
-:page-children: major-changes-in-solr-9, \
+:page-children: major-changes-in-solr-10, \
+ major-changes-in-solr-9, \
major-changes-in-solr-8, \
major-changes-in-solr-7, \
major-changes-in-solr-6
@@ -34,11 +35,7 @@ that may affect your existing implementation.
Detailed steps for upgrading a Solr cluster are in the section
xref:deployment-guide:upgrading-a-solr-cluster.adoc[].
-== Upgrading to 9.1
-
-SolrJ is beginning to be split up. If you use ZooKeeper coordinates to create
a `CloudSolrClient`, you will need to add a dependency on `solrj-zookeeper`.
-Instead, consider migrating to use of specifying a list of Solr URLs in the
client's builder.
-Not only does this reduce dependencies, but it improves security by being able
to limit ZooKeeper access.
+// DO NOT ADD MINOR VERSION INFO HERE; see child pages
Zookeeper Credentials support now follows a new paradigm.
Old classes, such as `VMParamsAllAndReadonlyDigestZkACLProvider` and
`VMParamsSingleSetCredentialsDigestZkCredentialsProvider`, are deprecated but
still supported until at least `10.0`.
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc
b/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc
index 4107da27003..455fd81b6a7 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/upgrade-nav.adoc
@@ -16,6 +16,7 @@
// under the License.
* xref:solr-upgrade-notes.adoc[]
+** xref:major-changes-in-solr-10.adoc[]
** xref:major-changes-in-solr-9.adoc[]
** xref:major-changes-in-solr-8.adoc[]
** xref:major-changes-in-solr-7.adoc[]
