[camel-spring-boot] branch main updated: CAMEL-19090: Remove deprecated apis in core

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
     new a9a27f4d5a9 CAMEL-19090: Remove deprecated apis in core
a9a27f4d5a9 is described below

commit a9a27f4d5a9503fa198d5bdd0b426f90ee7d74ba
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Feb 27 20:05:05 2023 +0100

    CAMEL-19090: Remove deprecated apis in core
---
 core/camel-spring-boot/src/main/docs/spring-boot.json             | 8 --------
 .../apache/camel/spring/boot/CamelConfigurationProperties.java    | 7 -------
 .../org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java | 6 +++---
 tooling/camel-spring-boot-dependencies/pom.xml                    | 5 -----
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json 
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index f4c62426739..cd558d83b47 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -1631,14 +1631,6 @@
       "type": "java.lang.Boolean",
       "description": "Whether to enable Camel info.",
       "defaultValue": true
-    },
-    {
-      "name": "camel.springboot.route-controller-logging-level",
-      "type": "org.apache.camel.LoggingLevel",
-      "description": "Sets the logging level used for logging route activity 
(such as starting and stopping routes). The default logging level is DEBUG.",
-      "sourceType": 
"org.apache.camel.spring.boot.CamelConfigurationProperties",
-      "deprecated": true,
-      "deprecation": {}
     }
   ],
   "hints": []
diff --git 
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index b53dd8e952d..7ea9a359e08 100644
--- 
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++ 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -740,13 +740,6 @@ public class CamelConfigurationProperties extends 
DefaultConfigurationProperties
      */
     private String javaRoutesExcludePattern;
 
-    /**
-     * Sets the logging level used for logging route activity (such as 
starting and stopping routes). The default
-     * logging level is DEBUG.
-     */
-    @Deprecated
-    private LoggingLevel routeControllerLoggingLevel;
-
     /**
      * To enable using supervising route controller which allows Camel to 
startup
      * and then the controller takes care of starting the routes in a safe 
manner.
diff --git 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java
index 1dd1bd00c7d..cc5c989bcb6 100644
--- 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java
+++ 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java
@@ -42,7 +42,7 @@ import 
org.apache.camel.test.spring.junit5.CamelSpringBootTest;
         "camel.threadpool.pool-size = 5",
         "camel.threadpool.max-pool-size = 10",
         "camel.threadpool.max-queue-size = 20",
-        "camel.threadpool.rejected-policy = DiscardOldest",
+        "camel.threadpool.rejected-policy = CallerRuns",
         "camel.threadpool.config[smallPool].pool-size = 2",
         "camel.threadpool.config[smallPool].rejected-policy = Abort",
         "camel.threadpool.config[bigPool].pool-size = 20",
@@ -62,7 +62,7 @@ public class ThreadPoolConfigurationTest {
         Assertions.assertEquals(5, dpp.getPoolSize().intValue());
         Assertions.assertEquals(10, dpp.getMaxPoolSize().intValue());
         Assertions.assertEquals(20, dpp.getMaxQueueSize().intValue());
-        Assertions.assertEquals(ThreadPoolRejectedPolicy.DiscardOldest, 
dpp.getRejectedPolicy());
+        Assertions.assertEquals(ThreadPoolRejectedPolicy.CallerRuns, 
dpp.getRejectedPolicy());
 
         ThreadPoolProfile sp = 
context.getExecutorServiceManager().getThreadPoolProfile("smallPool");
         Assertions.assertNotNull(sp);
@@ -78,7 +78,7 @@ public class ThreadPoolConfigurationTest {
         Assertions.assertEquals(20, bp.getPoolSize().intValue());
         Assertions.assertEquals(50, bp.getMaxPoolSize().intValue());
         Assertions.assertEquals(500, bp.getMaxQueueSize().intValue());
-        Assertions.assertEquals(ThreadPoolRejectedPolicy.DiscardOldest, 
bp.getRejectedPolicy());
+        Assertions.assertEquals(ThreadPoolRejectedPolicy.CallerRuns, 
bp.getRejectedPolicy());
     }
 
     // *************************************
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml 
b/tooling/camel-spring-boot-dependencies/pom.xml
index 4a5a7b2daea..687ee575004 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -70,11 +70,6 @@
         <artifactId>Saxon-HE</artifactId>
         <version>11.4</version>
       </dependency>
-      <dependency>
-        <groupId>ognl</groupId>
-        <artifactId>ognl</artifactId>
-        <version>3.3.4</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro</artifactId>