Merge remote-tracking branch 'origin/master' into feature/async-replicator-client

# Conflicts:
#	src/Lucene.Net.Replicator/ReplicationClient.cs

Author: paulirwin

.asf.yaml

@@ -35,6 +35,16 @@ github:
     # Enable discussions
     discussions: true
 
-  # Disallow forced pushes
-  protected_branches:
-    master: {}
+  rulesets:
+    - name: "Branch Protection"
+      type: branch
+      branches:
+        includes:
+          - "master"
+          - "release/*"
+          - "docs/*"
+        excludes: []
+      restrict_deletion: true
+      restrict_force_push: true
+      required_linear_history: true
+      required_conversation_resolution: true

.build/dependencies.props

@@ -49,14 +49,15 @@
     <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftCodeAnalysisVisualBasicPackageVersion>2.6.1</MicrosoftCodeAnalysisVisualBasicPackageVersion>
     <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>$(MicrosoftCodeAnalysisVisualBasicPackageVersion)</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>8.0.0</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>8.0.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationXmlPackageVersion>8.0.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>8.0.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsParentVersion>10.0.7</MicrosoftExtensionsParentVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>$(MicrosoftExtensionsParentVersion)</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>$(MicrosoftExtensionsParentVersion)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>$(MicrosoftExtensionsParentVersion)</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>$(MicrosoftExtensionsParentVersion)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>$(MicrosoftExtensionsParentVersion)</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationXmlPackageVersion>$(MicrosoftExtensionsParentVersion)</MicrosoftExtensionsConfigurationXmlPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>$(MicrosoftExtensionsParentVersion)</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>$(MicrosoftExtensionsParentVersion)</MicrosoftExtensionsDependencyInjectionPackageVersion>
     <MicrosoftNETFrameworkReferenceAssembliesPackageReferenceVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesPackageReferenceVersion>
     <MicrosoftNETTestSdkPackageVersion>17.11.1</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftSourceLinkAzureReposGitPackageReferenceVersion>1.1.1</MicrosoftSourceLinkAzureReposGitPackageReferenceVersion>

.github/linters/codespell.txt

@@ -1,5 +1,4 @@
 abl
-absolut
 acccount
 accessability
 accidently
@@ -10,7 +9,6 @@ adherance
 administr
 adquire
 advices
-afer
 afile
 afte
 afterwords
@@ -21,7 +19,6 @@ alle
 allo
 allocte
 allong
-alocate
 alot
 alow
 alpha-numeric
@@ -38,7 +35,6 @@ anothers
 appropropriate
 apprpriate
 aquire
-arbitarily
 arent
 arguents
 assemblie
@@ -165,7 +161,6 @@ guerilla
 guiness
 hart
 hav
-havent
 heder
 hendler
 highligh
@@ -211,7 +206,6 @@ itsself
 kake
 ket
 lama
-lenght
 lief
 lien
 loner
@@ -235,9 +229,7 @@ meus
 millenium
 millepede
 mimicing
-mimick
 mimicks
-minimun
 mininum
 mis
 mot
@@ -272,7 +264,6 @@ ommitted
 ond
 ons
 ony
-oposite
 oppertunity
 ore
 oriente

.github/workflows/asf-allowlist-check.yml

@@ -0,0 +1,34 @@
+# 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
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+---
+name: 'ASF Allowlist Check'
+on:
+  pull_request:
+    paths: ['.github/**']
+  push:
+    branches: [master]
+    paths: ['.github/**']
+permissions:
+  contents: read
+jobs:
+  asf-allowlist-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+      - uses: apache/infrastructure-actions/allowlist-check@4e9c961f587f72b170874b6f5cd4ac15f7f26eb8 # main

.rat-excludes

@@ -1,14 +1,14 @@
 # Note: these patterns are applied to single files or directories, not full paths
 # coverage/* will ignore any coverage dir, but airflow/www/static/coverage/* will match nothing
 
-.rat-excludes
-.gitignore
 .gitattributes
+.gitignore
+.rat-excludes
 
 # Exclude build assets
+bin/*
 lib/*
 obj/*
-bin/*
 _artifacts/*
 _site/*
 
@@ -25,18 +25,18 @@ LuceneResourcesWikiPage\.html
 # Covered under a different license
 psake/*
 KStemData\d+\.cs
-Snowball/*
 Egothor.Stemmer/*
+Automaton/*
 Events/*
 Sax/*
-JaspellTernarySearchTrie\.cs
-RectangularArrays\.cs
-LimitedConcurrencyLevelTaskScheduler\.cs
-Automaton/*
+Snowball/*
 ConcurrentHashSet\.cs
-NullableAttributes\.cs
 ConfigurationReloadToken\.cs
 ConfigurationRoot\.cs
 ConfigurationSection\.cs
 DateTimeOffsetUtil\.cs
 FileStreamOptions\.cs
+JaspellTernarySearchTrie\.cs
+LimitedConcurrencyLevelTaskScheduler\.cs
+NullableAttributes\.cs
+RectangularArrays\.cs

NuGet.config

@@ -21,8 +21,8 @@ under the License.
 
 <configuration>
   <packageSources>
-    <add key="ICU4N preview feed" value="https://www.myget.org/F/icu4n/api/v3/index.json" />
-    <add key="J2N preview feed" value="https://www.myget.org/F/j2n-preview/api/v3/index.json" />
+    <!-- <add key="ICU4N preview feed" value="https://www.myget.org/F/icu4n/api/v3/index.json" /> -->
+    <!-- <add key="J2N preview feed" value="https://www.myget.org/F/j2n-preview/api/v3/index.json" /> -->
     <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemmer.cs

@@ -720,7 +720,7 @@ private bool Step2()
                 return false;
             }
 
-            // suffix lenght = 7
+            // suffix length = 7
             if (RV.Length >= 7)
             {
                 if (Suffix(RV, "issemos"))

src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs

@@ -11,6 +11,7 @@
 using System.Globalization;
 using System.IO;
 using Integer = J2N.Numerics.Int32;
+using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Analysis.CharFilters
 {
@@ -30679,7 +30680,7 @@ private static int ZzUnpackAttribute(string packed, int offset, int[] result)
         /// user code:
         /// </summary>
         private static readonly IDictionary<string, string> upperCaseVariantsAccepted
-            = new Dictionary<string, string>()
+            = new JCG.Dictionary<string, string>()
             {
                 {"quot", "QUOT"},
                 {"copy", "COPY" },

src/Lucene.Net.Analysis.Common/Analysis/CharFilter/NormalizeCharMap.cs

@@ -36,7 +36,7 @@ namespace Lucene.Net.Analysis.CharFilters
     public class NormalizeCharMap
     {
         internal readonly FST<CharsRef> map;
-        internal readonly IDictionary<char?, FST.Arc<CharsRef>> cachedRootArcs = new Dictionary<char?, FST.Arc<CharsRef>>();
+        internal readonly IDictionary<char?, FST.Arc<CharsRef>> cachedRootArcs = new JCG.Dictionary<char?, FST.Arc<CharsRef>>();
 
         // Use the builder to create:
         private NormalizeCharMap(FST<CharsRef> map)

src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs

@@ -195,7 +195,7 @@ private static XmlReaderSettings GetXmlReaderSettings() // LUCENENET: CA1822: Ma
 
         private static IDictionary<string, string> GetAttributes(XmlReader node) // LUCENENET: CA1822: Mark members as static
         {
-            var result = new Dictionary<string, string>();
+            var result = new JCG.Dictionary<string, string>();
             if (node.HasAttributes)
             {
                 for (int i = 0; i < node.AttributeCount; i++)