From 2ed236b3cd988cb31802eb06c7b15336ad311adf Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Mon, 17 Aug 2026 12:48:17 -0400 Subject: [PATCH 1/3] fix copy/paste compile issue --- .../inteligr8/alfresco/asie/service/AcsReconcileService.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/shared/src/main/java/com/inteligr8/alfresco/asie/service/AcsReconcileService.java b/shared/src/main/java/com/inteligr8/alfresco/asie/service/AcsReconcileService.java index 8fb4ee0..2e2a801 100644 --- a/shared/src/main/java/com/inteligr8/alfresco/asie/service/AcsReconcileService.java +++ b/shared/src/main/java/com/inteligr8/alfresco/asie/service/AcsReconcileService.java @@ -234,11 +234,6 @@ public class AcsReconcileService implements DisposableBean { CompositeFuture future = new CompositeFuture<>(); ThrottledThreadPoolExecutor executor = this.getExecutor(); - ThrottledThreadPoolExecutor executor = this.executorManager.createThrottled( - "solr-reconcile", - this.concurrency, this.concurrency, this.concurrentQueueSize, - 1L, TimeUnit.MINUTES); - for (long _nodeDbId = fromDbId; _nodeDbId < toDbId; _nodeDbId++) { final long nodeDbId = _nodeDbId; this.logger.trace("Attempting to reconcile ACS node: {}", nodeDbId); From ae14f183c8d9d7636bcfa472fed946ec1f152320 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Mon, 17 Aug 2026 13:24:08 -0400 Subject: [PATCH 2/3] updated various artifact versions --- asie-api/pom.xml | 8 ++++---- community-module/pom.xml | 13 ++++++------- enterprise-module/pom.xml | 13 +++++++------ pom.xml | 16 ++++++++-------- shared/pom.xml | 6 +++--- solr-api/pom.xml | 8 ++++---- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/asie-api/pom.xml b/asie-api/pom.xml index ecd2387..c9c9dcd 100644 --- a/asie-api/pom.xml +++ b/asie-api/pom.xml @@ -11,7 +11,7 @@ asie-api - 1.1-SNAPSHOT-asie2 + 1.2-SNAPSHOT-asie2 jar ASIE Jakarta RS API @@ -33,7 +33,7 @@ com.inteligr8 solr-api - 1.1-SNAPSHOT-solr6 + 1.2-SNAPSHOT-solr6 org.alfresco @@ -53,7 +53,7 @@ org.glassfish.jersey.inject jersey-hk2 - 3.1.10 + 4.0.2 test @@ -84,7 +84,7 @@ alfresco-public - https://artifacts.alfresco.com/nexus/repository/public/ + https://artifacts.alfresco.com/nexus/repository/releases/ diff --git a/community-module/pom.xml b/community-module/pom.xml index e049154..93e339b 100644 --- a/community-module/pom.xml +++ b/community-module/pom.xml @@ -16,10 +16,10 @@ ASIE Platform Module for ACS Community - 4.9.0 - 23.3.0 - 23.3.0.98 - 10-2.1 + 4.16.0 + 26.1.0 + 26.1.0.61 + 2.3-tomcat-11.0.22 true @@ -59,7 +59,7 @@ com.inteligr8.alfresco cxf-jaxrs-platform-module - 1.3.1-acs-v23.3 + 1.4.0-acs-v26.1 amp @@ -81,7 +81,6 @@ io.repaint.maven tiles-maven-plugin - 2.40 true @@ -100,7 +99,7 @@ alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public + https://artifacts.alfresco.com/nexus/repository/releases/ diff --git a/enterprise-module/pom.xml b/enterprise-module/pom.xml index 558a789..1dc1c23 100644 --- a/enterprise-module/pom.xml +++ b/enterprise-module/pom.xml @@ -16,9 +16,10 @@ ASIE Platform Module for ACS Enterprise - 25.1.0 - 25.1.0.71 - 2.3-tomcat-10.1.52 + 26.1.0 + 26.1.0.61 + 2.3-tomcat-11.0.22 + 2.17.2 true @@ -40,7 +41,7 @@ com.inteligr8.alfresco cxf-jaxrs-platform-module - 1.4.0-acs-v25.1 + 1.4.0-acs-v26.1 amp provided @@ -74,13 +75,13 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.17.3 + ${jackson.version} provided com.fasterxml.jackson.module jackson-module-jakarta-xmlbind-annotations - 2.17.2 + ${jackson.version} provided diff --git a/pom.xml b/pom.xml index cf02c31..4cd4c24 100644 --- a/pom.xml +++ b/pom.xml @@ -47,9 +47,9 @@ 5.12.2 - 3.0.3 + 3.0.4 - 25.1.0 + 26.1.0 @@ -68,7 +68,7 @@ maven-site-plugin - 3.21.0 + 3.22.0 maven-compiler-plugin @@ -76,12 +76,12 @@ maven-dependency-plugin - 3.10.0 + 3.11.0 maven-surefire-plugin - 3.5.5 + 3.5.6 org.junit.jupiter @@ -92,7 +92,7 @@ maven-failsafe-plugin - 3.5.5 + 3.5.6 org.junit.jupiter @@ -105,7 +105,7 @@ io.repaint.maven tiles-maven-plugin - 2.43 + 2.45 @@ -162,7 +162,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.8.0 + 0.10.0 true central diff --git a/shared/pom.xml b/shared/pom.xml index 6d1c7e2..3259bb7 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -16,7 +16,7 @@ ASIE Shared Library for Platform Modules - 4.9.0 + 4.16.0 ${commom-rest-client.base.version}-cxf @@ -37,7 +37,7 @@ com.inteligr8.alfresco asie-api - 1.1-SNAPSHOT-asie2 + 1.2-SNAPSHOT-asie2 com.inteligr8 @@ -73,7 +73,7 @@ alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public + https://artifacts.alfresco.com/nexus/repository/releases/ diff --git a/solr-api/pom.xml b/solr-api/pom.xml index d3d8c03..505564d 100644 --- a/solr-api/pom.xml +++ b/solr-api/pom.xml @@ -12,25 +12,25 @@ com.inteligr8 solr-api - 1.1-SNAPSHOT-solr6 + 1.2-SNAPSHOT-solr6 jar Apache Solr Jakarta RS API - 2.21.1 + 2.22.1 jakarta.annotation jakarta.annotation-api - 2.1.1 + 3.0.0 jakarta.ws.rs jakarta.ws.rs-api - 3.1.0 + 4.0.0 com.fasterxml.jackson.module From 0bad7d4f0e12977dcba667a01f09bd8d65368cea Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Mon, 17 Aug 2026 13:25:19 -0400 Subject: [PATCH 3/3] fix NPE in comparator --- .../asie/enterprise/service/ShardDiscoveryService.java | 2 +- .../inteligr8/alfresco/asie/spi/ShardDiscoveryService.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/service/ShardDiscoveryService.java b/enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/service/ShardDiscoveryService.java index cc0bd7e..60eeff4 100644 --- a/enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/service/ShardDiscoveryService.java +++ b/enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/service/ShardDiscoveryService.java @@ -264,7 +264,7 @@ public class ShardDiscoveryService implements com.inteligr8.alfresco.asie.spi.Sh ShardInstanceState nodeShardState = ShardInstanceState.from(shardState); Pair pair = new Pair<>(node, nodeShardState); - if (comparator.compare(pair, shardNodeStates.get(shardId)) < 0) + if (!shardNodeStates.containsKey(shardId) || comparator.compare(pair, shardNodeStates.get(shardId)) < 0) shardNodeStates.put(shardId, pair); } } diff --git a/shared/src/main/java/com/inteligr8/alfresco/asie/spi/ShardDiscoveryService.java b/shared/src/main/java/com/inteligr8/alfresco/asie/spi/ShardDiscoveryService.java index e947a15..284a3af 100644 --- a/shared/src/main/java/com/inteligr8/alfresco/asie/spi/ShardDiscoveryService.java +++ b/shared/src/main/java/com/inteligr8/alfresco/asie/spi/ShardDiscoveryService.java @@ -125,7 +125,9 @@ public interface ShardDiscoveryService { public class ShardedNodeShardStateComparator implements Comparator> { @Override public int compare(Pair p1, Pair p2) { - return - Long.compare(p1.getSecond().getLastIndexedTxId(), p2.getSecond().getLastIndexedTxId()); + if (p1 == null) return 1; + else if (p2 == null) return -1; + else return - Long.compare(p1.getSecond().getLastIndexedTxId(), p2.getSecond().getLastIndexedTxId()); } }