Upgrade to Camel 4.2.0 and other bumps (#954)

* Upgrade to Camel 4.2.0 and other bumps * Fix test for Camel 4.2.0 update * Fix test for Camel 4.2.0 update.
camel-tooling · Nov 15, 2023 · e1730f0 · e1730f0
1 parent 0e16c28
commit e1730f0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/camel-idea-plugin/src/main/resources/META-INF/plugin.xml b/camel-idea-plugin/src/main/resources/META-INF/plugin.xml
@@ -11,7 +11,7 @@
   <change-notes><![CDATA[
       v.1.1.5
       <ul>
-        <li>Bug fixes</li>
+        <li>Upgrade to Camel 4.2.0</li>
       </ul>
     ]]>
   </change-notes>

diff --git a/.../github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionSpringBootTestIT.java b/.../github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionSpringBootTestIT.java
@@ -62,7 +62,7 @@ public void testMainOptionSuggestionNonFiltered() {
         myFixture.completeBasic();
         List<String> strings = myFixture.getLookupElementStrings();
         assertNotNull(strings);
-        assertContainsElements(strings, "camel.springboot.debugging = ", "camel.springboot.duration-max-seconds = ", "camel.springboot.auto-startup = ");
+        assertContainsElements(strings, "camel.springboot.message-history = ", "camel.springboot.duration-max-seconds = ", "camel.springboot.auto-startup = ");
     }
 
     /**

diff --git a/...t/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionTestIT.java b/...t/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionTestIT.java
@@ -197,7 +197,7 @@ public void testMainOptionSuggestionNonFiltered() {
         myFixture.completeBasic();
         List<String> strings = myFixture.getLookupElementStrings();
         assertNotNull(strings);
-        assertContainsElements(strings, "camel.main.debugging = ", "camel.main.configurations = ", "camel.main.auto-startup = ");
+        assertContainsElements(strings, "camel.main.message-history = ", "camel.main.configurations = ", "camel.main.auto-startup = ");
     }
 
     /**
@@ -222,7 +222,7 @@ public void testMainOptionSuggestionFiltered() {
         myFixture.completeBasic();
         List<String> strings = myFixture.getLookupElementStrings();
         assertNotNull(strings);
-        assertContainsElements(strings, "camel.main.debugging = ");
+        assertContainsElements(strings, "camel.main.message-history = ");
         assertDoesntContain(strings, "camel.main.configurations = ", "camel.main.auto-startup = ");
     }
 

diff --git a/...rc/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java b/...rc/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java
@@ -212,7 +212,7 @@ public void testMainOptionSuggestionNonFiltered() {
         myFixture.completeBasic();
         List<String> strings = myFixture.getLookupElementStrings();
         assertNotNull(strings);
-        assertContainsElements(strings, "debugging: ", "configurations: ", "auto-startup: ");
+        assertContainsElements(strings, "message-history: ", "configurations: ", "auto-startup: ");
     }
 
     /**
@@ -238,7 +238,6 @@ public void testMainOptionSuggestionFiltered() {
         myFixture.type("deb");
         List<String> strings = myFixture.getLookupElementStrings();
         assertNotNull(strings);
-        assertContainsElements(strings, "debugging: ");
         assertDoesntContain(strings, "configurations: ", "auto-startup: ");
     }
 

diff --git a/...a-plugin/src/test/resources/testData/completion/property/main-options-filtered.properties b/...a-plugin/src/test/resources/testData/completion/property/main-options-filtered.properties
@@ -1 +1 @@
-camel.main.deb<caret>
+camel.main.mess<caret>
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-camelVersion = 4.1.0
-camelQuarkusVersion = 3.4.0
-camelKameletVersion = 4.0.1
-camelKarafVersion = 3.21.1
+camelVersion = 4.2.0
+camelQuarkusVersion = 3.5.0
+camelKameletVersion = 4.1.0
+camelKarafVersion = 3.21.2
 ideaVersion=2023.2.3
 mavenResolverVersion=1.9.14