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/05/08 21:49:07 UTC
[netbeans] branch master updated: upgrade maven-indexer to 6.2.0 and remove workaround.
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 71ddacce9c upgrade maven-indexer to 6.2.0 and remove workaround.
new 2bfc726a5e Merge pull request #4077 from mbien/indexer620
71ddacce9c is described below
commit 71ddacce9ce5ab3e9189f5c1c0f6c187a5f7a332
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Thu Apr 28 01:11:26 2022 +0200
upgrade maven-indexer to 6.2.0 and remove workaround.
- reverts 9adf9baacebb0fc25277ff7a8b34a46c0d7ff8a2
---
java/maven.indexer/external/binaries-list | 2 +-
...-core-6.1.1-license.txt => indexer-core-6.2.0-license.txt} | 2 +-
...er-core-6.1.1-notice.txt => indexer-core-6.2.0-notice.txt} | 0
java/maven.indexer/nbproject/project.properties | 2 +-
java/maven.indexer/nbproject/project.xml | 4 ++--
.../modules/maven/indexer/CustomArtifactContextProducer.java | 11 -----------
6 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/java/maven.indexer/external/binaries-list b/java/maven.indexer/external/binaries-list
index a85c168251..b94b9cd08a 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.
-F85DA5C198F2E00086A29EFA47896ED6B41807B2 org.apache.maven.indexer:indexer-core:6.1.1
+DAC8414BE5ED80848526A503A2BE7EDF859825BB org.apache.maven.indexer:indexer-core:6.2.0
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.1.1-license.txt b/java/maven.indexer/external/indexer-core-6.2.0-license.txt
similarity index 99%
rename from java/maven.indexer/external/indexer-core-6.1.1-license.txt
rename to java/maven.indexer/external/indexer-core-6.2.0-license.txt
index 9f725994bf..3c7c61e236 100644
--- a/java/maven.indexer/external/indexer-core-6.1.1-license.txt
+++ b/java/maven.indexer/external/indexer-core-6.2.0-license.txt
@@ -1,6 +1,6 @@
Name: Maven Indexer
Description: Maven remote repository indexing engine.
-Version: 6.1.1
+Version: 6.2.0
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.1.1-notice.txt b/java/maven.indexer/external/indexer-core-6.2.0-notice.txt
similarity index 100%
rename from java/maven.indexer/external/indexer-core-6.1.1-notice.txt
rename to java/maven.indexer/external/indexer-core-6.2.0-notice.txt
diff --git a/java/maven.indexer/nbproject/project.properties b/java/maven.indexer/nbproject/project.properties
index ec48dae76c..5d02339f7c 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.1.1.jar=modules/ext/maven/indexer-core-6.1.1.jar
+release.external/indexer-core-6.2.0.jar=modules/ext/maven/indexer-core-6.2.0.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 03d7cd3036..41d03c3ad0 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.1.1.jar</runtime-relative-path>
- <binary-origin>external/indexer-core-6.1.1.jar</binary-origin>
+ <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>
</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/CustomArtifactContextProducer.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CustomArtifactContextProducer.java
index 122f3e39f4..9f2a179ea5 100644
--- a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CustomArtifactContextProducer.java
+++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CustomArtifactContextProducer.java
@@ -26,7 +26,6 @@ import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.ArtifactInfoRecord;
import org.apache.maven.index.DefaultArtifactContextProducer;
import org.apache.maven.index.artifact.ArtifactPackagingMapper;
-import org.apache.maven.index.artifact.Gav;
import org.apache.maven.index.context.IndexingContext;
/** Adapted from org.netbeans:nexus-for-netbeans. */
@@ -37,16 +36,6 @@ public final class CustomArtifactContextProducer extends DefaultArtifactContextP
super(mapper);
}
- @Override
- protected Gav getGavFromPath(IndexingContext context, String repositoryPath, String artifactPath) {
- // filter out maven-metadata[-repo_name].xml to avoid IndexOutOfBoundsExceptions in
- // org.apache.maven.index.artifact.M2GavCalculator.getSnapshotGav(M2GavCalculator.java:187)
- if (artifactPath.endsWith(".xml") && artifactPath.substring(artifactPath.lastIndexOf("/")+1).startsWith("maven-metadata")) {
- return null;
- }
- return super.getGavFromPath(context, repositoryPath, artifactPath);
- }
-
@Override public ArtifactContext getArtifactContext(IndexingContext context, File file) {
ArtifactContext ac = super.getArtifactContext(context, file);
if (ac != null) {
---------------------------------------------------------------------
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