diff --git a/csl.api/nbproject/project.properties b/csl.api/nbproject/project.properties
--- a/csl.api/nbproject/project.properties
+++ b/csl.api/nbproject/project.properties
@@ -40,7 +40,7 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-spec.version.base=2.12.0
+spec.version.base=2.13.0
is.autoload=true
javac.source=1.6
diff --git a/csl.api/nbproject/project.xml b/csl.api/nbproject/project.xml
--- a/csl.api/nbproject/project.xml
+++ b/csl.api/nbproject/project.xml
@@ -37,8 +37,8 @@
- 1
- 2.1
+ 3
+ 3.0
diff --git a/java.hints/nbproject/project.properties b/java.hints/nbproject/project.properties
--- a/java.hints/nbproject/project.properties
+++ b/java.hints/nbproject/project.properties
@@ -40,7 +40,7 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-spec.version.base=1.45.0
+spec.version.base=1.46.0
javac.source=1.6
diff --git a/java.hints/nbproject/project.xml b/java.hints/nbproject/project.xml
--- a/java.hints/nbproject/project.xml
+++ b/java.hints/nbproject/project.xml
@@ -107,8 +107,8 @@
- 1
- 2.9
+ 3
+ 3.0
diff --git a/java.source/nbproject/project.properties b/java.source/nbproject/project.properties
--- a/java.source/nbproject/project.properties
+++ b/java.source/nbproject/project.properties
@@ -46,7 +46,7 @@
javadoc.title=Java Source
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=0.74.0
+spec.version.base=0.75.0
test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/javac-api-nb-7.0-b07.jar
test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\
${o.n.core.dir}/lib/boot.jar:\
diff --git a/java.source/nbproject/project.xml b/java.source/nbproject/project.xml
--- a/java.source/nbproject/project.xml
+++ b/java.source/nbproject/project.xml
@@ -106,8 +106,8 @@
- 1
- 2.12
+ 3
+ 3.0
diff --git a/java.sourceui/nbproject/project.properties b/java.sourceui/nbproject/project.properties
--- a/java.sourceui/nbproject/project.properties
+++ b/java.sourceui/nbproject/project.properties
@@ -2,4 +2,4 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.17.0
+spec.version.base=1.18.0
diff --git a/java.sourceui/nbproject/project.xml b/java.sourceui/nbproject/project.xml
--- a/java.sourceui/nbproject/project.xml
+++ b/java.sourceui/nbproject/project.xml
@@ -45,8 +45,8 @@
- 1
- 2.12
+ 3
+ 3.0
diff --git a/libs.lucene/external/binaries-list b/libs.lucene/external/binaries-list
--- a/libs.lucene/external/binaries-list
+++ b/libs.lucene/external/binaries-list
@@ -1,1 +1,1 @@
-284963A064E39FA33ECBA8E57CC5581067CD81D1 lucene-core-2.9.3.jar
+335F7EA0E28A4A1358AA745F4BD2037E8AFE44FC lucene-core-3.0.3.jar
diff --git a/libs.lucene/external/lucene-core-2.9.3-license.txt b/libs.lucene/external/lucene-core-3.0.3-license.txt
rename from libs.lucene/external/lucene-core-2.9.3-license.txt
rename to libs.lucene/external/lucene-core-3.0.3-license.txt
--- a/libs.lucene/external/lucene-core-2.9.3-license.txt
+++ b/libs.lucene/external/lucene-core-3.0.3-license.txt
@@ -1,9 +1,9 @@
Name: Apache Lucene
-Version: 2.4.1
+Version: 3.0.3
Description: Java-based indexing and search technology
License: Apache-2.0
Origin: http://lucene.apache.org/
-Files: lucene-core-2.9.3.jar
+Files: lucene-core-3.0.3.jar
Source: http://svn.apache.org/repos/asf/lucene/java/trunk
OSR: 6381
diff --git a/libs.lucene/manifest.mf b/libs.lucene/manifest.mf
--- a/libs.lucene/manifest.mf
+++ b/libs.lucene/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
-OpenIDE-Module: org.netbeans.libs.lucene/1
+OpenIDE-Module: org.netbeans.libs.lucene/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/lucene/Bundle.properties
-OpenIDE-Module-Implementation-Version: 232
+OpenIDE-Module-Specification-Version: 3.0
diff --git a/libs.lucene/nbproject/project.properties b/libs.lucene/nbproject/project.properties
--- a/libs.lucene/nbproject/project.properties
+++ b/libs.lucene/nbproject/project.properties
@@ -41,5 +41,5 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/lucene-core-2.9.3.jar=modules/ext/lucene-core-2.9.3.jar
-spec.version.base=2.13.0
+release.external/lucene-core-3.0.3.jar=modules/ext/lucene-core-3.0.3.jar
+
diff --git a/libs.lucene/nbproject/project.xml b/libs.lucene/nbproject/project.xml
--- a/libs.lucene/nbproject/project.xml
+++ b/libs.lucene/nbproject/project.xml
@@ -53,8 +53,8 @@
org
- ext/lucene-core-2.9.3.jar
- external/lucene-core-2.9.3.jar
+ ext/lucene-core-3.0.3.jar
+ external/lucene-core-3.0.3.jar
diff --git a/maven.embedder/manifest.mf b/maven.embedder/manifest.mf
--- a/maven.embedder/manifest.mf
+++ b/maven.embedder/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.maven.embedder/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/embedder/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.4
+OpenIDE-Module-Specification-Version: 2.5
diff --git a/maven.embedder/nbproject/project.xml b/maven.embedder/nbproject/project.xml
--- a/maven.embedder/nbproject/project.xml
+++ b/maven.embedder/nbproject/project.xml
@@ -217,6 +217,8 @@
org.sonatype.aether.transfer
org.sonatype.aether.util
org.sonatype.aether.util.repository
+ org.sonatype.aether.util.version
+ org.sonatype.aether.version
ext/maven/maven-dependency-tree-1.2.jar
diff --git a/maven.hints/manifest.mf b/maven.hints/manifest.mf
--- a/maven.hints/manifest.mf
+++ b/maven.hints/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven.hints/1
-OpenIDE-Module-Specification-Version: 1.11
+OpenIDE-Module-Specification-Version: 1.12
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/hints/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/maven/hints/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/maven.hints/nbproject/project.xml b/maven.hints/nbproject/project.xml
--- a/maven.hints/nbproject/project.xml
+++ b/maven.hints/nbproject/project.xml
@@ -62,8 +62,8 @@
- 1
- 2.13
+ 3
+ 3.0
diff --git a/maven.indexer/external/binaries-list b/maven.indexer/external/binaries-list
--- a/maven.indexer/external/binaries-list
+++ b/maven.indexer/external/binaries-list
@@ -1,2 +1,2 @@
-7AB67E6B20E5332A7FB4FDF2F019AEC4275846C2 indexer-core-3.1.0.jar
-30DCFB82558DC5452AC135F267401E214A0E9859 indexer-artifact-3.1.0.jar
+3AF24D401F76D153B77641865737DE53E41E60D6 indexer-artifact-4.0.0.jar
+39E868B62080080DC349253E6050DF4B6ABAAE60 indexer-core-4.0.0.jar
diff --git a/maven.indexer/external/maven-indexer-3.1.0-license.txt b/maven.indexer/external/maven-indexer-4.0.0-license.txt
rename from maven.indexer/external/maven-indexer-3.1.0-license.txt
rename to maven.indexer/external/maven-indexer-4.0.0-license.txt
--- a/maven.indexer/external/maven-indexer-3.1.0-license.txt
+++ b/maven.indexer/external/maven-indexer-4.0.0-license.txt
@@ -1,9 +1,9 @@
Name: Maven Indexer
-Version: 3.1.0
+Version: 4.0.0
Description: Maven remote repository indexing engine.
License: Apache-2.0
Origin: http://repo1.maven.org/maven2/org/apache/maven/indexer/
-Files: indexer-core-3.1.0.jar indexer-artifact-3.1.0.jar
+Files: indexer-core-4.0.0.jar indexer-artifact-4.0.0.jar
OSR: 9451
Apache License
diff --git a/maven.indexer/manifest.mf b/maven.indexer/manifest.mf
--- a/maven.indexer/manifest.mf
+++ b/maven.indexer/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module-Install: org/netbeans/modules/maven/indexer/Installer.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/indexer/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
OpenIDE-Module: org.netbeans.modules.maven.indexer/1
OpenIDE-Module-Layer: org/netbeans/modules/maven/indexer/layer.xml
diff --git a/maven.indexer/nbproject/project.properties b/maven.indexer/nbproject/project.properties
--- a/maven.indexer/nbproject/project.properties
+++ b/maven.indexer/nbproject/project.properties
@@ -41,5 +41,6 @@
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-release.external/indexer-core-3.1.0.jar=modules/ext/maven/indexer-core-3.1.0.jar
-release.external/indexer-artifact-3.1.0.jar=modules/ext/maven/indexer-artifact-3.1.0.jar
+release.external/indexer-core-4.0.0.jar=modules/ext/maven/indexer-core-4.0.0.jar
+release.external/indexer-artifact-4.0.0.jar=modules/ext/maven/indexer-artifact-4.0.0.jar
+
diff --git a/maven.indexer/nbproject/project.xml b/maven.indexer/nbproject/project.xml
--- a/maven.indexer/nbproject/project.xml
+++ b/maven.indexer/nbproject/project.xml
@@ -81,8 +81,8 @@
- 1
- 2.4
+ 3
+ 3.0
@@ -181,12 +181,12 @@
org.netbeans.modules.maven.indexer.spi.ui
- ext/maven/indexer-core-3.1.0.jar
- external/indexer-core-3.1.0.jar
+ ext/maven/indexer-core-4.0.0.jar
+ external/indexer-core-4.0.0.jar
- ext/maven/indexer-artifact-3.1.0.jar
- external/indexer-artifact-3.1.0.jar
+ ext/maven/indexer-artifact-4.0.0.jar
+ external/indexer-artifact-4.0.0.jar
diff --git a/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java b/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
--- a/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
+++ b/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
@@ -42,6 +42,7 @@
package org.netbeans.modules.maven.indexer;
import java.io.FileNotFoundException;
+import org.apache.maven.index.expr.StringSearchExpression;
import org.codehaus.plexus.util.FileUtils;
import java.util.Map;
import org.apache.lucene.document.Document;
@@ -98,6 +99,7 @@
import org.apache.maven.index.GroupedSearchRequest;
import org.apache.maven.index.GroupedSearchResponse;
import org.apache.maven.index.IndexerFieldVersion;
+import org.apache.maven.index.MAVEN;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.creator.AbstractIndexCreator;
@@ -883,7 +885,8 @@
public @Override Void run() throws Exception {
loadIndexingContext(repo);
String clsname = className.replace(".", "/");
- FlatSearchRequest fsr = new FlatSearchRequest(setBooleanRewrite(indexer.constructQuery(ArtifactInfo.NAMES, clsname.toLowerCase())),
+ FlatSearchRequest fsr = new FlatSearchRequest(setBooleanRewrite(
+ indexer.constructQuery(MAVEN.CLASSNAMES, new StringSearchExpression(clsname.toLowerCase()))),
ArtifactInfo.VERSION_COMPARATOR);
fsr.setAiCount(MAX_RESULT_COUNT);
FlatSearchResponse response = repeatedFlatSearch(fsr, getContexts(new RepositoryInfo[]{repo}), false);
@@ -941,7 +944,7 @@
public @Override Void run() throws Exception {
loadIndexingContext(repo);
BooleanQuery bq = new BooleanQuery();
- bq.add(new BooleanClause((setBooleanRewrite(indexer.constructQuery(ArtifactInfo.SHA1, sha1))), BooleanClause.Occur.SHOULD));
+ bq.add(new BooleanClause((setBooleanRewrite(indexer.constructQuery(MAVEN.SHA1, new StringSearchExpression(sha1)))), BooleanClause.Occur.SHOULD));
FlatSearchRequest fsr = new FlatSearchRequest(bq, ArtifactInfo.VERSION_COMPARATOR);
fsr.setAiCount(MAX_RESULT_COUNT);
FlatSearchResponse response = repeatedFlatSearch(fsr, getContexts(new RepositoryInfo[]{repo}), false);
@@ -1101,9 +1104,9 @@
Query q;
if (ArtifactInfo.NAMES.equals(fieldName)) {
String clsname = field.getValue().replace(".", "/"); //NOI18N
- q = indexer.constructQuery(ArtifactInfo.NAMES, clsname.toLowerCase());
+ q = indexer.constructQuery(MAVEN.CLASSNAMES, new StringSearchExpression(clsname.toLowerCase()));
} else if (ArtifactInfo.ARTIFACT_ID.equals(fieldName)) {
- q = indexer.constructQuery(fieldName, field.getValue());
+ q = indexer.constructQuery(MAVEN.ARTIFACT_ID, new StringSearchExpression(field.getValue()));
} else {
if (field.getMatch() == QueryField.MATCH_EXACT) {
q = new TermQuery(new Term(fieldName, field.getValue()));
diff --git a/maven.repository/manifest.mf b/maven.repository/manifest.mf
--- a/maven.repository/manifest.mf
+++ b/maven.repository/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/maven/repository/layer.xml
OpenIDE-Module-Public-Packages: -
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-Specification-Version: 1.11
diff --git a/maven.repository/nbproject/project.xml b/maven.repository/nbproject/project.xml
--- a/maven.repository/nbproject/project.xml
+++ b/maven.repository/nbproject/project.xml
@@ -72,8 +72,8 @@
- 1
- 2.5
+ 3
+ 3.0
diff --git a/maven.search/manifest.mf b/maven.search/manifest.mf
--- a/maven.search/manifest.mf
+++ b/maven.search/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.maven.search
OpenIDE-Module-Layer: org/netbeans/modules/maven/search/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/search/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
diff --git a/maven.search/nbproject/project.xml b/maven.search/nbproject/project.xml
--- a/maven.search/nbproject/project.xml
+++ b/maven.search/nbproject/project.xml
@@ -54,8 +54,8 @@
- 1
- 2.5
+ 3
+ 3.0
diff --git a/maven/manifest.mf b/maven/manifest.mf
--- a/maven/manifest.mf
+++ b/maven/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven/2
-OpenIDE-Module-Specification-Version: 2.5
+OpenIDE-Module-Specification-Version: 2.6
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/maven/nbproject/project.xml b/maven/nbproject/project.xml
--- a/maven/nbproject/project.xml
+++ b/maven/nbproject/project.xml
@@ -116,8 +116,8 @@
- 1
- 2.5
+ 3
+ 3.0
diff --git a/parsing.api/nbproject/project.properties b/parsing.api/nbproject/project.properties
--- a/parsing.api/nbproject/project.properties
+++ b/parsing.api/nbproject/project.properties
@@ -2,4 +2,4 @@
javac.source=1.6
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.37.0
+spec.version.base=1.38.0
diff --git a/parsing.api/nbproject/project.xml b/parsing.api/nbproject/project.xml
--- a/parsing.api/nbproject/project.xml
+++ b/parsing.api/nbproject/project.xml
@@ -37,8 +37,8 @@
- 1
- 2.6
+ 3
+ 3.0
diff --git a/parsing.lucene/manifest.mf b/parsing.lucene/manifest.mf
--- a/parsing.lucene/manifest.mf
+++ b/parsing.lucene/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.parsing.lucene
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/parsing/lucene/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.2
+OpenIDE-Module-Specification-Version: 1.3
diff --git a/parsing.lucene/nbproject/project.xml b/parsing.lucene/nbproject/project.xml
--- a/parsing.lucene/nbproject/project.xml
+++ b/parsing.lucene/nbproject/project.xml
@@ -19,8 +19,8 @@
- 1
- 2.13
+ 3
+ 3.0