You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mb...@apache.org on 2022/06/09 15:53:12 UTC
[netbeans] branch master updated: upgrade maven-indexer to 6.21 and remove workaround for MINDEXER-157.
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 d5d7b4b8a0 upgrade maven-indexer to 6.21 and remove workaround for MINDEXER-157.
new bd6a7294a9 Merge pull request #4193 from mbien/indexer621
d5d7b4b8a0 is described below
commit d5d7b4b8a0a7bbe95f61326a9568dc4e75be9eb5
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Fri Jun 3 15:18:13 2022 +0200
upgrade maven-indexer to 6.21 and remove workaround for MINDEXER-157.
---
java/maven.indexer/external/binaries-list | 2 +-
...e-6.2.0-license.txt => indexer-core-6.2.1-license.txt} | 2 +-
...ore-6.2.0-notice.txt => indexer-core-6.2.1-notice.txt} | 0
java/maven.indexer/nbproject/project.properties | 2 +-
java/maven.indexer/nbproject/project.xml | 4 ++--
.../modules/maven/indexer/NexusRepositoryIndexerImpl.java | 15 ---------------
6 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/java/maven.indexer/external/binaries-list b/java/maven.indexer/external/binaries-list
index b94b9cd08a..473bee0fc9 100644
--- a/java/maven.indexer/external/binaries-list
+++ b/java/maven.indexer/external/binaries-list
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-DAC8414BE5ED80848526A503A2BE7EDF859825BB org.apache.maven.indexer:indexer-core:6.2.0
+F81F2D9431B345599ABD1E22FC489344B1BE03F1 org.apache.maven.indexer:indexer-core:6.2.1
75DCF930ECE95581AF3F31AF5692E4963FC7AD8E org.apache.lucene:lucene-core:8.11.1
558A389A0D68AA7CC4C26B9128C72D0D269D471F org.apache.lucene:lucene-highlighter:8.11.1
5A44DF2CB26FA1E0E64BE53FE474C7F1D5A3E634 org.apache.lucene:lucene-queryparser:8.11.1
diff --git a/java/maven.indexer/external/indexer-core-6.2.0-license.txt b/java/maven.indexer/external/indexer-core-6.2.1-license.txt
similarity index 99%
rename from java/maven.indexer/external/indexer-core-6.2.0-license.txt
rename to java/maven.indexer/external/indexer-core-6.2.1-license.txt
index 3c7c61e236..0c76dd2ca3 100644
--- a/java/maven.indexer/external/indexer-core-6.2.0-license.txt
+++ b/java/maven.indexer/external/indexer-core-6.2.1-license.txt
@@ -1,6 +1,6 @@
Name: Maven Indexer
Description: Maven remote repository indexing engine.
-Version: 6.2.0
+Version: 6.2.1
Origin: Apache Software Foundation
License: Apache-2.0
URL: https://repo1.maven.org/maven2/org/apache/maven/indexer/
diff --git a/java/maven.indexer/external/indexer-core-6.2.0-notice.txt b/java/maven.indexer/external/indexer-core-6.2.1-notice.txt
similarity index 100%
rename from java/maven.indexer/external/indexer-core-6.2.0-notice.txt
rename to java/maven.indexer/external/indexer-core-6.2.1-notice.txt
diff --git a/java/maven.indexer/nbproject/project.properties b/java/maven.indexer/nbproject/project.properties
index 5d02339f7c..6c42a1dcbc 100644
--- a/java/maven.indexer/nbproject/project.properties
+++ b/java/maven.indexer/nbproject/project.properties
@@ -19,7 +19,7 @@ test.config.stableBTD.includes=**/*Test.class
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-release.external/indexer-core-6.2.0.jar=modules/ext/maven/indexer-core-6.2.0.jar
+release.external/indexer-core-6.2.1.jar=modules/ext/maven/indexer-core-6.2.1.jar
release.external/lucene-core-8.11.1.jar=modules/ext/maven/lucene-core-8.11.1.jar
release.external/lucene-highlighter-8.11.1.jar=modules/ext/maven/lucene-highlighter-8.11.1.jar
release.external/lucene-queryparser-8.11.1.jar=modules/ext/maven/lucene-queryparser-8.11.1.jar
diff --git a/java/maven.indexer/nbproject/project.xml b/java/maven.indexer/nbproject/project.xml
index 41d03c3ad0..4d016d62a8 100644
--- a/java/maven.indexer/nbproject/project.xml
+++ b/java/maven.indexer/nbproject/project.xml
@@ -175,8 +175,8 @@
<package>org.netbeans.modules.maven.indexer.spi.impl</package>
</friend-packages>
<class-path-extension>
- <runtime-relative-path>ext/maven/indexer-core-6.2.0.jar</runtime-relative-path>
- <binary-origin>external/indexer-core-6.2.0.jar</binary-origin>
+ <runtime-relative-path>ext/maven/indexer-core-6.2.1.jar</runtime-relative-path>
+ <binary-origin>external/indexer-core-6.2.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/maven/lucene-core-8.11.1.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 42a9e0df19..4ab573fd62 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
@@ -1688,21 +1688,6 @@ public class NexusRepositoryIndexerImpl implements RepositoryIndexerImplementati
}
private void storeGroupCache(RepositoryInfo repoInfo, IndexingContext ic) throws IOException {
- // MINDEXER-157: After import all groups and root groups are inverted in the IndexingContext
- Set<String> allGroups = ic.getAllGroups();
- Set<String> rootGroups = ic.getRootGroups();
- if(rootGroups.size() > allGroups.size()) {
- // Inversion - allGroups should always have the same size as rootGroups or be larger
- ic.setAllGroups(rootGroups);
- ic.setRootGroups(allGroups);
- } else if (rootGroups.size() == allGroups.size()) {
- // Inversion if any groupId in rootGroups contains a dot (so is not a root id)
- boolean inversion = rootGroups.stream().anyMatch(s -> s.contains("."));
- if (inversion) {
- ic.setAllGroups(rootGroups);
- ic.setRootGroups(allGroups);
- }
- }
Path indexDir = getIndexDirectory(repoInfo).toPath();
Path tempAllCache = Files.createTempFile(indexDir, GROUP_CACHE_ALL_PREFIX, GROUP_CACHE_ALL_SUFFIX);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists