From 7de89a9d83fcc625409f62b6ba7921d87074083d Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Thu, 16 Mar 2023 08:57:46 +0000 Subject: [PATCH 1/2] Update postgresql from 42.3.3 to 42.5.4 --- .github/dependabot.yml | 16 ---------------- .github/renovate.json | 13 +++++++++++++ .github/workflows/cd.yaml | 19 +++++++++++++++++++ .mvn/extensions.xml | 7 +++++++ .mvn/maven.config | 3 +++ Jenkinsfile | 7 ++++++- README.md | 10 ++++++++-- pom.xml | 32 +++++++++++++------------------- src/main/resources/index.jelly | 2 +- 9 files changed, 70 insertions(+), 39 deletions(-) delete mode 100644 .github/dependabot.yml create mode 100644 .github/renovate.json create mode 100644 .github/workflows/cd.yaml create mode 100644 .mvn/extensions.xml create mode 100644 .mvn/maven.config diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 5d8f417..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: 2 -updates: - - package-ecosystem: maven - directory: "/" - schedule: - interval: weekly - open-pull-requests-limit: 10 - target-branch: master - reviewers: - - cyrille-leclerc - labels: - - skip-changelog - - package-ecosystem: github-actions - directory: / - schedule: - interval: weekly \ No newline at end of file diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..3febbc0 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base", + ":semanticCommitsDisabled", + "schedule:earlyMondays" + ], + "automerge": true, + "labels": [ + "dependencies" + ], + "rebaseWhen": "conflicted" +} diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml new file mode 100644 index 0000000..f371773 --- /dev/null +++ b/.github/workflows/cd.yaml @@ -0,0 +1,19 @@ +# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins + +name: cd +on: + workflow_dispatch: + check_run: + types: + - completed + +permissions: + checks: read + contents: write + +jobs: + maven-cd: + uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1 + secrets: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..90787cb --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,7 @@ + + + io.jenkins.tools.incrementals + git-changelist-maven-extension + 1.6 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..f7daf60 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,3 @@ +-Pconsume-incrementals +-Pmight-produce-incrementals +-Dchangelist.format=%d.v%s diff --git a/Jenkinsfile b/Jenkinsfile index 0dea7ed..9adf0bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,9 @@ /* * `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */ -buildPlugin() \ No newline at end of file +buildPlugin( + useContainerAgent: true, + configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'linux', jdk: 11], +]) diff --git a/README.md b/README.md index 4debb4e..3e603ea 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ # PostgreSQL API Plugin -This plugin is a shared library. It provides the PostgreSQL jar so that other plugins can consume PostgreSQL without duplication and without classpath collisions. +This is a driver plugin for Database plugin that adds a PostgreSQL database driver. -See the [Plugin Wiki](https://wiki.jenkins-ci.org/display/JENKINS/PostgreSQL+Plugin) for release information and documentation. +## Contributing + +Refer to our [contribution guidelines](https://github.com/jenkinsci/.github/blob/master/CONTRIBUTING.md) + +## LICENSE + +Licensed under MIT, see [LICENSE](LICENSE) diff --git a/pom.xml b/pom.xml index 1114a5e..50b1671 100644 --- a/pom.xml +++ b/pom.xml @@ -5,44 +5,38 @@ org.jenkins-ci.plugins plugin - 4.33 + 4.56 io.jenkins.plugins postgresql-api - 42.3.4-SNAPSHOT + ${changelist} hpi PostgreSQL API Plugin - https://wiki.jenkins-ci.org/display/JENKINS/PostgreSQL+API+Plugin + https://github.com/jenkinsci/postgresql-api-plugin - 2.277.1 - 8 + 999999-SNAPSHOT + jenkinsci/postgresql-api-plugin + 2.387.1 org.postgresql postgresql - 42.3.3 + 42.5.4 - - scm:git:git@github.com:jenkinsci/postgresql-api-plugin.git - scm:git:git@github.com:jenkinsci/postgresql-api-plugin.git - - HEAD + + scm:git:https://github.com/${gitHubRepo} + scm:git:https://github.com/${gitHubRepo} + ${scmTag} + https://github.com/${gitHubRepo} - - - cleclerc - Cyrille Le Clerc - cleclerc@cloudbees.com - - repo.jenkins-ci.org @@ -58,7 +52,7 @@ MIT License - http://opensource.org/licenses/MIT + https://opensource.org/licenses/MIT diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly index bf0d15d..b395376 100644 --- a/src/main/resources/index.jelly +++ b/src/main/resources/index.jelly @@ -24,5 +24,5 @@ THE SOFTWARE. -->
- This plugin is a shared library. It provides the PosrtgreSQL jar so that other plugins can consume PosrtgreSQL without duplication and without classpath collisions. + This plugin is a shared library. It provides the PostgreSQL jar so that other plugins can consume PostgreSQL without duplication and without classpath collisions.
From c138182060f4fc7ff4ca6c8e240798286acc5397 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Thu, 16 Mar 2023 09:00:38 +0000 Subject: [PATCH 2/2] Add CODEOWNERS --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..3c00855 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @jenkinsci/postgresql-api-plugin-developers