Allan Barcelos 4 månader sedan
förälder
incheckning
9bc145d9c0
6 ändrade filer med 42 tillägg och 57 borttagningar
  1. 0 19
      .github/release-drafter.yml
  2. 34 0
      .github/workflows/cd.yaml
  3. 0 22
      .github/workflows/release-drafter.yml
  4. 1 0
      .mvn/maven.config
  5. 1 1
      Jenkinsfile
  6. 6 15
      pom.xml

+ 0 - 19
.github/release-drafter.yml

@@ -1,19 +0,0 @@
-name-template: 'MFA Google Auth Plugin v$RESOLVED_VERSION'
-tag-template: 'mfa-google-auth-plugin-$RESOLVED_VERSION'
-categories:
-  - title: Features
-    labels:
-      - enhancement
-  - title: Fixes
-    labels:
-      - bug
-  - title: Maintenance
-    labels:
-      - chore
-change-template: '- $TITLE (#$NUMBER) @$AUTHOR'
-no-changes-template: '- No changes'
-template: |
-  ## Changes
-  $CHANGES
-
-  Thanks to all contributors!

+ 34 - 0
.github/workflows/cd.yaml

@@ -0,0 +1,34 @@
+---
+# https://github.com/jenkinsci/.github/blob/master/workflow-templates/cd.yaml
+name: cd
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+          server-id: maven.jenkins-ci.org
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_TOKEN
+      - name: Release
+        run: mvn --batch-mode -Dset.changelist -DskipTests deploy
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+ 0 - 22
.github/workflows/release-drafter.yml

@@ -1,22 +0,0 @@
-# Automates creation of Release Drafts using Release Drafter
-# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
----
-name: Release Drafter
-
-on:
-  push:
-    branches:
-      - master
-      - main
-
-permissions:
-  contents: write
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      # Drafts your next Release notes as Pull Requests are merged into the default branch
-      - uses: release-drafter/release-drafter@v7
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+ 1 - 0
.mvn/maven.config

@@ -1,2 +1,3 @@
 -Pconsume-incrementals
 -Pmight-produce-incrementals
+-Dchangelist.format=%d.v%s

+ 1 - 1
Jenkinsfile

@@ -7,5 +7,5 @@ buildPlugin(
   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
     [platform: 'linux', jdk: 21],
-    [platform: 'windows', jdk: 17],
+    [platform: 'windows', jdk: 21],
 ])

+ 6 - 15
pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.26</version>
+    <version>6.2152.ve00a_731c3ce9</version>
     <relativePath />
   </parent>
 
@@ -34,30 +34,21 @@
 
   <properties>
     <revision>1.0</revision>
-    <changelist />
-    <jenkins.baseline>2.479</jenkins.baseline>
+    <changelist>999999-SNAPSHOT</changelist>
+    <jenkins.baseline>2.528</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.3</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <spotless.check.skip>false</spotless.check.skip>
     <security.reporting>https://www.jenkins.io/security/#reporting-vulnerabilities</security.reporting>
     <security.team>[email protected]</security.team>
+    <hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
+    <ban-deprecated-stapler.skip>false</ban-deprecated-stapler.skip>
+    <ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
     <!-- Library versions -->
     <otpjava.version>2.1.0</otpjava.version>
     <zxing.version>3.5.3</zxing.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>5054.v620b_5d2b_d5e6</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <!-- TOTP Implementation -->
     <dependency>