Skip to content

Commit

Permalink
Merge pull request #272 from jenkinsci/java-11
Browse files Browse the repository at this point in the history
Require Java 11 & Jenkins 2.361 LTS baseline
  • Loading branch information
TobiX authored Jan 28, 2023
2 parents 0914c27 + cef405c commit 9ff2ae6
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
17 changes: 10 additions & 7 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!groovy
def recentLTS = '2.361.2'
buildPlugin(configurations: [
[ platform: 'linux', jdk: '8', jenkins: null ],
[ platform: 'windows', jdk: '11', jenkins: recentLTS ],
[ platform: 'linux', jdk: '11', jenkins: recentLTS ],
[ platform: 'linux', jdk: '17', jenkins: recentLTS ],
])
def recentLTS = '2.375.2'
buildPlugin(
// Container agents start faster and are easier to administer
useContainerAgent: true,
configurations: [
[platform: 'linux', jdk: '11'],
[platform: 'linux', jdk: '17', jenkins: recentLTS],
[platform: 'windows', jdk: '17', jenkins: recentLTS],
]
)
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copyright (c) 2009-2010 Peter Hayes
Copyright (c) 2010-2016 Marco Ambu
Copyright (c) 2018-2019 TobiX
Copyright (c) 2018-2023 TobiX

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[![Jenkins Plugin](https://img.shields.io/jenkins/plugin/v/dashboard-view.svg)](https://plugins.jenkins.io/dashboard-view)
[![GitHub release](https://img.shields.io/github/release/jenkinsci/dashboard-view-plugin.svg?label=release)](https://github.com/jenkinsci/dashboard-view-plugin/releases/latest)
[![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/dashboard-view.svg?color=blue)](https://plugins.jenkins.io/dashboard-view)
[![Maintenance](https://img.shields.io/maintenance/yes/2023.svg)]()

This plugin contributes a new view implementation that provides a dashboard /
portal-like view for your Jenkins instance.
Expand Down Expand Up @@ -126,7 +127,7 @@ If you have the proper environment, typing:
should create a plugin as `target/*.hpi`, which you can install in your Jenkins
instance. Running

$ mvn hpi:run -Djenkins.version=2.164.1
$ mvn hpi:run -Djenkins.version=2.375.2

allows you to spin up a test Jenkins instance on [localhost] to test your
local changes before commiting.
Expand Down
14 changes: 5 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.49</version>
<version>4.54</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -43,16 +43,16 @@
<revision>2</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<jenkins.version>2.332.4</jenkins.version>
<jenkins.version>2.361.4</jenkins.version>
</properties>

<!-- For RequireUpperBoundDeps -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.332.x</artifactId>
<version>1654.vcb_69d035fa_20</version>
<artifactId>bom-2.361.x</artifactId>
<version>1798.vc671fe94856f</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -147,11 +147,7 @@
<endWithNewline />
<importOrder />
<removeUnusedImports />
<googleJavaFormat>
<!-- Last version that supports Java 8, the plugin does handle this internally
but it will give different versions based off of the JVM version, not good for CI -->
<version>1.7</version>
</googleJavaFormat>
<googleJavaFormat />
</java>
<pom>
<sortPom>
Expand Down

0 comments on commit 9ff2ae6

Please sign in to comment.