This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 87bc133e22 Update to maven-indexer 7.1.1 and lucene 9.9.1.
new fe2aef2e44 Merge pull request #6791 from mbien/lucene-990
87bc133e22 is described below
commit 87bc133e22955559f0b2312ff24548973d7cdcf6
Author: Michael Bien <[email protected]>
AuthorDate: Mon Dec 4 18:10:17 2023 +0100
Update to maven-indexer 7.1.1 and lucene 9.9.1.
- some classes moved in maven-indexer
- lucene is a regular update release
---
java/maven.indexer/external/binaries-list | 16 +++++------
...-license.txt => indexer-core-7.1.1-license.txt} | 4 +--
....3-notice.txt => indexer-core-7.1.1-notice.txt} | 0
...-9.8.0-license.txt => lucene-9.9.1-license.txt} | 4 +--
...ne-9.8.0-notice.txt => lucene-9.9.1-notice.txt} | 0
java/maven.indexer/nbproject/project.properties | 16 +++++------
java/maven.indexer/nbproject/project.xml | 32 +++++++++++-----------
.../maven/indexer/NexusRepositoryIndexerImpl.java | 14 +++++-----
.../modules/maven/indexer/SMORequestResult.java | 4 +--
nbbuild/binaries-default-properties.xml | 1 +
10 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/java/maven.indexer/external/binaries-list
b/java/maven.indexer/external/binaries-list
index 52f19b5d24..e7f1a54257 100644
--- a/java/maven.indexer/external/binaries-list
+++ b/java/maven.indexer/external/binaries-list
@@ -14,13 +14,13 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-0310415BFCC3D79B2FE62C2E51EF5F5DB086DD28
org.apache.maven.indexer:indexer-core:7.0.4
-CA5DEB6CF9BDB8DDCE3D847802B4241B16D7DA74
org.apache.maven.indexer:search-api:7.0.4
-72B65D6335E7F7253DEADBC413C17468D7259892
org.apache.maven.indexer:search-backend-smo:7.0.4
-5E8421C5F8573BCF22E9265FC7E19469545A775A org.apache.lucene:lucene-core:9.8.0
-E98FB408028F40170E6D87C16422BFDC0BB2E392
org.apache.lucene:lucene-backward-codecs:9.8.0
-1AC38C8278DBD63DFAB30744A41DD955A415A31C
org.apache.lucene:lucene-highlighter:9.8.0
-982FAF2BFA55542BF57FBADEF54C19AC00F57CAE
org.apache.lucene:lucene-queryparser:9.8.0
-36F0363325CA7BF62C180160D1ED5165C7C37795
org.apache.lucene:lucene-analysis-common:9.8.0
+9150F7B563D76DA29235F87BD3A9D54333163C2C
org.apache.maven.indexer:indexer-core:7.1.1
+119A1D5D0052556CD4E99F796D74351640768A7F
org.apache.maven.indexer:search-api:7.1.1
+AB2415BE41372685BA004326585843433354F513
org.apache.maven.indexer:search-backend-smo:7.1.1
+55249FA9A0ED321ADCF8283C6F3B649A6812B0A9 org.apache.lucene:lucene-core:9.9.1
+11C46007366BB037BE7D271AB0A5849B1D544662
org.apache.lucene:lucene-backward-codecs:9.9.1
+30928513461BF79A5CB057E84DA7D34A1E53227D
org.apache.lucene:lucene-highlighter:9.9.1
+12D844FE224F6F97C510AC20D68903ED7F626F6C
org.apache.lucene:lucene-queryparser:9.9.1
+24C8401B530308F9568EB7B408C2029C63F564C6
org.apache.lucene:lucene-analysis-common:9.9.1
479C1E06DB31C432330183F5CAE684163F186146
javax.annotation:javax.annotation-api:1.2
B3ADD478D4382B78EA20B1671390A858002FEB6C com.google.code.gson:gson:2.10.1
diff --git a/java/maven.indexer/external/indexer-core-7.0.4-license.txt
b/java/maven.indexer/external/indexer-core-7.1.1-license.txt
similarity index 99%
rename from java/maven.indexer/external/indexer-core-7.0.4-license.txt
rename to java/maven.indexer/external/indexer-core-7.1.1-license.txt
index 8f126df20f..a8a4ee9370 100644
--- a/java/maven.indexer/external/indexer-core-7.0.4-license.txt
+++ b/java/maven.indexer/external/indexer-core-7.1.1-license.txt
@@ -1,11 +1,11 @@
Name: Maven Indexer
Description: Maven remote repository indexing engine.
-Version: 7.0.4
+Version: 7.1.1
Origin: Apache Software Foundation
License: Apache-2.0
URL: https://repo.maven.apache.org/maven2/org/apache/maven/indexer/
Source: https://github.com/apache/maven-indexer
-Files: indexer-core-7.0.4.jar search-api-7.0.4.jar search-backend-smo-7.0.4.jar
+Files: indexer-core-7.1.1.jar search-api-7.1.1.jar search-backend-smo-7.1.1.jar
Apache License
Version 2.0, January 2004
diff --git a/java/maven.indexer/external/indexer-core-7.0.3-notice.txt
b/java/maven.indexer/external/indexer-core-7.1.1-notice.txt
similarity index 100%
rename from java/maven.indexer/external/indexer-core-7.0.3-notice.txt
rename to java/maven.indexer/external/indexer-core-7.1.1-notice.txt
diff --git a/java/maven.indexer/external/lucene-9.8.0-license.txt
b/java/maven.indexer/external/lucene-9.9.1-license.txt
similarity index 98%
rename from java/maven.indexer/external/lucene-9.8.0-license.txt
rename to java/maven.indexer/external/lucene-9.9.1-license.txt
index 5dc379e707..15188c7db2 100644
--- a/java/maven.indexer/external/lucene-9.8.0-license.txt
+++ b/java/maven.indexer/external/lucene-9.9.1-license.txt
@@ -1,11 +1,11 @@
Name: Apache Lucene
Description: Java-based indexing and search technology
-Version: 9.8.0
+Version: 9.9.1
Origin: Apache Software Foundation
License: Apache-2.0
URL: https://lucene.apache.org/
Source: https://github.com/apache/lucene
-Files: lucene-analysis-common-9.8.0.jar lucene-backward-codecs-9.8.0.jar
lucene-core-9.8.0.jar lucene-highlighter-9.8.0.jar lucene-queryparser-9.8.0.jar
+Files: lucene-analysis-common-9.9.1.jar lucene-backward-codecs-9.9.1.jar
lucene-core-9.9.1.jar lucene-highlighter-9.9.1.jar lucene-queryparser-9.9.1.jar
Apache License
Version 2.0, January 2004
diff --git a/java/maven.indexer/external/lucene-9.8.0-notice.txt
b/java/maven.indexer/external/lucene-9.9.1-notice.txt
similarity index 100%
rename from java/maven.indexer/external/lucene-9.8.0-notice.txt
rename to java/maven.indexer/external/lucene-9.9.1-notice.txt
diff --git a/java/maven.indexer/nbproject/project.properties
b/java/maven.indexer/nbproject/project.properties
index 80c4793623..2448c06e67 100644
--- a/java/maven.indexer/nbproject/project.properties
+++ b/java/maven.indexer/nbproject/project.properties
@@ -20,15 +20,15 @@ is.autoload=true
javac.source=11
javac.target=11
javac.compilerargs=-Xlint -Xlint:-serial
-release.external/indexer-core-7.0.4.jar=modules/ext/maven/indexer-core-7.0.4.jar
-release.external/search-api-7.0.4.jar=modules/ext/maven/search-api-7.0.4.jar
-release.external/search-backend-smo-7.0.4.jar=modules/ext/maven/search-backend-smo-7.0.4.jar
+release.external/indexer-core-7.1.1.jar=modules/ext/maven/indexer-core-7.1.1.jar
+release.external/search-api-7.1.1.jar=modules/ext/maven/search-api-7.1.1.jar
+release.external/search-backend-smo-7.1.1.jar=modules/ext/maven/search-backend-smo-7.1.1.jar
release.external/gson-2.10.1.jar=modules/ext/maven/gson-2.10.1.jar
-release.external/lucene-core-9.8.0.jar=modules/ext/maven/lucene-core-9.8.0.jar
-release.external/lucene-backward-codecs-9.8.0.jar=modules/ext/maven/lucene-backward-codecs-9.8.0.jar
-release.external/lucene-highlighter-9.8.0.jar=modules/ext/maven/lucene-highlighter-9.8.0.jar
-release.external/lucene-queryparser-9.8.0.jar=modules/ext/maven/lucene-queryparser-9.8.0.jar
-release.external/lucene-analysis-common-9.8.0.jar=modules/ext/maven/lucene-analysis-common-9.8.0.jar
+release.external/lucene-core-9.9.1.jar=modules/ext/maven/lucene-core-9.9.1.jar
+release.external/lucene-backward-codecs-9.9.1.jar=modules/ext/maven/lucene-backward-codecs-9.9.1.jar
+release.external/lucene-highlighter-9.9.1.jar=modules/ext/maven/lucene-highlighter-9.9.1.jar
+release.external/lucene-queryparser-9.9.1.jar=modules/ext/maven/lucene-queryparser-9.9.1.jar
+release.external/lucene-analysis-common-9.9.1.jar=modules/ext/maven/lucene-analysis-common-9.9.1.jar
release.external/javax.annotation-api-1.2.jar=modules/ext/maven/javax.annotation-api-1.2.jar
# XXX so long as Lucene is bundled here:
sigtest.gen.fail.on.error=false
diff --git a/java/maven.indexer/nbproject/project.xml
b/java/maven.indexer/nbproject/project.xml
index 9284a9c3f6..48fbeab9d9 100644
--- a/java/maven.indexer/nbproject/project.xml
+++ b/java/maven.indexer/nbproject/project.xml
@@ -176,36 +176,36 @@
<package>org.netbeans.modules.maven.indexer.spi.impl</package>
</friend-packages>
<class-path-extension>
-
<runtime-relative-path>ext/maven/indexer-core-7.0.4.jar</runtime-relative-path>
- <binary-origin>external/indexer-core-7.0.4.jar</binary-origin>
+
<runtime-relative-path>ext/maven/indexer-core-7.1.1.jar</runtime-relative-path>
+ <binary-origin>external/indexer-core-7.1.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/maven/search-api-7.0.4.jar</runtime-relative-path>
- <binary-origin>external/search-api-7.0.4.jar</binary-origin>
+
<runtime-relative-path>ext/maven/search-api-7.1.1.jar</runtime-relative-path>
+ <binary-origin>external/search-api-7.1.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/maven/search-backend-smo-7.0.4.jar</runtime-relative-path>
-
<binary-origin>external/search-backend-smo-7.0.4.jar</binary-origin>
+
<runtime-relative-path>ext/maven/search-backend-smo-7.1.1.jar</runtime-relative-path>
+
<binary-origin>external/search-backend-smo-7.1.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/maven/lucene-core-9.8.0.jar</runtime-relative-path>
- <binary-origin>external/lucene-core-9.8.0.jar</binary-origin>
+
<runtime-relative-path>ext/maven/lucene-core-9.9.1.jar</runtime-relative-path>
+ <binary-origin>external/lucene-core-9.9.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/maven/lucene-backward-codecs-9.8.0.jar</runtime-relative-path>
-
<binary-origin>external/lucene-backward-codecs-9.8.0.jar</binary-origin>
+
<runtime-relative-path>ext/maven/lucene-backward-codecs-9.9.1.jar</runtime-relative-path>
+
<binary-origin>external/lucene-backward-codecs-9.9.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/maven/lucene-highlighter-9.8.0.jar</runtime-relative-path>
-
<binary-origin>external/lucene-highlighter-9.8.0.jar</binary-origin>
+
<runtime-relative-path>ext/maven/lucene-highlighter-9.9.1.jar</runtime-relative-path>
+
<binary-origin>external/lucene-highlighter-9.9.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/maven/lucene-queryparser-9.8.0.jar</runtime-relative-path>
-
<binary-origin>external/lucene-queryparser-9.8.0.jar</binary-origin>
+
<runtime-relative-path>ext/maven/lucene-queryparser-9.9.1.jar</runtime-relative-path>
+
<binary-origin>external/lucene-queryparser-9.9.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
-
<runtime-relative-path>ext/maven/lucene-analysis-common-9.8.0.jar</runtime-relative-path>
-
<binary-origin>external/lucene-analysis-common-9.8.0.jar</binary-origin>
+
<runtime-relative-path>ext/maven/lucene-analysis-common-9.9.1.jar</runtime-relative-path>
+
<binary-origin>external/lucene-analysis-common-9.9.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/javax.annotation-api-1.2.jar</runtime-relative-path>
diff --git
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
index b62b68c6ef..4bf573797f 100644
---
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
+++
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
@@ -72,11 +72,11 @@ import org.apache.maven.index.updater.IndexUpdateRequest;
import org.apache.maven.index.updater.IndexUpdateResult;
import org.apache.maven.index.updater.IndexUpdater;
import org.apache.maven.index.updater.ResourceFetcher;
-import org.apache.maven.search.SearchRequest;
+import org.apache.maven.search.api.SearchRequest;
+import org.apache.maven.search.api.request.FieldQuery;
+import org.apache.maven.search.api.request.Paging;
import org.apache.maven.search.backend.smo.SmoSearchBackend;
import org.apache.maven.search.backend.smo.SmoSearchBackendFactory;
-import org.apache.maven.search.request.FieldQuery;
-import org.apache.maven.search.request.Paging;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
@@ -183,7 +183,7 @@ public class NexusRepositoryIndexerImpl implements
RepositoryIndexerImplementati
*/
private static final RequestProcessor RP_REMOTE = new
RequestProcessor("maven-remote-indexing");
- private final SmoSearchBackend smo = new
SmoSearchBackendFactory().createDefault();
+ private final SmoSearchBackend smo =
SmoSearchBackendFactory.createDefault();
@Override
public boolean handlesRepository(RepositoryInfo repo) {
@@ -1224,8 +1224,8 @@ public class NexusRepositoryIndexerImpl implements
RepositoryIndexerImplementati
SearchRequest request = new SearchRequest(new Paging(128),
FieldQuery.fieldQuery(className.contains(".") ?
- org.apache.maven.search.MAVEN.FQ_CLASS_NAME
- : org.apache.maven.search.MAVEN.CLASS_NAME,
className));
+ org.apache.maven.search.api.MAVEN.FQ_CLASS_NAME
+ : org.apache.maven.search.api.MAVEN.CLASS_NAME,
className));
return new CompositeResult<>(findVersionsByClass(className,
otherRepos), new SMORequestResult(smo, request));
} else {
@@ -1392,7 +1392,7 @@ public class NexusRepositoryIndexerImpl implements
RepositoryIndexerImplementati
otherRepos.remove(central.get());
SearchRequest request = new SearchRequest(new Paging(8),
- FieldQuery.fieldQuery(org.apache.maven.search.MAVEN.SHA1,
sha1));
+
FieldQuery.fieldQuery(org.apache.maven.search.api.MAVEN.SHA1, sha1));
return new CompositeResult<>(findBySHA1(sha1, otherRepos), new
SMORequestResult(smo, request));
} else {
diff --git
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/SMORequestResult.java
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/SMORequestResult.java
index 330422bdd2..b84c7f5c82 100644
---
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/SMORequestResult.java
+++
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/SMORequestResult.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
-import org.apache.maven.search.MAVEN;
-import org.apache.maven.search.SearchRequest;
+import org.apache.maven.search.api.MAVEN;
+import org.apache.maven.search.api.SearchRequest;
import org.apache.maven.search.backend.smo.SmoSearchBackend;
import org.apache.maven.search.backend.smo.SmoSearchResponse;
import org.netbeans.modules.maven.indexer.api.NBVersionInfo;
diff --git a/nbbuild/binaries-default-properties.xml
b/nbbuild/binaries-default-properties.xml
index 6d87347ec1..c4b70a861f 100644
--- a/nbbuild/binaries-default-properties.xml
+++ b/nbbuild/binaries-default-properties.xml
@@ -22,5 +22,6 @@
<project name="binaries-default-properties" default="netbeans" basedir=".">
<property name="binaries.cache" location="${user.home}/.hgexternalcache"/>
<property name="binaries.server"
value="https://netbeans.osuosl.org/binaries/"/>
+ <!-- space separated list; add temp staging repos here when testing -->
<property name="binaries.repos"
value="https://repo.maven.apache.org/maven2/"/>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
