Skip to content

Commit

Permalink
Merge branch 'master' into snyk-fix-d2d6a3da6e848f711116327387e8ed01
Browse files Browse the repository at this point in the history
  • Loading branch information
malice00 authored Jan 18, 2025
2 parents c721143 + f46a581 commit ad11306
Show file tree
Hide file tree
Showing 34 changed files with 20,999 additions and 7,583 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @jenkinsci/calendar-view-plugin-developers
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
---
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
6 changes: 6 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
---
_extends: .github
name-template: v$NEXT_PATCH_VERSION
tag-template: v$NEXT_PATCH_VERSION
version-template: v$MAJOR.$MINOR.$PATCH
24 changes: 24 additions & 0 deletions .github/workflows/jenkins-security-scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Jenkins Security Scan
# For more information, see: https://www.jenkins.io/doc/developer/security/scan/
---
name: Jenkins Security Scan

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

permissions:
security-events: write
contents: read
actions: read

jobs:
security-scan:
uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
with:
java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
# java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.
16 changes: 16 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Automates creation of Release Drafts using Release Drafter
# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
---
on:
push:
branches:
- master

jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7 changes: 7 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.8</version>
</extension>
</extensions>
2 changes: 2 additions & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
1 change: 0 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties

This file was deleted.

Empty file added .mvn_exec_node
Empty file.
26 changes: 8 additions & 18 deletions .pmd.config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

<rule ref="category/java/bestpractices.xml">
<exclude name="AccessorMethodGeneration" />
<exclude name="AvoidReassigningLoopVariables" />
<exclude name="WhileLoopWithLiteralBoolean" />
</rule>
<rule ref="category/java/codestyle.xml">
<!-- Operator precedence is hard and parentheses enhance readability -->
Expand All @@ -25,31 +27,19 @@
<exclude name="AtLeastOneConstructor" />
<!-- This complains about variable names like 'id' -->
<exclude name="ShortVariable" />
<!-- This rule makes no sense -->
<exclude name="AvoidFinalLocalVariable" />
</rule>
<rule ref="category/java/design.xml">
<exclude name="CognitiveComplexity" />
<!-- "Tell, don't ask" is a good design principle,
but this rule is way too strict about it -->
<exclude name="LawOfDemeter" />
<exclude name="LoosePackageCoupling" />
</rule>
<rule ref="category/java/design.xml/NcssCount">
<!-- Default values too low in PMD 6.4.0, fixed in PMD 6.5.0 -->
<properties>
<property name="methodReportLevel" value="60"/>
<property name="classReportLevel" value="1000"/>
</properties>
</rule>
<rule ref="category/java/errorprone.xml">
<!-- Produces lots of false positives and the Java
compiler catches most of these anyway -->
<exclude name="DataflowAnomalyAnalysis"/>
<!-- Produces lots of false positives because it
doesn't check if Serializable is implemented -->
<exclude name="BeanMembersShouldSerialize" />
</rule>
<rule ref="category/java/errorprone.xml"/>
<rule ref="category/java/multithreading.xml"/>
<rule ref="category/java/performance.xml"/>
<rule ref="category/java/performance.xml">
<exclude name="AvoidCalendarDateCreation" />
</rule>
<rule ref="category/java/security.xml"/>

</ruleset>
10 changes: 0 additions & 10 deletions .travis.yml

This file was deleted.

5 changes: 4 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
buildPlugin(platforms: ['linux'])
buildPlugin(useContainerAgent: true, configurations: [
[platform: 'linux', jdk: 21],
[platform: 'linux', jdk: 17],
])
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,21 @@ Clicking on a future build will lead to the job's detail page.
Clone the repository then execute the following in the project's root directory:

```
$ ./mvnw install
$ mvn install
```

This will install Java dependencies as well as a local node installation and npm dependencies.

You can now run the plugin in a Jenkins instance by executing the following:

```
$ ./mvnw hpi:run
$ mvn hpi:run
```

To watch JavaScript and CSS files using webpack:

```
$ ./npmw run dev
$ npm run dev
```

## Use Calendar View with Job DSL
Expand Down
Loading

0 comments on commit ad11306

Please sign in to comment.