From b3b8fedc6536170a370234c37d5f93286b0d9103 Mon Sep 17 00:00:00 2001 From: Claus Ibsen Date: Sun, 14 Apr 2024 17:19:43 +0200 Subject: [PATCH] #1011 - Upgrade to IDEA 2024.1 (#1013) * #1011 - Upgrade to IDEA 2024.1 * Upgrade to jdk17 instead of jdk11 for some tests * Attempt to fix tests --- .github/workflows/ci-build.yaml | 2 +- build-all.sh | 2 +- camel-idea-plugin/build.gradle | 4 ++-- .../src/main/resources/META-INF/plugin.xml | 1 + .../CamelLightCodeInsightFixtureTestCaseIT.java | 2 +- .../inspection/CamelInspectionTestHelper.java | 2 +- ...IdeaUtilsIsCamelRouteStartExtendedTestIT.java | 16 ++-------------- .../util/IdeaUtilsIsCamelRouteStartTestIT.java | 16 ++-------------- gradle.properties | 4 ++-- 9 files changed, 13 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index b164945a..1130c551 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -40,7 +40,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - version: [2023.1.3, 2023.2.5, 2023.3.6] + version: [2023.1.3, 2023.2.5, 2023.3.6, 2024.1] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/build-all.sh b/build-all.sh index d60e797b..1781a811 100755 --- a/build-all.sh +++ b/build-all.sh @@ -1,5 +1,5 @@ #!/bin/bash -for v in "2023.1.3" "2023.2.5" "2023.3.6"; do +for v in "2023.1.3" "2023.2.5" "2023.3.6" "2024.1; do ./build.sh $v done diff --git a/camel-idea-plugin/build.gradle b/camel-idea-plugin/build.gradle index 397308db..14e20150 100644 --- a/camel-idea-plugin/build.gradle +++ b/camel-idea-plugin/build.gradle @@ -33,11 +33,11 @@ intellij { // http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html patchPluginXml { sinceBuild = "231" - untilBuild = "233.*" + untilBuild = "241.*" } runPluginVerifier { - ideVersions = [ "2023.1", "2023.2", "2023.3" ] + ideVersions = [ "2023.1", "2023.2", "2023.3", "2024.1" ] } // publishPlugin { 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 70284d1b..0be5f73f 100644 --- a/camel-idea-plugin/src/main/resources/META-INF/plugin.xml +++ b/camel-idea-plugin/src/main/resources/META-INF/plugin.xml @@ -12,6 +12,7 @@ v.1.2.7 ]]> diff --git a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/CamelLightCodeInsightFixtureTestCaseIT.java b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/CamelLightCodeInsightFixtureTestCaseIT.java index 090179d0..03803c67 100644 --- a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/CamelLightCodeInsightFixtureTestCaseIT.java +++ b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/CamelLightCodeInsightFixtureTestCaseIT.java @@ -161,7 +161,7 @@ protected LightProjectDescriptor getProjectDescriptor() { return new DefaultLightProjectDescriptor() { @Override public Sdk getSdk() { - return IdeaTestUtil.getMockJdk11(); + return IdeaTestUtil.getMockJdk17(); } @Override diff --git a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/inspection/CamelInspectionTestHelper.java b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/inspection/CamelInspectionTestHelper.java index 4fb8513f..ddab8182 100644 --- a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/inspection/CamelInspectionTestHelper.java +++ b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/inspection/CamelInspectionTestHelper.java @@ -35,7 +35,7 @@ protected LightProjectDescriptor getProjectDescriptor() { return new DefaultLightProjectDescriptor() { @Override public Sdk getSdk() { - return IdeaTestUtil.getMockJdk11(); + return IdeaTestUtil.getMockJdk17(); } @Override diff --git a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/util/IdeaUtilsIsCamelRouteStartExtendedTestIT.java b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/util/IdeaUtilsIsCamelRouteStartExtendedTestIT.java index c186fda6..7e1dff55 100644 --- a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/util/IdeaUtilsIsCamelRouteStartExtendedTestIT.java +++ b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/util/IdeaUtilsIsCamelRouteStartExtendedTestIT.java @@ -16,12 +16,11 @@ */ package com.github.cameltooling.idea.util; -import com.github.cameltooling.idea.service.CamelService; +import com.github.cameltooling.idea.CamelLightCodeInsightFixtureTestCaseIT; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLiteralExpression; -import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; -public class IdeaUtilsIsCamelRouteStartExtendedTestIT extends LightJavaCodeInsightFixtureTestCase { +public class IdeaUtilsIsCamelRouteStartExtendedTestIT extends CamelLightCodeInsightFixtureTestCaseIT { private static final String CODE = "import org.apache.camel.builder.RouteBuilder;\n" + "\n" @@ -40,17 +39,6 @@ public class IdeaUtilsIsCamelRouteStartExtendedTestIT extends LightJavaCodeInsig + "\n" + "}\n"; - @Override - protected void setUp() throws Exception { - super.setUp(); - myFixture.getProject().getService(CamelService.class).setCamelPresent(true); - } - - @Override - protected String getTestDataPath() { - return "src/test/resources/testData/"; - } - public void testStartRoute() { // caret is at start of rout in the test java file myFixture.configureByText("DummyTestData.java", CODE); diff --git a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/util/IdeaUtilsIsCamelRouteStartTestIT.java b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/util/IdeaUtilsIsCamelRouteStartTestIT.java index 498b4d4f..1b682b74 100644 --- a/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/util/IdeaUtilsIsCamelRouteStartTestIT.java +++ b/camel-idea-plugin/src/test/java/com/github/cameltooling/idea/util/IdeaUtilsIsCamelRouteStartTestIT.java @@ -19,16 +19,15 @@ import java.util.ArrayList; import java.util.List; -import com.github.cameltooling.idea.service.CamelService; +import com.github.cameltooling.idea.CamelLightCodeInsightFixtureTestCaseIT; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiLiteralExpression; import com.intellij.psi.PsiReferenceExpression; import com.intellij.psi.PsiVariable; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; -public class IdeaUtilsIsCamelRouteStartTestIT extends LightJavaCodeInsightFixtureTestCase { +public class IdeaUtilsIsCamelRouteStartTestIT extends CamelLightCodeInsightFixtureTestCaseIT { private static final String CODE = "import org.apache.camel.builder.RouteBuilder;\n" + "\n" @@ -69,17 +68,6 @@ public class IdeaUtilsIsCamelRouteStartTestIT extends LightJavaCodeInsightFixtur + "\n" + "}\n"; - @Override - protected void setUp() throws Exception { - super.setUp(); - myFixture.getProject().getService(CamelService.class).setCamelPresent(true); - } - - @Override - protected String getTestDataPath() { - return "src/test/resources/testData/"; - } - public void testStartRoute() { // caret is at start of rout in the test java file myFixture.configureByText("DummyTestData.java", CODE); diff --git a/gradle.properties b/gradle.properties index 8a2f6ec9..6f8b59fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ camelVersion = 4.5.0 camelQuarkusVersion = 3.9.0 -camelKameletVersion = 4.4.1 +camelKameletVersion = 4.5.0 camelKarafVersion = 3.22.1 -ideaVersion=2023.3.6 +ideaVersion=2024.1 mavenResolverVersion=1.9.18 \ No newline at end of file