You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ge...@apache.org on 2024/01/22 16:27:42 UTC

(solr) branch branch_9x updated: Add next minor version 9.6.0

This is an automated email from the ASF dual-hosted git repository.

gerlowskija pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new efbc74ec7c9 Add next minor version 9.6.0
efbc74ec7c9 is described below

commit efbc74ec7c98d258a20087b26ce239ee07f1434a
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Mon Jan 22 11:27:36 2024 -0500

    Add next minor version 9.6.0
---
 build.gradle                                       |  2 +-
 solr/CHANGES.txt                                   | 25 ++++++++++++++++++++++
 .../apache/solr/client/api/util/SolrVersion.java   |  2 +-
 solr/solr-ref-guide/antora.yml                     | 22 +++++++++----------
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 798b0b9c2d2..1e76b3e5a9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ apply from: file('gradle/globals.gradle')
 // Calculate project version:
 version = {
   // Release manager: update base version here after release:
-  String baseVersion = '9.5.0'
+  String baseVersion = '9.6.0'
 
   // On a release explicitly set release version in one go:
   //  -Dversion.release=x.y.z
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 435cc31b39e..425c9f1e744 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -5,6 +5,31 @@ Most people will find the solr-upgrade-notes.adoc file more approachable.
 https://github.com/apache/solr/blob/main/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc
 
 
+==================  9.6.0 ==================
+New Features
+---------------------
+(No changes)
+
+Improvements
+---------------------
+(No changes)
+
+Optimizations
+---------------------
+(No changes)
+
+Bug Fixes
+---------------------
+(No changes)
+
+Dependency Upgrades
+---------------------
+(No changes)
+
+Other Changes
+---------------------
+(No changes)
+
 ==================  9.5.0 ==================
 New Features
 ---------------------
diff --git a/solr/api/src/java/org/apache/solr/client/api/util/SolrVersion.java b/solr/api/src/java/org/apache/solr/client/api/util/SolrVersion.java
index e49aa31ff93..a11cbc3c72e 100644
--- a/solr/api/src/java/org/apache/solr/client/api/util/SolrVersion.java
+++ b/solr/api/src/java/org/apache/solr/client/api/util/SolrVersion.java
@@ -29,7 +29,7 @@ public final class SolrVersion implements Comparable<SolrVersion> {
   private final Semver version;
 
   // This static variable should be bumped for each release
-  public static final String LATEST_STRING = "9.5.0";
+  public static final String LATEST_STRING = "9.6.0";
 
   /** This instance represents the current (latest) version of Solr. */
   public static final SolrVersion LATEST = SolrVersion.valueOf(LATEST_STRING);
diff --git a/solr/solr-ref-guide/antora.yml b/solr/solr-ref-guide/antora.yml
index c3c4609c71e..3ebe4b1a14f 100644
--- a/solr/solr-ref-guide/antora.yml
+++ b/solr/solr-ref-guide/antora.yml
@@ -19,8 +19,8 @@
 # but there is usually no need besides more up-to-date nightly builds of the ref-guide.
 
 name: solr
-version: '9_5'
-display_version: '9.5-beta'
+version: '9_6'
+display_version: '9.6-beta'
 # Marking a version as 'prerelease: false' is only needed for published branches (minor version branches, branch_x_y, that have had a release)
 prerelease: -beta
 title: Solr Reference Guide
@@ -39,19 +39,19 @@ asciidoc:
     idseparator: '-'
     idprefix: ''
     # 'patch-version' is the 'z' part of x.y.z semantic version
-    page-solr-javadocs: 'https://solr.apache.org/docs/9_5_0'
-    solr-javadocs: 'https://solr.apache.org/docs/9_5_0'
+    page-solr-javadocs: 'https://solr.apache.org/docs/9_6_0'
+    solr-javadocs: 'https://solr.apache.org/docs/9_6_0'
     lucene-javadocs: 'https://lucene.apache.org/core/9_8_0'
     java-javadocs: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/
-    solr-docs-version: '9.5'
-    solr-full-version: '9.5.0'
+    solr-docs-version: '9.6'
+    solr-full-version: '9.6.0'
 
     dep-version-commons-codec: '1.16.0'
-    dep-version-dropwizard: '4.2.20'
-    dep-version-hadoop: '3.3.5'
-    dep-version-log4j: '2.20.0'
+    dep-version-dropwizard: '4.2.21'
+    dep-version-hadoop: '3.3.6'
+    dep-version-log4j: '2.21.0'
     dep-version-opennlp: '1.9.4'
     dep-version-tika: '1.28.5'
-    dep-version-zookeeper: '3.9.0'
+    dep-version-zookeeper: '3.9.1'
     dep-version-lucene: '9.8.0'
-    dep-version-opentelemetry: '1.30.1'
+    dep-version-opentelemetry: '1.31.0'