From 1288ad3a4d29ae1064e5f2262de8b690b6ad6548 Mon Sep 17 00:00:00 2001
From: Pascal Essiembre <pascal.essiembre@norconex.com>
Date: Thu, 10 Jul 2025 20:51:54 -0400
Subject: [PATCH 1/4] Added JDBC to generated zip + updated maven central
 plugin.

---
 committer/apachekafka/pom.xml                 |  6 +-
 committer/azurecognitivesearch/pom.xml        |  6 +-
 committer/core/pom.xml                        |  4 +-
 committer/elasticsearch/pom.xml               |  4 +-
 committer/idol/pom.xml                        |  4 +-
 committer/neo4j/pom.xml                       |  4 +-
 committer/solr/pom.xml                        |  4 +-
 committer/sql/pom.xml                         |  4 +-
 crawler/core/pom.xml                          | 55 +++---------------
 crawler/fs/pom.xml                            |  4 +-
 crawler/web/pom.xml                           |  6 +-
 .../crawler/web/mocks/MockWebDriver.java      |  2 +-
 grid/core/pom.xml                             |  4 +-
 grid/jdbc/pom.xml                             |  6 +-
 grid/local/pom.xml                            |  7 +--
 importer/pom.xml                              |  8 +--
 pom.xml                                       | 57 +++++--------------
 17 files changed, 58 insertions(+), 127 deletions(-)

diff --git a/committer/apachekafka/pom.xml b/committer/apachekafka/pom.xml
index 00be1ce32..6e2a173aa 100644
--- a/committer/apachekafka/pom.xml
+++ b/committer/apachekafka/pom.xml
@@ -125,10 +125,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>
       </plugin>
-
+      
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
     </plugins>
diff --git a/committer/azurecognitivesearch/pom.xml b/committer/azurecognitivesearch/pom.xml
index e34d90407..b67922610 100644
--- a/committer/azurecognitivesearch/pom.xml
+++ b/committer/azurecognitivesearch/pom.xml
@@ -111,10 +111,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>
       </plugin>
-
+      
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
     </plugins>
diff --git a/committer/core/pom.xml b/committer/core/pom.xml
index 4b5e4f187..096032e82 100644
--- a/committer/core/pom.xml
+++ b/committer/core/pom.xml
@@ -106,8 +106,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
             
     </plugins>
diff --git a/committer/elasticsearch/pom.xml b/committer/elasticsearch/pom.xml
index b3481dcd3..ce456ab5d 100644
--- a/committer/elasticsearch/pom.xml
+++ b/committer/elasticsearch/pom.xml
@@ -124,8 +124,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
     </plugins>
diff --git a/committer/idol/pom.xml b/committer/idol/pom.xml
index a409ea46f..c50bba613 100644
--- a/committer/idol/pom.xml
+++ b/committer/idol/pom.xml
@@ -119,8 +119,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
     </plugins>
diff --git a/committer/neo4j/pom.xml b/committer/neo4j/pom.xml
index 00c61d8f1..48d94b625 100644
--- a/committer/neo4j/pom.xml
+++ b/committer/neo4j/pom.xml
@@ -113,8 +113,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
     </plugins>
diff --git a/committer/solr/pom.xml b/committer/solr/pom.xml
index 3838d6303..fbd7ea7ae 100644
--- a/committer/solr/pom.xml
+++ b/committer/solr/pom.xml
@@ -126,8 +126,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
     </plugins>
diff --git a/committer/sql/pom.xml b/committer/sql/pom.xml
index 99826dda0..39fb376b1 100644
--- a/committer/sql/pom.xml
+++ b/committer/sql/pom.xml
@@ -113,8 +113,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
     </plugins>
diff --git a/crawler/core/pom.xml b/crawler/core/pom.xml
index 1bb91a939..cb2c42ca6 100644
--- a/crawler/core/pom.xml
+++ b/crawler/core/pom.xml
@@ -81,44 +81,13 @@
       <artifactId>picocli</artifactId>
     </dependency>    
 
-    
-    <!-- TODO: remove from here as likely inherited from Importer or Nx Lang -->
-    <!--
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>    
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-parameter-names</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-xml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate.validator</groupId>
-      <artifactId>hibernate-validator</artifactId>    
-      <version>8.0.1.Final</version>
-    </dependency>
+    <!-- Runtime --> 
     <dependency>
