CAMEL-23271: Fix SonarCloud blocker reliability issues (resource leaks)

components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java

@@ -18,7 +18,6 @@
 
 import java.util.Arrays;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 import javax.jcr.RepositoryException;
@@ -40,7 +39,7 @@ public class JcrConsumer extends DefaultConsumer {
 
     private Session session;
     private EventListener eventListener;
-    private ScheduledFuture<?> sessionListenerCheckerScheduledFuture;
+    private ScheduledExecutorService sessionListenerCheckerExecutor;
 
     public JcrConsumer(JcrEndpoint endpoint, Processor processor) {
         super(endpoint, processor);
@@ -157,20 +156,23 @@ private void unregisterListenerAndLogoutSession() throws RepositoryException {
     }
 
     private void cancelSessionListenerChecker() {
-        if (sessionListenerCheckerScheduledFuture != null) {
-            sessionListenerCheckerScheduledFuture.cancel(true);
+        if (sessionListenerCheckerExecutor != null) {
+            getJcrEndpoint().getCamelContext().getExecutorServiceManager()
+                    .shutdownNow(sessionListenerCheckerExecutor);
+            sessionListenerCheckerExecutor = null;
         }
     }
 
     private void scheduleSessionListenerChecker() {
         String name = "JcrConsumerSessionChecker[" + getJcrEndpoint().getEndpointConfiguredDestinationName() + "]";
-        ScheduledExecutorService executor = getJcrEndpoint().getCamelContext().getExecutorServiceManager()
+        sessionListenerCheckerExecutor = getJcrEndpoint().getCamelContext().getExecutorServiceManager()
                 .newSingleThreadScheduledExecutor(this, name);
         JcrConsumerSessionListenerChecker sessionListenerChecker = new JcrConsumerSessionListenerChecker();
         long sessionLiveCheckIntervalOnStart = JcrConsumer.this.getJcrEndpoint().getSessionLiveCheckIntervalOnStart();
         long sessionLiveCheckInterval = JcrConsumer.this.getJcrEndpoint().getSessionLiveCheckInterval();
-        sessionListenerCheckerScheduledFuture = executor.scheduleWithFixedDelay(sessionListenerChecker,
-                sessionLiveCheckIntervalOnStart, sessionLiveCheckInterval, TimeUnit.MILLISECONDS);
+        sessionListenerCheckerExecutor.scheduleWithFixedDelay(
+                sessionListenerChecker, sessionLiveCheckIntervalOnStart, sessionLiveCheckInterval,
+                TimeUnit.MILLISECONDS);
     }
 
     private class JcrConsumerSessionListenerChecker implements Runnable {

components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java

@@ -963,7 +963,8 @@ static SalesforceHttpClient createHttpClient(
             int workerPoolMaxSize) {
         SecurityUtils.adaptToIBMCipherNames(sslContextFactory);
 
-        final SalesforceHttpClient httpClient = new SalesforceHttpClient(
+        // ExecutorService lifecycle is managed by SalesforceHttpClient
+        final SalesforceHttpClient httpClient = new SalesforceHttpClient( // NOSONAR
                 context, context.getExecutorServiceManager().newThreadPool(source, "SalesforceHttpClient", workerPoolSize,
                         workerPoolMaxSize),
                 sslContextFactory);

core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java

@@ -76,6 +76,8 @@ protected AggregateProcessor createAggregator() throws Exception {
 
         boolean parallel = parseBoolean(definition.getParallelProcessing(), false);
         boolean shutdownThreadPool = willCreateNewThreadPool(definition, parallel);
+        // ExecutorService lifecycle is managed by AggregateProcessor via shutdownThreadPool flag
+        @SuppressWarnings("java:S2095")
         ExecutorService threadPool = getConfiguredExecutorService("Aggregator", definition, parallel);
         if (threadPool == null && !parallel) {
             // executor service is mandatory for the Aggregator

core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThreadsReifier.java

@@ -43,6 +43,8 @@ public Processor createProcessor() throws Exception {
         }
         // prefer any explicit configured executor service
         boolean shutdownThreadPool = willCreateNewThreadPool(definition, true);
+        // ExecutorService lifecycle is managed by ThreadsProcessor via shutdownThreadPool flag
+        @SuppressWarnings("java:S2095")
         ExecutorService threadPool = getConfiguredExecutorService(name, definition, false);
 
         // resolve what rejected policy to use

dsl/camel-yaml-dsl/camel-yaml-dsl-validator/src/main/java/org/apache/camel/dsl/yaml/validator/CamelYamlParser.java

@@ -50,12 +50,10 @@
 public class CamelYamlParser {
 
     public List<ValidationMessage> parse(File file) throws Exception {
-        CamelContext camelContext = null;
-        try {
-            DefaultRegistry registry = new DefaultRegistry();
-            registry.addBeanRepository(new StubBeanRepository("*"));
+        DefaultRegistry registry = new DefaultRegistry();
+        registry.addBeanRepository(new StubBeanRepository("*"));
 
-            camelContext = new DefaultCamelContext(registry);
+        try (CamelContext camelContext = new DefaultCamelContext(registry)) {
             camelContext.setAutoStartup(false);
             camelContext.getCamelContextExtension().addContextPlugin(ComponentResolver.class,
                     (name, context) -> new StubComponent());
@@ -101,10 +99,6 @@ public List<ValidationMessage> parse(File file) throws Exception {
             ValidationMessage vm = ValidationMessage.builder().type("parser")
                     .messageSupplier(() -> e.getClass().getName() + ": " + e.getMessage()).build();
             return List.of(vm);
-        } finally {
-            if (camelContext != null) {
-                camelContext.stop();
-            }
         }
     }
 

pom.xml

@@ -120,6 +120,8 @@
         <!-- reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
         <project.build.outputTimestamp>2026-02-17T16:11:10Z</project.build.outputTimestamp>
 
+        <!-- Tell SonarCloud which Java source level to use for analysis -->
+        <sonar.java.source>${jdk.version}</sonar.java.source>
         <!-- NOTE: this is required to correctly map each module coverage in Sonarqube. The ${maven.multiModuleProjectDirectory} may require some change
             when upgrading to Maven 4.x, according to any of the new variables that will replace this one. -->
         <sonar.coverage.jacoco.xmlReportPaths>

tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java

@@ -113,13 +113,17 @@ String getModelPackage() {
     abstract String getWriterPackage();
 
     protected String generateWriter() throws MojoExecutionException {
-        ClassLoader classLoader;
-        try {
-            classLoader = DynamicClassLoader.createDynamicClassLoader(project.getCompileClasspathElements());
+        try (DynamicClassLoader classLoader
+                = DynamicClassLoader.createDynamicClassLoader(project.getCompileClasspathElements())) {
+            return doGenerateWriter(classLoader);
         } catch (DependencyResolutionRequiredException e) {
             throw new MojoExecutionException("DependencyResolutionRequiredException: " + e.getMessage(), e);
+        } catch (IOException e) {
+            throw new MojoExecutionException("IOException: " + e.getMessage(), e);
         }
+    }
 
+    private String doGenerateWriter(ClassLoader classLoader) throws MojoExecutionException {
         List<Path> jsonFiles;
         try (Stream<Path> stream = PackageHelper.findJsonFiles(modelDir.toPath())) {
             jsonFiles = stream.toList();