Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature merge from origin master #2

Merged
merged 165 commits into from
May 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
5043f1f
[JENKINS-66299] Prepare Build Monitor View for core Guava upgrade
basil Aug 8, 2021
c529644
Corrected gitignore
jan-molak Sep 17, 2021
ed3479d
Created a basic pipeline
jan-molak Sep 17, 2021
ba9b147
Renamed main worflow so that it aligns with GitHub conventions
jan-molak Sep 17, 2021
57a15e1
Auto-download chromedriver
jan-molak Sep 17, 2021
e2f2baa
Updated Serenity BDD
jan-molak Sep 17, 2021
432856e
Added the new build badge
jan-molak Sep 17, 2021
cad7902
Use HTTPS URLs in `package-lock.json`
basil Sep 18, 2021
109fd60
Update baseline to 2.249.3 (#483)
basil Sep 19, 2021
82b51dc
Prefer library versions from less4j to minimize risk
basil Sep 19, 2021
45d3f82
ci: set the version number automatically
jan-molak Sep 26, 2021
694b855
Read new version into env
jan-molak Sep 26, 2021
6e5eefd
print new version in the log
jan-molak Sep 26, 2021
1152c0f
ci: corrected the order of steps in the pipeline
jan-molak Sep 26, 2021
ede5847
ci: automatically create a release branch
jan-molak Sep 26, 2021
a7505ad
ci: configure git for automated release branch creation
jan-molak Sep 26, 2021
8461557
ci: corrected a typo
jan-molak Sep 26, 2021
aca07fe
ci: corrected git checkout
jan-molak Sep 26, 2021
d17e553
Prepeared for the release
jan-molak Sep 26, 2021
d487c6f
configure release profile
jan-molak Sep 30, 2021
01dcf2c
Added publish step
jan-molak Sep 30, 2021
a8def3c
Corrected release config
jan-molak Sep 30, 2021
abd00a5
Corrected registry url
jan-molak Sep 30, 2021
eb310f6
Corrected path to POM
jan-molak Sep 30, 2021
e7f4513
Corrected registry url
jan-molak Sep 30, 2021
1b22743
Corrected the publish command
jan-molak Sep 30, 2021
fec7bfe
Correct distribution management url
timja Oct 1, 2021
e37d777
Update main.yaml
timja Oct 1, 2021
30c2311
Removed the unused travis config
jan-molak Oct 1, 2021
f1ba50a
Removed the unused travis config
jan-molak Oct 1, 2021
dc73f09
Merge branch 'timja-patch-1'
jan-molak Oct 1, 2021
09441c2
Corrected release script
jan-molak Oct 1, 2021
d2064f7
Debug maven release process
jan-molak Oct 1, 2021
aabe753
Corrected config
jan-molak Oct 1, 2021
f4fc9ca
Set path to settings
jan-molak Oct 1, 2021
098711e
Ensure env variables are passed to the release script
jan-molak Oct 1, 2021
27cee3c
fix the acceptance tests
dcendents Nov 18, 2021
2afa73f
Merge pull request #426 from dcendents/build-windows
jan-molak Nov 18, 2021
b945ba2
fix the remaining acceptance tests on latest
dcendents Nov 18, 2021
0aa62f9
Merge pull request #493 from dcendents/build-windows2
jan-molak Nov 18, 2021
b68ffbf
move acceptance tests in a single project
dcendents Nov 18, 2021
4c82639
refactor acceptance tests with parameters for jenkins versions to test
dcendents Nov 18, 2021
3d1bd07
renaming class to BuildMonitorAcceptanceTest
dcendents Nov 19, 2021
0d50db8
Merge pull request #495 from dcendents/refactor-acceptance-tests
jan-molak Nov 19, 2021
a1c8a40
update to jenkins 2.289.1, use java.util.function.Predicate
dcendents Nov 19, 2021
2629889
Remove all usages of Guava
basil Nov 20, 2021
9cf178b
Merge pull request #496 from basil/guava
basil Nov 20, 2021
3c59277
Remove PowerMock
basil Nov 20, 2021
aaa2ec9
Add Dependabot configuration
basil Nov 20, 2021
075d4d6
Merge pull request #497 from basil/powermock
basil Nov 20, 2021
9c6e2ec
Increase open pull requests limit
basil Nov 20, 2021
eefbbe5
Ignore Jetty for now
basil Nov 20, 2021
216aa3b
Bump joda-time from 2.10.5 to 2.10.13
dependabot[bot] Nov 20, 2021
bd57ffa
Bump bytebuddy.version from 1.11.19 to 1.12.1
dependabot[bot] Nov 20, 2021
2ad6503
Bump jacoco-maven-plugin from 0.6.4.201312101107 to 0.8.7
dependabot[bot] Nov 20, 2021
37c98f6
Bump xstream from 1.4.17 to 1.4.18 in /build-monitor-acceptance
dependabot[bot] Nov 20, 2021
4daefa1
Bump buildgraph-view from 1.0 to 1.3
basil Nov 20, 2021
3d17040
Bump claim from 2.8 to 2.18.2 in /build-monitor-plugin
dependabot[bot] Nov 20, 2021
5751eb1
Upgrade Jackson to latest
basil Nov 20, 2021
fdde6d9
Merge pull request #504 from basil/dependencies
basil Nov 20, 2021
1c28569
Ignore CLI
basil Nov 20, 2021
a640e4b
Bump slf4j-simple from 1.7.19 to 1.7.32
dependabot[bot] Nov 20, 2021
7efc835
Bump less4j from 1.8.0 to 1.17.2
dependabot[bot] Nov 20, 2021
99b8d99
Bump view-job-filters from 1.26 to 2.3
dependabot[bot] Nov 20, 2021
59f4353
Bump release-candidate-maven-plugin
dependabot[bot] Nov 20, 2021
bdccf29
Bump badge from 1.2 to 1.9
dependabot[bot] Nov 20, 2021
cd492b2
Merge pull request #513 from basil/dependencies
basil Nov 20, 2021
2bb467b
Bump maven-aether-provider from 3.2.5 to 3.3.9 (#511)
dependabot[bot] Nov 20, 2021
c05fcbf
Bump http-proxy from 1.17.0 to 1.18.1 in /build-monitor-plugin
dependabot[bot] Nov 20, 2021
3f5e207
transform less to css at compile time instead of runtime
dcendents Nov 21, 2021
43b8d45
Remove unnecessary dependencies
basil Nov 21, 2021
bf7a87c
Remove unused phantomjs dependency
basil Nov 21, 2021
1ec8a88
Remove unnecessary optional dependencies
basil Nov 21, 2021
d8bfee0
Remove optional dependency on buildgraph-view
basil Nov 21, 2021
cf334c2
Merge pull request #517 from basil/compile_less
basil Nov 22, 2021
d282354
Reduce usages of deprecated methods
basil Nov 22, 2021
e3ae42e
Replace C-style array declaration with Java-style array declaration
basil Nov 22, 2021
dfa6a57
Replace Optional.isPresent with functional-style expression
basil Nov 22, 2021
e2aafce
Use StandardCharsets where possible
basil Nov 22, 2021
7c46729
Remove redundant "extends Object"
basil Nov 22, 2021
633f5e3
Remove pointless Javadocs
basil Nov 22, 2021
d87123a
Fuse more statements into Stream API
basil Nov 22, 2021
f4eb44a
Fix String.format errors
basil Nov 22, 2021
f3ef085
Remove unnecessary throws
basil Nov 22, 2021
818af2a
Use enhanced for where possible
basil Nov 22, 2021
13170d4
Remove unnecessary boxing and unboxing
basil Nov 22, 2021
9c4e96d
Use try-with-resources where possible
basil Nov 22, 2021
42b99de
Use diamond operator where possible
basil Nov 22, 2021
cedffad
Remove unused imports
basil Nov 22, 2021
e86de88
Replace anonymous type with lambda
basil Nov 22, 2021
fc9eeb4
Replace Collections.sort with List.sort
basil Nov 22, 2021
d811e71
Simplify Map operations
basil Nov 22, 2021
eb47da9
Use Long.compare where possible
basil Nov 22, 2021
fb2aa02
Use Collections.singletonList where possible
basil Nov 22, 2021
dcf7ebf
Arrays of wisdom of the ancients
basil Nov 22, 2021
4c68818
Remove more unused imports
basil Nov 22, 2021
c899382
Remove redundant toString() call
basil Nov 22, 2021
8e76405
Merge pull request #519 from basil/improvements
basil Nov 22, 2021
203c549
Improve acceptance tests speed (#516)
dcendents Nov 24, 2021
306e76f
Badge settings (#372)
dcendents Nov 25, 2021
e3c9830
Bump bytebuddy.version from 1.12.1 to 1.12.2 (#521)
dependabot[bot] Nov 29, 2021
f96c40b
Publish Parent POM during release (#522)
rahulsom Dec 1, 2021
3345374
Merge pull request #462 from jan-molak/dependabot/npm_and_yarn/build-…
jan-molak Dec 1, 2021
59400fc
Miscellaneous code cleanup (#523)
basil Dec 2, 2021
c69b2b0
Publish JAR in addition to HPI (#524)
rahulsom Dec 3, 2021
3c6b344
Set classifier to empty for jar (#525)
rahulsom Dec 3, 2021
be9e0dc
Bump bom-2.289.x from 1013.vf8058992a042 to 1036.v9f5a1aba8fab
dependabot[bot] Dec 6, 2021
c2c11db
Bump bytebuddy.version from 1.12.2 to 1.12.3 (#527)
dependabot[bot] Dec 6, 2021
d125b8f
Merge pull request #528 from jan-molak/dependabot/maven/io.jenkins.to…
dependabot[bot] Dec 6, 2021
b0b1a78
Bump bom-2.289.x from 1036.v9f5a1aba8fab to 1055.v9637a690f734 (#533)
dependabot[bot] Dec 20, 2021
2cbe2ca
Bump bytebuddy.version from 1.12.3 to 1.12.5 (#531)
dependabot[bot] Dec 20, 2021
d75d5e0
Bump `bytebuddy.version` from 1.12.5 to 1.12.6 (#534)
dependabot[bot] Dec 27, 2021
5cb2487
Bump plugin from 4.31 to 4.32 (#535)
dependabot[bot] Dec 27, 2021
0182e3b
Bump `frontend-maven-plugin` from 1.12.0 to 1.12.1 (#537)
dependabot[bot] Jan 3, 2022
b107404
Bump `plugin-management-cli` from 2.11.1 to 2.12.1 (#538)
dependabot[bot] Jan 3, 2022
b20a6f2
Bump `bom-2.289.x` from 1055.v9637a690f734 to 1075.v14bef33e5d7b (#539)
dependabot[bot] Jan 3, 2022
db43467
Bump `plugin` from 4.32 to 4.33 (#541)
dependabot[bot] Jan 10, 2022
8020a3e
Bump `bom-2.289.x` from 1075.v14bef33e5d7b to 1090.v0a_33df40457a_ (#…
dependabot[bot] Jan 10, 2022
da34eaf
Bump `plugin-management-cli` from 2.12.1 to 2.12.3 (#547)
dependabot[bot] Jan 17, 2022
33cf73f
Bump `bytebuddy.version` from 1.12.6 to 1.12.7 (#546)
dependabot[bot] Jan 17, 2022
c318e31
Bump `badge` from 1.9 to 1.9.1 (#544)
dependabot[bot] Jan 17, 2022
5509fce
Bump `slf4j.version` from 1.7.32 to 1.7.33 (#545)
dependabot[bot] Jan 17, 2022
875c23e
fix acceptance tests (#548)
dcendents Jan 20, 2022
0492580
Ignore annotation API updates
basil Jan 20, 2022
be17c32
Ignore Enforcer warnings for annotation API (#550)
basil Jan 20, 2022
ec4452f
Bump `bom-2.289.x` from 1090.v0a_33df40457a_ to 1117.v62a_f6a_01de98 …
dependabot[bot] Jan 22, 2022
5dbe604
Bump `bom-2.289.x` from 1117.v62a_f6a_01de98 to 1135.va_4eeca_ea_21c1…
dependabot[bot] Jan 31, 2022
2bbbfa2
Bump SLF4J from 1.7.33 to 1.7.35 (#553)
dependabot[bot] Jan 31, 2022
9ad2338
Bump XStream from 1.4.18 to 1.4.19 (#555)
dependabot[bot] Jan 31, 2022
92d8cd5
Bump Guice from 5.0.1 to 5.1.0 (#557)
dependabot[bot] Jan 31, 2022
d251f4f
Bump `ini` from 1.3.5 to 1.3.8 in `/build-monitor-plugin` (#558)
dependabot[bot] Jan 31, 2022
d1bb7e0
Bump bom-2.289.x from 1135.va_4eeca_ea_21c1 to 1148.v7261f385f859 (#560)
dependabot[bot] Feb 7, 2022
725ec0c
Bump Serenity from 2.4.51 to 3.2.0 (#564)
dcendents Feb 11, 2022
c9c5774
Clean up POM (#566)
basil Feb 11, 2022
30efe6c
Integration with JUnit Realtime Test Reporter (#542)
dcendents Feb 12, 2022
5759ff8
Replace deprecated `net.serenitybdd.screenplay.Action` with non-depre…
basil Feb 12, 2022
7104b82
Use lambda where possible (#568)
basil Feb 12, 2022
a65ce59
Bump plugin parent POM from 4.33 to 4.34 (#571)
dependabot[bot] Feb 14, 2022
8b33fda
Bump Byte Buddy from 1.12.7 to 1.12.8 (#570)
dependabot[bot] Feb 14, 2022
05e851a
Bump SLF4J from 1.7.35 to 1.7.36 (#572)
dependabot[bot] Feb 14, 2022
d9a599c
Add default settings to Build Monitor Views (#573)
dcendents Feb 15, 2022
e9510c1
Bump plugin parent POM from 4.34 to 4.35 (#574)
dependabot[bot] Feb 21, 2022
dbc58d1
Bump plugin BOM from 1148.v7261f385f859 to 1155.v77b_fd92a_26fc (#575)
dependabot[bot] Feb 21, 2022
84d814e
Bump plugin parent POM from 4.35 to 4.37 (#576)
dependabot[bot] Feb 28, 2022
5c523fa
Bump actions/checkout from 2 to 3 (#577)
dependabot[bot] Mar 1, 2022
6f9d58e
Bump Guava from 31.0.1 to 31.1 (#578)
dependabot[bot] Mar 2, 2022
eb7c419
Bump plugin BOM from 1155.v77b_fd92a_26fc to 1181.v04b_21d4b_0d6c (#581)
dependabot[bot] Mar 7, 2022
0230bd2
Bump bom-2.303.x from 1181.v04b_21d4b_0d6c to 1198.v387c834fca_1a_ (#…
dependabot[bot] Mar 14, 2022
0158d5a
Bump plugin parent POM from 4.37 to 4.38 (#583)
dependabot[bot] Mar 21, 2022
4f1ec02
Bump bom-2.303.x from 1198.v387c834fca_1a_ to 1210.vcd41f6657f03 (#585)
dependabot[bot] Mar 21, 2022
a23666b
Bump Serenity from 3.2.0 to 3.2.1 (#584)
dependabot[bot] Mar 21, 2022
3acf2f2
Bump actions/cache from 2 to 3 (#586)
dependabot[bot] Mar 22, 2022
6b5d2eb
Bump plugin parent POM from 4.38 to 4.39 (#590)
dependabot[bot] Apr 4, 2022
a78204f
Bump Serenity from 3.2.1 to 3.2.3 (#589)
dependabot[bot] Apr 4, 2022
0cdbb34
Bump bom-2.303.x from 1210.vcd41f6657f03 to 1246.va_b_50630c1d19 (#588)
dependabot[bot] Apr 4, 2022
97bd54e
Bump `actions/setup-java` from 2 to 3 (#595)
dependabot[bot] Apr 11, 2022
96759ce
Bump Byte Buddy from 1.12.8 to 1.12.9 (#592)
dependabot[bot] Apr 11, 2022
5dbeb64
Bump JaCoCo Maven Plugin from 0.8.7 to 0.8.8 (#593)
dependabot[bot] Apr 11, 2022
5ffb8ab
Bump `actions/upload-artifact` from 2 to 3 (#594)
dependabot[bot] Apr 11, 2022
cdaefc2
Bump plugin parent POM from 4.39 to 4.40 (#591)
dependabot[bot] Apr 11, 2022
f0809f9
Bump bom-2.303.x from 1246.va_b_50630c1d19 to 1280.vd669827e38cd (#597)
dependabot[bot] Apr 18, 2022
a08470a
Merge remote-tracking branch 'jan-molak/master'
Apr 22, 2022
63283c0
Resolve merge issue
May 2, 2022
976499e
fix warnings
May 2, 2022
4d43b69
fix XPath selectors for BuildMonitorDashboard
May 3, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

github: [ jan-molak ]
25 changes: 25 additions & 0 deletions .github/actions/setup-git/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
inputs:
github_token:
description: 'GitHub Token'
required: true
git_user_email:
description: 'Git user email'
required: true
git_username:
description: 'Git username'
required: true
npm_token:
description: 'NPM Token'
required: true

runs:
using: 'composite'
steps:

- name: Configure Git
shell: bash
run: |
git config --global user.email ${{ inputs.git_user_email }}
git config --global user.name ${{ inputs.git_username }}
git config --global user.password ${{ inputs.github_token }}
git config --global push.default simple
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
ignore:
# This is the minimum Jenkins version
- dependency-name: "org.jenkins-ci.main:cli"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
105 changes: 105 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: Release Pipeline

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
types: [ opened, synchronize ]

jobs:

build:
if: "!contains(github.event.head_commit.message, 'ci skip')"
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
cache: 'maven'

- name: Cache jenkins plugins
uses: actions/cache@v3
with:
path: build-monitor-acceptance/plugin_cache
key: jenkins-plugins-${{ hashFiles('build-monitor-acceptance/pom.xml') }}
restore-keys: |
jenkins-plugins-

- name: Setup git (master only)
uses: ./.github/actions/setup-git
if: github.ref == 'refs/heads/master'
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
git_user_email: ${{ secrets.RELEASE_GH_EMAIL }}
git_username: ${{ secrets.RELEASE_GH_USERNAME }}

- name: Set version (master only)
if: github.ref == 'refs/heads/master'
run: mvn --batch-mode release-candidate:updateVersion

- name: Build with Maven
run: mvn --batch-mode --update-snapshots verify

- name: Read $version (master only)
if: github.ref == 'refs/heads/master'
run: cat build-monitor-plugin/target/classes/build-monitor.properties >> $GITHUB_ENV

- uses: actions/upload-artifact@v3
with:
retention-days: 3
name: artifacts
path: |
build-monitor-plugin/target/*.hpi
pom.xml
build-monitor-plugin/pom.xml
build-monitor-acceptance/pom.xml
build-monitor-acceptance/build-monitor-acceptance-base/pom.xml
build-monitor-acceptance/build-monitor-acceptance-latest/pom.xml
build-monitor-acceptance/build-monitor-acceptance-base/target/failsafe-reports/*-output.txt
build-monitor-acceptance/build-monitor-acceptance-latest/target/failsafe-reports/*-output.txt

- name: Create Release Branch (master only)
if: github.ref == 'refs/heads/master'
run: |
git checkout -b "release-${version}"
git commit -a -m "Release candidate v$version"
git push origin "release-$version"

- name: Setup repo.jenkins-ci.org (master only)
if: github.ref == 'refs/heads/master'
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
cache: 'maven'
server-id: 'repo.jenkins-ci.org'
server-username: JENKINS_REPO_USERNAME
server-password: JENKINS_REPO_TOKEN

- name: Publish (master only)
if: github.ref == 'refs/heads/master'
env:
JENKINS_REPO_USERNAME: ${{ secrets.JENKINS_REPO_USERNAME }}
JENKINS_REPO_TOKEN: ${{ secrets.JENKINS_REPO_TOKEN }}
run: |
mvn --batch-mode deploy:deploy-file \
-DpomFile=build-monitor-plugin/pom.xml \
-Dfile=build-monitor-plugin/target/build-monitor-plugin.hpi \
-Dfiles=build-monitor-plugin/target/build-monitor-plugin.jar \
-Dtypes=jar \
-Dclassifiers="" \
-DrepositoryId=repo.jenkins-ci.org \
-Durl=https://repo.jenkins-ci.org/releases/
mvn --batch-mode deploy:deploy-file \
-DpomFile=pom.xml \
-Dfile=pom.xml \
-DrepositoryId=repo.jenkins-ci.org \
-Durl=https://repo.jenkins-ci.org/releases/
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
.java-version

target
work*
work

node
node_modules
plugin_cache

use-node
.*
.DS_Store

chromedriver.exe

!.travis.yml
!.travis.yml
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Build Monitor Plugin provides a highly visible view of the status of selected Je
It easily accommodates different computer screen sizes and is ideal as an Extreme Feedback Device to be displayed on a screen on your office wall.
(Inspired by the no longer maintained [RadiatorView](https://wiki.jenkins-ci.org/display/JENKINS/Radiator+View+Plugin) plugin).

[![Build Status](https://travis-ci.org/jan-molak/jenkins-build-monitor-plugin.svg?branch=master)](https://travis-ci.org/jan-molak/jenkins-build-monitor-plugin)
[![Build Status](https://github.com/jan-molak/jenkins-build-monitor-plugin/workflows/Release%20Pipeline/badge.svg)](https://github.com/jan-molak/jenkins-build-monitor-plugin/actions)
[![Join the chat at https://gitter.im/jenkins-build-monitor-plugin/Lobby](https://badges.gitter.im/jenkins-build-monitor-plugin/Lobby.svg)](https://gitter.im/jenkins-build-monitor-plugin/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Have a question? Perhaps it's already been answered - check the [FAQ](#faq) section below.
Expand Down
53 changes: 0 additions & 53 deletions build-monitor-acceptance/build-monitor-acceptance-base/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading