[NETBEANS-844] Use released version of maven-indexer 6.0.0

The patches, that were applied to the snapshot of the 6.0.0 branch,
seem to be have been integrated into the released version 6.0.0 of
maven indexer.

The lucene dependency of maven-indexer was moved to 5.5.5 in the 6.0.0
release, so the dependencies are also adjusted here.

The changeset was tested by running the unittests and multiple
reindex runs on the local m2 repository of the author. In addition parts
of the patch were manually checked against the released version and
found to be applied.

maven.indexer/build.xml

@@ -23,22 +23,4 @@
 <project basedir="." default="build" name="maven.indexer">
     <description>Builds, tests, and runs the project org.netbeans.modules.maven.indexer2</description>
     <import file="../nbbuild/templates/projectized.xml"/>
-
-    <condition property="indexer.file.notfound">
-        <not>
-            <!-- make sure notice-patched is added to indexer-core only once -->
-            <available file="external/indexer-core-6.0-SNAPSHOT-patched.jar"/>
-        </not>
-    </condition>    
-
-    <target name="maven-indexer-notice" depends="projectized-common.-release.files" if="indexer.file.notfound">
-        <jar destfile="external/indexer-core-6.0-SNAPSHOT-patched.jar" update="true">            
-            <mappedresources>
-                <fileset file="external/NOTICE-patched-indexer-core-5.1.1"/>
-                <globmapper from="NOTICE-patched-indexer-core-6.0-SNAPSHOT" to="META-INF/NOTICE-patched"/>
-            </mappedresources>
-        </jar>
-    </target>    
-
-    <target name="netbeans-extra" depends="maven-indexer-notice"/>
 </project>

maven.indexer/external/binaries-list

@@ -14,9 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-627EC612B8D50EE42C2D0F13DF5476E26D696634 indexer-core-6.0-SNAPSHOT-patched.jar
-20540C6347259F35A0D264605B22CE2A13917066 org.apache.lucene:lucene-core:5.5.3
-D276E74D57C64ED5F9A09A48DA05B75555E8709A org.apache.lucene:lucene-highlighter:5.5.3
-E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53 org.apache.lucene:lucene-queryparser:5.5.3
-CF734AB72813AF33DC1544CE61ABC5C17B9D35E9 org.apache.lucene:lucene-analyzers-common:5.5.3
+677D6A3009E8619D39E3F8BDB39352DD7CA7D155 org.apache.maven.indexer:indexer-core:6.0.0
+C34BCD9274859DC07CFED2A935AACA90C4F4B861 org.apache.lucene:lucene-core:5.5.5
+65642FBAD8D42403B679438B22A493EE114D8DE5 org.apache.lucene:lucene-highlighter:5.5.5
+6C965EB5838A2BA58B0DE0FD860A420DCDA11937 org.apache.lucene:lucene-queryparser:5.5.5
+E6B3F5D1B33ED24DA7EEF0A72F8062BD4652700C org.apache.lucene:lucene-analyzers-common:5.5.5
 479C1E06DB31C432330183F5CAE684163F186146 javax.annotation:javax.annotation-api:1.2

maven.indexer/external/indexer-core-6.0-SNAPSHOT-patched-license.txt → maven.indexer/external/indexer-core-6.0.0-license.txt

@@ -1,6 +1,6 @@
 Name: Maven Indexer
 Description: Maven remote repository indexing engine.
-Version: 6.0-SNAPSHOT-patched
+Version: 6.0.0
 Origin: Apache Software Foundation
 License: Apache-2.0
 URL: http://repo1.maven.org/maven2/org/apache/maven/indexer/

maven.indexer/external/indexer-core-6.0.0-notice.txt

@@ -0,0 +1,5 @@
+Maven :: Indexer Core
+Copyright 2002-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

maven.indexer/external/lucene-5.5.3-license.txt → maven.indexer/external/lucene-5.5.5-license.txt

@@ -1,11 +1,11 @@
 Name: Apache Lucene
 Description: Java-based indexing and search technology