-      <groupId>info.picocli</groupId>
-      <artifactId>picocli</artifactId>
+      <groupId>com.norconex.crawler</groupId>
+      <artifactId>nx-grid-jdbc</artifactId>
+      <scope>runtime</scope>
     </dependency>
-    -->
-    
+   
 
     <!-- Tests and provided. -->
     <dependency>
@@ -135,14 +104,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>com.norconex.crawler</groupId>
-      <artifactId>nx-grid-jdbc</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-    -->    
     
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -231,10 +192,10 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
-      
+
     </plugins>
   </build>
 
diff --git a/crawler/fs/pom.xml b/crawler/fs/pom.xml
index d2c454a7f..bc08cf558 100644
--- a/crawler/fs/pom.xml
+++ b/crawler/fs/pom.xml
@@ -287,8 +287,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
       
       <plugin>
diff --git a/crawler/web/pom.xml b/crawler/web/pom.xml
index bc4e38cba..a2b7a0010 100644
--- a/crawler/web/pom.xml
+++ b/crawler/web/pom.xml
@@ -320,10 +320,10 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
-      
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
diff --git a/crawler/web/src/test/java/com/norconex/crawler/web/mocks/MockWebDriver.java b/crawler/web/src/test/java/com/norconex/crawler/web/mocks/MockWebDriver.java
index 66313a925..28156cd4f 100644
--- a/crawler/web/src/test/java/com/norconex/crawler/web/mocks/MockWebDriver.java
+++ b/crawler/web/src/test/java/com/norconex/crawler/web/mocks/MockWebDriver.java
@@ -18,4 +18,4 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 
 public class MockWebDriver extends RemoteWebDriver implements TakesScreenshot {
-}
\ No newline at end of file
+}
diff --git a/grid/core/pom.xml b/grid/core/pom.xml
index a33d7f438..1f7245b8d 100644
--- a/grid/core/pom.xml
+++ b/grid/core/pom.xml
@@ -132,8 +132,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
     </plugins>
diff --git a/grid/jdbc/pom.xml b/grid/jdbc/pom.xml
index 424f81862..398486f25 100644
--- a/grid/jdbc/pom.xml
+++ b/grid/jdbc/pom.xml
@@ -187,10 +187,10 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
-      
+
     </plugins>
   </build>
 
diff --git a/grid/local/pom.xml b/grid/local/pom.xml
index 7f8793439..d67d007b4 100644
--- a/grid/local/pom.xml
+++ b/grid/local/pom.xml
@@ -142,10 +142,10 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
-      
+
     </plugins>
   </build>
 
@@ -156,7 +156,6 @@
     </site>
   </distributionManagement>
 
-
   <url>https://opensource.norconex.com/grid/local</url>
   <description>Norconex local grid.</description>
 
diff --git a/importer/pom.xml b/importer/pom.xml
index c6c3202da..96d81b881 100644
--- a/importer/pom.xml
+++ b/importer/pom.xml
@@ -340,7 +340,7 @@
           <excludePackageNames>org.*</excludePackageNames>
         </configuration>
       </plugin>
-
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
@@ -374,10 +374,10 @@
       </plugin>
 
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
-      
+
     </plugins>
   </build>
   
diff --git a/pom.xml b/pom.xml
index 2d5ab6322..f201243bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,6 @@
     <maven-remote-resources-plugin.version>3.2.0</maven-remote-resources-plugin.version>
     <maven-site-plugin.version>4.0.0-M14</maven-site-plugin.version>
     <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-    <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
     <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
     <therapi.version>0.15.0</therapi.version>
     <versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
@@ -125,6 +124,10 @@
   </properties>
 
   <distributionManagement>
+    <repository>
+      <id>central</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>  
     <snapshotRepository>
       <id>github</id>
       <url>https://maven.pkg.github.com/Norconex/crawlers</url>
@@ -168,15 +171,15 @@
   </licenses>
 
   <repositories>
+    <!-- 
+      TODO:
+      Needed for NX common lang snapshots. Replace with github snapshot repo
+      when migrated. 
+    -->
     <repository>
       <id>sonatype-oss-snapshots</id>
       <name>Sonatype OSS Snapshot Repository</name>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-<!--
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-  -->
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
@@ -226,6 +229,11 @@
         <artifactId>nx-grid-local</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.norconex.crawler</groupId>
