Skip to content

Commit

Permalink
Merge branch 'release/v0.2.0' into feature/IJMP-1710-declarative-conn…
Browse files Browse the repository at this point in the history
…ection-error

Signed-off-by: Anatoli Kalbasin <[email protected]>
  • Loading branch information
callbacksin authored Sep 18, 2024
2 parents 5f4444d + 1227d47 commit 762f5bb
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inputs:
jdkVersion:
description: "JDK version"
required: false
default: "11"
default: "17"
mavenVersion:
description: "Maven version"
required: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/hpi-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
cache: maven

- name: Build Jenkins Plugin into .hpi
Expand Down Expand Up @@ -52,9 +52,9 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
cache: maven

- name: Run Unit Tests with Maven
shell: bash
run: ./mvnw test
run: ./mvnw test
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
* Copyright IBA Group 2022
*/

buildPlugin(useContainerAgent: true, tests: [[skip: 'true']], configurations: [[ platform: 'linux', jdk: '11' ]])
buildPlugin(useContainerAgent: true, tests: [[skip: 'true']], configurations: [[ platform: 'linux', jdk: '17' ]])
24 changes: 17 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,27 @@
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.414.3</jenkins.version>
<java.version>17</java.version>
<kotlin.version>1.8.21</kotlin.version>
<kotlin.version>1.9.20</kotlin.version>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
<sezpoz.version>1.13</sezpoz.version>
<okhttp3.version>4.10.0</okhttp3.version>
<zowekotlinsdk.version>0.5.0-rc.1</zowekotlinsdk.version>
<zowekotlinsdk.version>0.5.0-rc.11</zowekotlinsdk.version>
<kotest.version>5.6.1</kotest.version>
<kotlin.code.style>official</kotlin.code.style>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
<kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spotbugs.threshold>High</spotbugs.threshold>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>

<sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
<sonar.organization>zowe</sonar.organization>
<sonar.projectKey>zowe_zowe-zdevops-jenkins-plugin</sonar.projectKey>
<sonar.projectName>zowe-zdevops-jenkins-plugin</sonar.projectName>
<sonar.projectVersion>project.version</sonar.projectVersion>
<sonar.language>kotlin</sonar.language>
<sonar.links.scm>https://github.com/zowe/zowe-zdevops-jenkins-plugin</sonar.links.scm>

<maven.compiler.release>17</maven.compiler.release>
</properties>

<licenses>
Expand Down Expand Up @@ -133,7 +143,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
<configuration>
<source>17</source>
<target>17</target>
Expand Down Expand Up @@ -302,19 +312,19 @@
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>retrofit</artifactId>
<version>2.9.0</version>
<version>2.11.0</version>
</dependency>

<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>converter-gson</artifactId>
<version>2.9.0</version>
<version>2.11.0</version>
</dependency>

<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>converter-scalars</artifactId>
<version>2.9.0</version>
<version>2.11.0</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 762f5bb

Please sign in to comment.