commit a5039e5932c77a1dceb1822e16954088a6773c4a
author Tamas Cservenak <tamas@cservenak.net> Wed Apr 22 14:51:15 2015 +0200
committer Tamas Cservenak <tamas@cservenak.net> Wed Apr 22 14:51:15 2015 +0200
tree 9a67d7b9de3e37201db46c3316cf622f0b8762d5
parent ac19770a377306d99f4268eae2d3bbb3f304fc45
parent 6d87d0be5860b830af3ce74127cfe282403b29f3

Merge remote-tracking branch 'enygma/fix-artifact-info-construction' into pr-11

indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java

diff --git a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
index dc4a8f7..c140ace 100644
--- a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
+++ b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
@@ -352,7 +352,6 @@
             null, // index update url
             indexers );
 
-        final IndexSearcher indexSearcher = context.acquireIndexSearcher();
         try
         {
             IndexPacker packer = plexus.lookup( IndexPacker.class );
@@ -361,20 +360,30 @@
 
             indexer.scan( context, listener, true );
 
-            IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), outputFolder );
+            IndexSearcher indexSearcher = context.acquireIndexSearcher();
 
-            request.setCreateChecksumFiles( createChecksums );
-
-            request.setCreateIncrementalChunks( createIncrementalChunks );
-
-            request.setFormats( Arrays.asList( IndexFormat.FORMAT_V1 ) );
-
-            if ( chunkCount != null )
+            try
             {
-                request.setMaxIndexChunks( chunkCount.intValue() );
-            }
+                IndexPackingRequest request =
+                    new IndexPackingRequest(context, indexSearcher.getIndexReader(), outputFolder);
 
-            packIndex( packer, request, debug, quiet );
+                request.setCreateChecksumFiles(createChecksums);
+
+                request.setCreateIncrementalChunks(createIncrementalChunks);
+
+                request.setFormats(Arrays.asList(IndexFormat.FORMAT_V1));
+
+                if (chunkCount != null)
+                {
+                    request.setMaxIndexChunks(chunkCount.intValue());
+                }
+
+                packIndex(packer, request, debug, quiet);
+            }
+            finally
+            {
+                context.releaseIndexSearcher(indexSearcher);
+            }
 
             if ( !quiet )
             {
@@ -383,7 +392,6 @@
         }
         finally
         {
-            context.releaseIndexSearcher( indexSearcher );
             indexer.removeIndexingContext( context, false );
         }
     }

pom.xml

diff --git a/pom.xml b/pom.xml
index 418c8d6..aaaa508 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
 
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.codehaus.org/browse/MINDEXER</url>
+    <url>https://issues.apache.org/jira/browse/MINDEXER</url>
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
@@ -78,7 +78,7 @@
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
     </site>
   </distributionManagement>
 
@@ -466,7 +466,7 @@
           <artifactId>maven-site-plugin</artifactId>
           <version>3.3</version>
           <configuration>
-            <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
+            <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</topSiteURL>
           </configuration>
         </plugin>
         <plugin>