+        <artifactId>nx-grid-jdbc</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <!-- Jackson dependencies -->
 
@@ -879,22 +887,6 @@
           </configuration>
         </plugin>
 
-<!-- OLD Nexus Staging Plugin.  TO DELETE when no longer needed. -->
-<!--
-        <plugin>
-          <groupId>org.sonatype.plugins</groupId>
-          <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>${nexus-staging-maven-plugin.version}</version>
-          <extensions>true</extensions>
-          <configuration>
-            <serverId>ossrh</serverId>
-            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-            <autoReleaseAfterClose>false</autoReleaseAfterClose>
-          </configuration>
-          <inherited>true</inherited>
-        </plugin>
--->
-
         <!-- TODO: Do we still publish javadocs via mvn site? Delete if not. -->         
 <!--        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1157,14 +1149,6 @@
 
       <!-- === Other plugins == -->
 
-     
-     <!--
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-      </plugin>
-      -->    
-
       <plugin>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok-maven-plugin</artifactId>
@@ -1228,19 +1212,6 @@
 
   </build>
 
-  <!-- No longer needed with new maven-central-publishing-maven-plugin -->
-  <!--
-  <distributionManagement>
-    <snapshotRepository>
-      <id>central</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>central</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-  -->
   <organization>
     <name>Norconex Inc.</name>
     <url>https://norconex.com</url>

From ff9d108035a1680bd87e90c3addf1a189bef66a0 Mon Sep 17 00:00:00 2001
From: essiembre <2326274+essiembre@users.noreply.github.com>
Date: Fri, 11 Jul 2025 00:52:15 +0000
Subject: [PATCH 2/4] Apply Copyright year changes

---
 committer/apachekafka/pom.xml          | 2 +-
 committer/azurecognitivesearch/pom.xml | 2 +-
 committer/core/pom.xml                 | 2 +-
 committer/elasticsearch/pom.xml        | 2 +-
 committer/idol/pom.xml                 | 2 +-
 committer/neo4j/pom.xml                | 2 +-
 committer/solr/pom.xml                 | 2 +-
 committer/sql/pom.xml                  | 2 +-
 crawler/fs/pom.xml                     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/committer/apachekafka/pom.xml b/committer/apachekafka/pom.xml
index 6e2a173aa..51464de81 100644
--- a/committer/apachekafka/pom.xml
+++ b/committer/apachekafka/pom.xml
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2013-2024 Norconex Inc.
+   Copyright 2013-2025 Norconex Inc.
    
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/committer/azurecognitivesearch/pom.xml b/committer/azurecognitivesearch/pom.xml
index b67922610..5d6339961 100644
--- a/committer/azurecognitivesearch/pom.xml
+++ b/committer/azurecognitivesearch/pom.xml
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2017-2024 Norconex Inc.
+   Copyright 2017-2025 Norconex Inc.
    
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/committer/core/pom.xml b/committer/core/pom.xml
index 096032e82..4c2053805 100644
--- a/committer/core/pom.xml
+++ b/committer/core/pom.xml
@@ -1,5 +1,5 @@
 <!-- 
-   Copyright 2014-2024 Norconex Inc.
+   Copyright 2014-2025 Norconex Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/committer/elasticsearch/pom.xml b/committer/elasticsearch/pom.xml
index ce456ab5d..0796a3887 100644
--- a/committer/elasticsearch/pom.xml
+++ b/committer/elasticsearch/pom.xml
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2013-2024 Norconex Inc.
+   Copyright 2013-2025 Norconex Inc.
    
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/committer/idol/pom.xml b/committer/idol/pom.xml
index c50bba613..db8140fef 100644
--- a/committer/idol/pom.xml
+++ b/committer/idol/pom.xml
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2013-2024 Norconex Inc.
+   Copyright 2013-2025 Norconex Inc.
    
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/committer/neo4j/pom.xml b/committer/neo4j/pom.xml
index 48d94b625..a572f494f 100644
--- a/committer/neo4j/pom.xml
+++ b/committer/neo4j/pom.xml
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2013-2024 Norconex Inc.
+   Copyright 2013-2025 Norconex Inc.
    
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/committer/solr/pom.xml b/committer/solr/pom.xml
index fbd7ea7ae..11fb0fb96 100644
--- a/committer/solr/pom.xml
+++ b/committer/solr/pom.xml
@@ -1,5 +1,5 @@
 <!-- 
-   Copyright 2014-2024 Norconex Inc.
+   Copyright 2014-2025 Norconex Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/committer/sql/pom.xml b/committer/sql/pom.xml
index 39fb376b1..e08c82109 100644
--- a/committer/sql/pom.xml
+++ b/committer/sql/pom.xml
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2013-2024 Norconex Inc.
+   Copyright 2013-2025 Norconex Inc.
    
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/crawler/fs/pom.xml b/crawler/fs/pom.xml
index bc08cf558..3a5a73532 100644
--- a/crawler/fs/pom.xml
+++ b/crawler/fs/pom.xml
@@ -1,5 +1,5 @@
 <!-- 
-   Copyright 2013-2024 Norconex Inc.
+   Copyright 2013-2025 Norconex Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

From f1b2b88b5f1617a7b1d8b90ddc2906fe93691921 Mon Sep 17 00:00:00 2001
From: Pascal Essiembre <pascal.essiembre@norconex.com>
Date: Fri, 11 Jul 2025 00:44:06 -0400
Subject: [PATCH 3/4] Fixed concurrency/timeout issues when run on cluster.

---
 .../core/metrics/CrawlerMetricsImpl.java      |  8 +++++
 .../core/session/CrawlSessionManager.java     |  2 +-
 .../com/norconex/grid/core/impl/CoreGrid.java | 11 ++++---
 .../impl/compute/task/TaskCoordinator.java    | 32 ++++++++++++-------
 .../grid/core/impl/compute/task/TaskUtil.java |  8 ++---
 5 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/crawler/core/src/main/java/com/norconex/crawler/core/metrics/CrawlerMetricsImpl.java b/crawler/core/src/main/java/com/norconex/crawler/core/metrics/CrawlerMetricsImpl.java
index ca13617b2..e2e98c01e 100644
--- a/crawler/core/src/main/java/com/norconex/crawler/core/metrics/CrawlerMetricsImpl.java
+++ b/crawler/core/src/main/java/com/norconex/crawler/core/metrics/CrawlerMetricsImpl.java
@@ -144,6 +144,14 @@ public void close() {
         flushBatch();
         if (scheduler != null) {
             scheduler.shutdown();
+            try {
+                if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
+                    scheduler.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                scheduler.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
         }
     }
 
diff --git a/crawler/core/src/main/java/com/norconex/crawler/core/session/CrawlSessionManager.java b/crawler/core/src/main/java/com/norconex/crawler/core/session/CrawlSessionManager.java
index f00ccc271..97a362cf0 100644
--- a/crawler/core/src/main/java/com/norconex/crawler/core/session/CrawlSessionManager.java
+++ b/crawler/core/src/main/java/com/norconex/crawler/core/session/CrawlSessionManager.java
@@ -78,8 +78,8 @@ public void withCrawlContext(Consumer<CrawlContext> consumer) {
             consumer.accept(ctx);
         } finally {
             // Ensure cleanup happens even if an exception occurs
-            CrawlContextDestroyer.destroy(ctx);
             swallow(heartbeatScheduler::shutdown);
+            CrawlContextDestroyer.destroy(ctx);
         }
     }
 
diff --git a/grid/core/src/main/java/com/norconex/grid/core/impl/CoreGrid.java b/grid/core/src/main/java/com/norconex/grid/core/impl/CoreGrid.java
index c15d8d890..c6b45d550 100644
--- a/grid/core/src/main/java/com/norconex/grid/core/impl/CoreGrid.java
+++ b/grid/core/src/main/java/com/norconex/grid/core/impl/CoreGrid.java
@@ -236,20 +236,21 @@ public void viewAccepted(View view) {
                 initializedLatch.countDown();
             }
 
+            var meOrNot = isCoordinator() ? "me!" : "not me";
             var coordAddress = channel.view().getCoord();
             if (cachedCoordAddress == null) {
-                LOG.info("Grid \"{}\" elected coordinator: {}",
-                        gridName, view);
+                LOG.info("Grid \"{}\" elected coordinator ({}): {}",
+                        gridName, meOrNot, coordAddress);
             } else if (!Objects.equals(cachedCoordAddress, coordAddress)) {
-                LOG.info("New \"{}\" grid coordinator elected: {} -> "
-                        + "{}", gridName,
-                        cachedCoordAddress, coordAddress);
+                LOG.info("Grid \"{}\" coordinator changed: {} -> {} ({})",
+                        gridName, cachedCoordAddress, coordAddress, meOrNot);
                 //TODO need to handle the change??
             }
             cachedCoordAddress = coordAddress;
 
             var currentSize = view.getMembers().size();
             LOG.info("Current \"{}\" grid size: {}", gridName, currentSize);
+            LOG.debug("Current \"{}\" grid nodes: {}", gridName, view);
 
             // Inform quorum waiters if applicable
             synchronized (this) {
diff --git a/grid/core/src/main/java/com/norconex/grid/core/impl/compute/task/TaskCoordinator.java b/grid/core/src/main/java/com/norconex/grid/core/impl/compute/task/TaskCoordinator.java
index cf33f3148..00942f818 100644
--- a/grid/core/src/main/java/com/norconex/grid/core/impl/compute/task/TaskCoordinator.java
+++ b/grid/core/src/main/java/com/norconex/grid/core/impl/compute/task/TaskCoordinator.java
@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -34,8 +33,8 @@
 import com.norconex.grid.core.GridException;
 import com.norconex.grid.core.compute.ExecutionMode;
 import com.norconex.grid.core.compute.GridTask;
-import com.norconex.grid.core.compute.TaskState;
 import com.norconex.grid.core.compute.TaskExecutionResult;
+import com.norconex.grid.core.compute.TaskState;
 import com.norconex.grid.core.impl.CoreGrid;
 import com.norconex.grid.core.impl.compute.CoreCompute;
 import com.norconex.grid.core.impl.compute.WorkDispatcher;
@@ -75,16 +74,19 @@ public TaskExecutionResult executeTask(GridTask task) throws Exception {
         //TODO, not a supported use case yet, but if joining remotely to
         // send an execution request, we'll have to make sure the coordinator
         // gets it.
+
+        //NOTE: the reason we return right away if not the coordinator is
+        // because workers tasks are invoked directly on workers by the
+        // coordinator.
         if (!grid.isCoordinator()) {
             TaskUtil.logNonCoordinatorCantExecute(grid, task);
             //TODO verify if this will get called even if joining,
-            // and will wait... and will receive remote task request
-            // in parallel.
+            // late, after the task is executed... will it receive remote task
+            // request in parallel?
             return awaitCoordinatorDoneSignal(task);
         }
 
-        var state = ofNullable(taskStateStore
-                .get(task.getId())).orElse(TaskState.PENDING);
+        var state = getStoredTaskState(task.getId());
 
         // Ensure runOnce is respected
         if (task.isOnce() && state.isTerminal()) {
@@ -106,8 +108,8 @@ public TaskExecutionResult executeTask(GridTask task) throws Exception {
         if (grid.isCoordinator() && state.isRunning()) {
             LOG.warn("""
                 A coordinator {} tried to start a task already running: {}. \
-                Could be newly elected. Will attempt to take over \
-                instead.""", grid.getNodeAddress(), task.getId());
+                Could be newly elected. Will attempt to take over.""",
+                    grid.getNodeAddress(), task.getId());
         } else {
             LOG.info("Coordinator {} executing task: {}",
                     grid.getNodeAddress(), task.getId());
@@ -130,8 +132,12 @@ public void stopTask(String taskId) throws Exception {
         dispatcher.stopTaskOnNodes(taskId);
     }
 
+    private TaskState getStoredTaskState(String taskId) {
+        return ofNullable(taskStateStore
+                .get(taskId)).orElse(TaskState.PENDING);
+    }
+
     private TaskExecutionResult awaitCoordinatorDoneSignal(GridTask task) {
-        var startTime = new AtomicLong(System.currentTimeMillis());
         var taskStatusRef = new AtomicReference<TaskExecutionResult>();
         ConcurrentUtil.waitUntil(() -> {
             if (localWorker.isNodeTaskStopRequested(task.getId())) {
@@ -151,10 +157,12 @@ private TaskExecutionResult awaitCoordinatorDoneSignal(GridTask task) {
                 return false;
             }
             var heartbeat = gridProgress.getLastHeartbeat();
-            if (heartbeat - startTime.get() > grid.getConnectorConfig()
+
+            if (System.currentTimeMillis() - heartbeat > grid
+                    .getConnectorConfig()
                     .getNodeTimeout().toMillis()) {
-                throw new GridException("Task expired. No hearbeat "
-                        + "received from coordinator.");
+                throw new GridException(
+                        "Task expired. No hearbeat received from coordinator.");
             }
             var status = gridProgress.getStatus();
             if (status == null) {
diff --git a/grid/core/src/main/java/com/norconex/grid/core/impl/compute/task/TaskUtil.java b/grid/core/src/main/java/com/norconex/grid/core/impl/compute/task/TaskUtil.java
index 3fe00388d..118306d3c 100644
--- a/grid/core/src/main/java/com/norconex/grid/core/impl/compute/task/TaskUtil.java
+++ b/grid/core/src/main/java/com/norconex/grid/core/impl/compute/task/TaskUtil.java
@@ -22,8 +22,8 @@
 
 import com.norconex.grid.core.compute.ExecutionMode;
 import com.norconex.grid.core.compute.GridTask;
-import com.norconex.grid.core.compute.TaskState;
 import com.norconex.grid.core.compute.TaskExecutionResult;
+import com.norconex.grid.core.compute.TaskState;
 import com.norconex.grid.core.impl.CoreGrid;
 
 import lombok.extern.slf4j.Slf4j;
@@ -61,15 +61,15 @@ public static boolean isState(TaskProgress progress, TaskState state) {
 
     public static void logNonCoordinatorCantExecute(CoreGrid grid,
             GridTask task) {
-        if (!LOG.isDebugEnabled()) {
+        if (!LOG.isInfoEnabled()) {
             return;
         }
         var msgSuffix = task.getExecutionMode() == ExecutionMode.SINGLE_NODE
                 ? "will wait for the coordinator to be done with this "
                         + "single-node task."
                 : "will participate when asked by the coordinator.";
-        LOG.debug("Non-coordinator node {}. Letting the coordinator node "
-                + "start task {} and this node {}.",
+        LOG.info("Non-coordinator node {}. Letting the coordinator node "
+                + "start task \"{}\" and this node {}.",
                 grid.getNodeAddress(), task.getId(), msgSuffix);
     }
 }

From fb746a999ba4b940d29674d6b29d6f76a4b3798f Mon Sep 17 00:00:00 2001
From: Pascal Essiembre <pascal.essiembre@norconex.com>
Date: Fri, 11 Jul 2025 00:53:52 -0400
Subject: [PATCH 4/4] Fix build error.

---
 .github/workflows/maven-ci-cd.yaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven-ci-cd.yaml b/.github/workflows/maven-ci-cd.yaml
index e7f1f85aa..dcf001394 100644
--- a/.github/workflows/maven-ci-cd.yaml
+++ b/.github/workflows/maven-ci-cd.yaml
@@ -109,11 +109,16 @@ jobs:
       if: ${{ steps.cache-maven.outputs.cache-hit != 'true' }}
       run: |
         MAVEN_VERSION=3.9.10
-        wget https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz
-        tar xzvf apache-maven-$MAVEN_VERSION-bin.tar.gz
-        sudo mv apache-maven-$MAVEN_VERSION /opt/maven
+        if [ ! -d "/opt/maven/apache-maven-$MAVEN_VERSION" ]; then
+          wget https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz
+          tar xzvf apache-maven-$MAVEN_VERSION-bin.tar.gz
+          sudo mkdir -p /opt/maven
+          sudo mv apache-maven-$MAVEN_VERSION /opt/maven/
+          rm apache-maven-$MAVEN_VERSION-bin.tar.gz
+        fi
         sudo rm -f /usr/bin/mvn
-        sudo ln -s /opt/maven/bin/mvn /usr/bin/mvn
+        sudo ln -sf /opt/maven/apache-maven-$MAVEN_VERSION/bin/mvn /usr/bin/mvn
+
       
     #--- Step ------------------------------------------------------------------