-Version: 5.5.3
+Version: 5.5.5
 Origin: Apache Software Foundation
 License: Apache-2.0
 URL: http://lucene.apache.org/
 Source: http://svn.apache.org/repos/asf/lucene/java/trunk
-Files: lucene-analyzers-common-5.5.3.jar lucene-core-5.5.3.jar lucene-highlighter-5.5.3.jar lucene-queryparser-5.5.3.jar
+Files: lucene-analyzers-common-5.5.5.jar lucene-core-5.5.5.jar lucene-highlighter-5.5.5.jar lucene-queryparser-5.5.5.jar
 
                                  Apache License
                            Version 2.0, January 2004

maven.indexer/nbproject/project.properties

@@ -19,11 +19,11 @@ test.config.stableBTD.includes=**/*Test.class
 is.autoload=true
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
-release.external/indexer-core-6.0-SNAPSHOT-patched.jar=modules/ext/maven/indexer-core-6.0-SNAPSHOT-patched.jar
-release.external/lucene-core-5.5.3.jar=modules/ext/maven/lucene-core-5.5.3.jar
-release.external/lucene-highlighter-5.5.3.jar=modules/ext/maven/lucene-highlighter-5.5.3.jar
-release.external/lucene-queryparser-5.5.3.jar=modules/ext/maven/lucene-queryparser-5.5.3.jar
-release.external/lucene-analyzers-common-5.5.3.jar=modules/ext/maven/lucene-analyzers-common-5.5.3.jar
+release.external/indexer-core-6.0.0.jar=modules/ext/maven/indexer-core-6.0.0.jar
+release.external/lucene-core-5.5.5.jar=modules/ext/maven/lucene-core-5.5.5.jar
+release.external/lucene-highlighter-5.5.5.jar=modules/ext/maven/lucene-highlighter-5.5.5.jar
+release.external/lucene-queryparser-5.5.5.jar=modules/ext/maven/lucene-queryparser-5.5.5.jar
+release.external/lucene-analyzers-common-5.5.5.jar=modules/ext/maven/lucene-analyzers-common-5.5.5.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

maven.indexer/nbproject/project.xml

@@ -166,24 +166,24 @@
                 <package>org.netbeans.modules.maven.indexer.spi.impl</package>
             </friend-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/indexer-core-6.0-SNAPSHOT-patched.jar</runtime-relative-path>
-                <binary-origin>external/indexer-core-6.0-SNAPSHOT-patched.jar</binary-origin>
+                <runtime-relative-path>ext/maven/indexer-core-6.0.0.jar</runtime-relative-path>
+                <binary-origin>external/indexer-core-6.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/lucene-core-5.5.3.jar</runtime-relative-path>
-                <binary-origin>external/lucene-core-5.5.3.jar</binary-origin>
+                <runtime-relative-path>ext/maven/lucene-core-5.5.5.jar</runtime-relative-path>
+                <binary-origin>external/lucene-core-5.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/lucene-highlighter-5.5.3.jar</runtime-relative-path>
-                <binary-origin>external/lucene-highlighter-5.5.3.jar</binary-origin>
+                <runtime-relative-path>ext/maven/lucene-highlighter-5.5.5.jar</runtime-relative-path>
+                <binary-origin>external/lucene-highlighter-5.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/lucene-queryparser-5.5.3.jar</runtime-relative-path>
-                <binary-origin>external/lucene-queryparser-5.5.3.jar</binary-origin>
+                <runtime-relative-path>ext/maven/lucene-queryparser-5.5.5.jar</runtime-relative-path>
+                <binary-origin>external/lucene-queryparser-5.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/lucene-analyzers-common-5.5.3.jar</runtime-relative-path>
-                <binary-origin>external/lucene-analyzers-common-5.5.3.jar</binary-origin>
+                <runtime-relative-path>ext/maven/lucene-analyzers-common-5.5.5.jar</runtime-relative-path>
+                <binary-origin>external/lucene-analyzers-common-5.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/maven/javax.annotation-api-1.2.jar</runtime-relative-path>