Skip to content

Commit

Permalink
feat: #64 Move to Java 17 and Jenkins 4.85
Browse files Browse the repository at this point in the history
  • Loading branch information
lbroudoux committed Oct 21, 2024
1 parent 5827a6e commit 7b53f61
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 21 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ on:
- '.gitignore'
- 'LICENSE'
- '*.md'

permissions: read-all
jobs:
build-verify-package:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up JDK 8 for x64
uses: actions/setup-java@v2
- name: Set up JDK 17 for x64
uses: actions/setup-java@v4
with:
java-version: '8'
java-version: '17'
distribution: 'adopt'
architecture: x64
cache: maven
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ buildNumber.properties

# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
!/.mvn/wrapper/maven-wrapper.jar

# Ignore all .iml files
*.iml
1 change: 0 additions & 1 deletion .java-version

This file was deleted.

43 changes: 28 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
<version>1.580.1</version>
<version>4.85</version>
<relativePath />
</parent>

<groupId>io.github.microcks</groupId>
<artifactId>microcks-jenkins-plugin</artifactId>
<version>0.5.1-SNAPSHOT</version>
<version>0.6.0-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>Microcks Jenkins Plugin</name>
Expand Down Expand Up @@ -42,7 +42,7 @@
<scm>
<connection>scm:git:https://github.com/microcks/microcks-jenkins-plugin.git</connection>
<developerConnection>scm:git:https://github.com/microcks/microcks-jenkins-plugin.git</developerConnection>
<url>http://github.com/microcks/microcks-jenkins-plugin/</url>
<url>https://github.com/microcks/microcks-jenkins-plugin/</url>
<tag>HEAD</tag>
</scm>

Expand All @@ -59,36 +59,48 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<jenkins-core.version>1.651</jenkins-core.version>
<jenkins-workflow.version>1.11</jenkins-workflow.version>
<java.version>17</java.version>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.version>2.440.3</jenkins.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.440.x</artifactId>
<version>3193.v330d8248d39e</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-core</artifactId>
<version>${jenkins-core.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>${jenkins-workflow.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.8.1</version>
<version>4.12.0</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>1.9.10</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.11.1</version>
<version>2.17.0</version>
</dependency>
</dependencies>

Expand All @@ -97,6 +109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand Down

0 comments on commit 7b53f61

Please sign in to comment.