From ca4bae0dd99169716fbf9099d6cbff62d8f8d6b2 Mon Sep 17 00:00:00 2001 From: Claus Ibsen Date: Tue, 14 Nov 2023 22:10:17 +0100 Subject: [PATCH 1/3] Upgrade to Camel 4.2.0 and other bumps --- camel-idea-plugin/src/main/resources/META-INF/plugin.xml | 2 +- gradle.properties | 8 ++++---- 2 files changed, 5 insertions(+), 5 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 index b337ff95..f347cdf9 100644 --- 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 @@ -
  • Bug fixes
  • +
  • Upgrade to Camel 4.2.0
  • ]]>
    diff --git a/gradle.properties b/gradle.properties index 4c7b5346..c53ea4cb 100644 --- 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 \ No newline at end of file From 62deaf7935c6074d018175d2cc63310af6b4b942 Mon Sep 17 00:00:00 2001 From: Claus Ibsen Date: Wed, 15 Nov 2023 15:22:31 +0100 Subject: [PATCH 2/3] Fix test for Camel 4.2.0 update --- .../PropertiesPropertyKeyCompletionSpringBootTestIT.java | 2 +- .../completion/PropertiesPropertyKeyCompletionTestIT.java | 4 ++-- .../idea/completion/YamlPropertyKeyCompletionTestIT.java | 3 +-- .../completion/property/main-options-filtered.properties | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionSpringBootTestIT.java b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionSpringBootTestIT.java index dd2c4590..4904fb60 100644 --- a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionSpringBootTestIT.java +++ b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionSpringBootTestIT.java @@ -62,7 +62,7 @@ public void testMainOptionSuggestionNonFiltered() { myFixture.completeBasic(); List 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/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionTestIT.java b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionTestIT.java index 0818250c..a5640ff7 100644 --- a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionTestIT.java +++ b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/PropertiesPropertyKeyCompletionTestIT.java @@ -197,7 +197,7 @@ public void testMainOptionSuggestionNonFiltered() { myFixture.completeBasic(); List 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 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/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java index 48b2ada8..92965a08 100644 --- a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java +++ b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java @@ -212,7 +212,7 @@ public void testMainOptionSuggestionNonFiltered() { myFixture.completeBasic(); List strings = myFixture.getLookupElementStrings(); assertNotNull(strings); - assertContainsElements(strings, "debugging: ", "configurations: ", "auto-startup: "); + assertContainsElements(strings, "configurations: ", "auto-startup: "); } /** @@ -238,7 +238,6 @@ public void testMainOptionSuggestionFiltered() { myFixture.type("deb"); List strings = myFixture.getLookupElementStrings(); assertNotNull(strings); - assertContainsElements(strings, "debugging: "); assertDoesntContain(strings, "configurations: ", "auto-startup: "); } diff --git a/camel-idea-plugin/src/test/resources/testData/completion/property/main-options-filtered.properties b/camel-idea-plugin/src/test/resources/testData/completion/property/main-options-filtered.properties index d274dd86..0fe95963 100644 --- a/camel-idea-plugin/src/test/resources/testData/completion/property/main-options-filtered.properties +++ b/camel-idea-plugin/src/test/resources/testData/completion/property/main-options-filtered.properties @@ -1 +1 @@ -camel.main.deb \ No newline at end of file +camel.main.mess \ No newline at end of file From 95729bd621553cda9291b4f6afed2832c589678a Mon Sep 17 00:00:00 2001 From: Claus Ibsen Date: Wed, 15 Nov 2023 15:38:04 +0100 Subject: [PATCH 3/3] Fix test for Camel 4.2.0 update. --- .../idea/completion/YamlPropertyKeyCompletionTestIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java index 92965a08..19f7a02b 100644 --- a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java +++ b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/completion/YamlPropertyKeyCompletionTestIT.java @@ -212,7 +212,7 @@ public void testMainOptionSuggestionNonFiltered() { myFixture.completeBasic(); List strings = myFixture.getLookupElementStrings(); assertNotNull(strings); - assertContainsElements(strings, "configurations: ", "auto-startup: "); + assertContainsElements(strings, "message-history: ", "configurations: ", "auto-startup: "); } /**