Merge pull request #175 from jenkinsci/update-baseline-to-2022

Update IntelliJ baseline to 2022
jenkinsci · Jan 23, 2024 · d6dd0a1 · d6dd0a1
2 parents 580de5f + bfb5a37
commit d6dd0a1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/...idea-stapler-plugin [runIde 2022].run.xml → ...idea-stapler-plugin [runIde 2023].run.xml b/...idea-stapler-plugin [runIde 2022].run.xml → ...idea-stapler-plugin [runIde 2023].run.xml
@@ -1,10 +1,10 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="idea-stapler-plugin [runIde 2022]" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="idea-stapler-plugin [runIde 2023]" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PideaVersion=2022.2.3" />
+      <option name="scriptParameters" value="-PideaVersion=2023.2.5" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -18,6 +18,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/idea-stapler-plugin [runIde IU].run.xml b/.run/idea-stapler-plugin [runIde IU].run.xml
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-PideaType=IU -PideaVersion=2022.2.3" />
+      <option name="scriptParameters" value="-PideaType=IU -PideaVersion=2023.2.5" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -18,6 +18,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
                                 if (isUnix()) {
                                     command = "./${command}"
                                 }
-                                infra.runWithJava(command, "11", extraEnv)
+                                infra.runWithJava(command, "17", extraEnv)
                             }
                         }
                         post {
@@ -49,7 +49,7 @@ pipeline {
                                 if (isUnix()) {
                                     command = "./" + command
                                 }
-                                infra.runWithJava(command, "11", extraEnv)
+                                infra.runWithJava(command, "17", extraEnv)
                             }
                             archiveArtifacts artifacts: '**/build/reports/pluginVerifier/**', fingerprint: false
                             // Look for presence of compatibility warnings or problems

diff --git a/build.gradle b/build.gradle
@@ -3,15 +3,15 @@ import java.util.stream.Collectors
 
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '1.15.0'
+    id 'org.jetbrains.intellij' version '1.17.0'
 }
 
 group = "org.kohsuke.stapler.idea"
-version = "3.0.2"
+version = "3.0.3-SNAPSHOT"
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
@@ -58,10 +58,11 @@ intellij {
 }
 
 patchPluginXml {
-    sinceBuild = "213.00"
+    sinceBuild = "223.00"
     untilBuild = ""
     pluginDescription = extractPluginDescription()
     changeNotes = """
+      <h3>3.0.3-SNAPSHOT</h3>
       <h3>3.0.2</h3>
       <ul>
         <li>✍️ Usages of Apache commons-lang2 are removed for IntelliJ compatibility reasons</li>

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # used for intellij build, see https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-version 
-ideaVersion=2021.3
+ideaVersion=2022.3
 # specific property for runPluginVerifier to override during runtime `-PsinceIdeaVersion=2022.1`
 sinceIdeaVersion=
 # see https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type for list of accepted types