Skip to content

Commit 81d0c8a

Browse files
authored
Merge branch 'apache:master' into feature/async-replicator-client
2 parents 2e7d045 + dff28e7 commit 81d0c8a

334 files changed

Lines changed: 5509 additions & 5804 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.asf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ github:
2424
- query
2525
- apache
2626
- hacktoberfest
27-
27+
2828
features:
2929
# Enable wiki for documentation
3030
wiki: false

.build/azure-templates/install-dotnet-sdk.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

.build/azure-templates/publish-nuget-packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

.build/azure-templates/publish-test-results.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -50,7 +50,7 @@ steps:
5050
$testResultsFileName = "$(Build.ArtifactStagingDirectory)/${{ parameters.testResultsArtifactName }}/${{ parameters.osName }}/${{ parameters.framework }}/${{ parameters.vsTestPlatform }}/$testProjectName/${{ parameters.testResultsFileName }}"
5151
$testResultsFileExists = Test-Path $testResultsFileName
5252
if ($testResultsFileExists) {
53-
53+
5454
$reader = [System.Xml.XmlReader]::Create($testResultsFileName)
5555
try {
5656
$countersFound = $false

.build/azure-templates/show-all-environment-variables.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

.build/azure-templates/show-all-files.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

.build/dependencies.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PropertyGroup Label="NuGet Package Reference Versions">
2323
<Antlr4CodeGeneratorPackageVersion>4.6.6</Antlr4CodeGeneratorPackageVersion>
2424
<Antlr4RuntimeStandardPackageVersion>4.13.1</Antlr4RuntimeStandardPackageVersion>
25-
<Antlr4BuildTasksPackageVersion>12.11.0</Antlr4BuildTasksPackageVersion>
25+
<Antlr4BuildTasksPackageVersion>12.14.0</Antlr4BuildTasksPackageVersion>
2626
<!-- LUCENENET TODO: When ICU4N is released to production,
2727
be sure to lock down the version range below. The resource
2828
files in Lucene.Net.ICU are not compatible with any other
@@ -38,7 +38,7 @@
3838
<IKVMPackageVersion>8.7.5</IKVMPackageVersion>
3939
<IKVMMavenSdkPackageVersion>1.6.7</IKVMMavenSdkPackageVersion>
4040
<!-- J2N will break binary compatibility in 3.0.0 to fix the APIs of collection types -->
41-
<J2NPackageVersion>[2.2.0-alpha-0026, 3.0.0)</J2NPackageVersion>
41+
<J2NPackageVersion>[2.2.0-alpha-0042, 3.0.0)</J2NPackageVersion>
4242
<LiquidTestReportsMarkdownPackageVersion>1.0.9</LiquidTestReportsMarkdownPackageVersion>
4343
<LuceneNetCodeAnalysisDevPackageVersion>1.0.0-alpha.18</LuceneNetCodeAnalysisDevPackageVersion>
4444
<MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.3.0</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>

.build/psake/private/Test-ModuleVersion.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
should be accepted.
2525
.PARAMETER lessThanVersion
2626
The upper bound of the version that will be accepted. This comparison should
27-
be exlusive. Meaning an input version that is less than only, not equal to
27+
be exclusive. Meaning an input version that is less than only, not equal to
2828
this version, will be accepted.
2929
.INPUTS
3030
A $currentVersion of type [System.Version] or a convertable string.

.build/release.targets

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,6 @@
2020
-->
2121
<Project>
2222

23-
<PropertyGroup Label="Release Audit Tool Settings">
24-
<RatDirectory>$(SolutionDir)lib/apache-rat</RatDirectory>
25-
<RatFile>$(RatDirectory)/apache-rat-0.13.jar</RatFile>
26-
<RatExcludeFile>$(SolutionDir).rat-excludes</RatExcludeFile>
27-
28-
<RatCommand>java</RatCommand>
29-
<RatCommand>$(RatCommand) -jar &quot;$(RatFile)&quot;</RatCommand>
30-
<RatCommand>$(RatCommand) --addLicense</RatCommand>
31-
<RatCommand>$(RatCommand) --force</RatCommand>
32-
<RatCommand>$(RatCommand) --exclude-file &quot;$(RatExcludeFile)&quot;</RatCommand>
33-
<RatCommand>$(RatCommand) --dir &quot;$(SolutionDir.TrimEnd('\'))&quot;</RatCommand>
34-
</PropertyGroup>
35-
36-
<Target Name="AuditRelease" Label="Audits the release using Apache Release Audit Tool" Condition="'$(AssemblyName)' == 'Lucene.Net' ">
37-
<Message Importance="high" Text="Release Audit Executing..."/>
38-
<Exec Command="$(RatCommand)" />
39-
<Message Importance="high" Text="Release Audit Complete"/>
40-
</Target>
41-
4223
<PropertyGroup Label="Apache Subversion Settings">
4324
<SvnDevUrl>https://dist.apache.org/repos/dist/dev/lucenenet/</SvnDevUrl>
4425
<SvnDevDirectory>$(SolutionDir)svn-dev</SvnDevDirectory>

.github/ISSUE_TEMPLATE/10_bug_report.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88
Please keep in mind that the GitHub issue tracker is not intended as a general support forum, but for reporting **non-security** bugs, feature requests, and for general tasks to work on. Since Lucene.NET is mostly a line-by-line port from a **specific version** of Lucene, feature requests should generally be limited to improvements that make Lucene.NET interoperate with .NET better. Bugs that have already been reported and/or fixed in Lucene should generally not be reported again here, as the patch will be carried over to Lucene.NET during the upgrade.
99
1010
If you believe you have an issue that affects the SECURITY of the platform, please do NOT create an issue and instead follow the [ASF vulnerability reporting process](https://apache.org/security/#reporting-a-vulnerability). This is a project of the [Apache Software Foundation](https://apache.org) and follows the ASF [vulnerability handling process](https://apache.org/security/#vulnerability-handling).
11-
11+
1212
For other types of questions, consider using [StackOverflow](https://stackoverflow.com) and applying the tags `lucene.net` AND `lucene` or join the [Lucene.NET user mailing list](https://lucenenet.apache.org/contributing/index.html#ask-a-question).
1313
- type: checkboxes
1414
attributes:
@@ -34,7 +34,7 @@ body:
3434
label: Steps To Reproduce
3535
description: |
3636
We ❤ code! Point us to a minimalistic project which reproduces this issue (repro) hosted in a public GitHub repo or alternatively, fork this repo and add a test that demontstates the issue.
37-
37+
3838
We will close this issue if:
3939
- The repro project does not contain an index or a way to create one. You must provide some basic test data.
4040
- The repro project you share with us is complex. We can't investigate custom projects, so don't point us to such, please.
@@ -46,17 +46,17 @@ body:
4646
attributes:
4747
label: Exceptions (if any)
4848
description: Include the exception you get when facing this issue.
49-
placeholder:
49+
placeholder:
5050
validations:
5151
required: false
5252
- type: input
5353
attributes:
54-
label: Lucene.NET Version
54+
label: Lucene.NET Version
5555
description: |
5656
Please provide the exact version of Lucene.NET you are using. Note that Lucene.NET 3.0.3 and earlier versions are no longer being maintained.
5757
- type: input
5858
attributes:
59-
label: .NET Version
59+
label: .NET Version
6060
description: |
6161
Run `dotnet --version` in .NET Core or provide the version of .NET Framework, MAUI, Xamarin, Unity, UWP, or Mono you are using to run Lucene.NET.
6262
- type: input

0 commit comments

Comments
 (0)