Merge pull request #328 from basil/refresh

Refresh plugin for August 2023
jenkinsci · Jan 24, 2024 · 0d78fcf · 0d78fcf
2 parents 0192887 + abc3416
commit 0d78fcf
Show file tree

Hide file tree

Showing 11 changed files with 115 additions and 73 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @jenkinsci/amazon-ecs-plugin-developers
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# 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: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -0,0 +1,4 @@
+# https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
+---
+_extends: .github
+tag-template: amazon-ecs-$NEXT_MINOR_VERSION
diff --git a/.github/workflows/jenkins-security-scan.yml b/.github/workflows/jenkins-security-scan.yml
@@ -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'
+ java-version: 17
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -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@v5
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -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.7</version>
+ </extension>
+</extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1,4 @@
-buildPlugin()
+buildPlugin(useContainerAgent: true, configurations: [
+ [platform: 'linux', jdk: 21],
+ [platform: 'windows', jdk: 17],
+])
diff --git a/pom.xml b/pom.xml
@@ -21,25 +21,30 @@
  <parent>
  <groupId>org.jenkins-ci.plugins</groupId>
  <artifactId>plugin</artifactId>
- <version>4.31</version>
+ <version>4.72</version>
  <relativePath />
  </parent>
 
  <groupId>com.cloudbees.jenkins.plugins</groupId>
  <artifactId>amazon-ecs</artifactId>
- <version>1.49-SNAPSHOT</version>
+ <version>${revision}${changelist}</version>
  <packaging>hpi</packaging>
  <name>Amazon Elastic Container Service (ECS) / Fargate plugin</name>
  <description>Jenkins plugin to run dynamic agents in a Amazon ECS/Docker environment</description>
- <url>https://github.com/jenkinsci/amazon-ecs-plugin</url>
+ <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
+
+ <licenses>
+ <license>
+ <name>MIT License</name>
+ <url>https://opensource.org/license/mit/</url>
+ </license>
+ </licenses>
 
  <properties>
- <jenkins.version>2.289.1</jenkins.version>
- <java.level>8</java.level>
- <mockito.version>3.12.4</mockito.version>
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven.compiler.source>1.8</maven.compiler.source>
- <aws-java-sdk.version>1.12.287-357.vf82d85a_6eefd</aws-java-sdk.version>
+ <revision>1.49</revision>
+ <changelist>-SNAPSHOT</changelist>
+ <jenkins.version>2.387.3</jenkins.version>
+ <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
  </properties>
 
  <developers>
@@ -56,10 +61,10 @@
  </developers>
 
  <scm>
- <connection>scm:git:git://github.com/jenkinsci/amazon-ecs-plugin.git</connection>
- <developerConnection>scm:git:git@github.com:jenkinsci/amazon-ecs-plugin.git</developerConnection>
- <url>https://github.com/jenkinsci/amazon-ecs-plugin</url>
- <tag>amazon-ecs-1.21</tag>
+ <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+ <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+ <url>https://github.com/${gitHubRepo}</url>
+ <tag>${scmTag}</tag>
  </scm>
 
  <repositories>
@@ -91,8 +96,8 @@
  <dependencies>
  <dependency>
  <groupId>io.jenkins.tools.bom</groupId>
- <artifactId>bom-2.303.x</artifactId>
- <version>1036.v9f5a1aba8fab</version>
+ <artifactId>bom-2.387.x</artifactId>
+ <version>2357.v1043f8578392</version>
  <scope>import</scope>
  <type>pom</type>
  </dependency>
@@ -101,90 +106,58 @@
 
 
  <dependencies>
- <dependency>
- <groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
- <artifactId>aws-java-sdk-minimal</artifactId>
- <version>${aws-java-sdk.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
- <artifactId>aws-java-sdk-ecs</artifactId>
- <version>${aws-java-sdk.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
- <artifactId>aws-java-sdk-efs</artifactId>
- <version>${aws-java-sdk.version}</version>
- </dependency>
  <dependency>
  <groupId>org.jenkins-ci.plugins</groupId>
  <artifactId>apache-httpcomponents-client-4-api</artifactId>
- <version>4.5.13-1.0</version>
  </dependency>
  <dependency>
  <groupId>org.jenkins-ci.plugins</groupId>
  <artifactId>aws-credentials</artifactId>
  <version>1.32</version>
  </dependency>
- <dependency> <!-- DeclarativeAgent -->
- <groupId>org.jenkinsci.plugins</groupId>
- <artifactId>pipeline-model-extensions</artifactId>
- <version>1.9.3</version>
- <optional>true</optional>
+ <dependency>
+ <groupId>org.jenkins-ci.plugins</groupId>
+ <artifactId>credentials-binding</artifactId>
  </dependency>
  <dependency>
+ <!-- OnceRetentionStrategy -->
  <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>variant</artifactId>
- <version>1.4</version>
+ <artifactId>durable-task</artifactId>
  </dependency>
  <dependency>
  <groupId>org.jenkins-ci.plugins</groupId>
  <artifactId>structs</artifactId>
- <version>1.23</version>
  </dependency>
  <dependency>
  <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>credentials-binding</artifactId>
- <version>1.27</version>
+ <artifactId>variant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
+ <artifactId>aws-java-sdk-ecs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
+ <artifactId>aws-java-sdk-efs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jenkins-ci.plugins.aws-java-sdk</groupId>
+ <artifactId>aws-java-sdk-minimal</artifactId>
  </dependency>
  <dependency>
  <groupId>org.jenkins-ci.plugins.workflow</groupId>
  <artifactId>workflow-step-api</artifactId>
- <version>2.24</version>
  </dependency>
- <dependency> <!-- OnceRetentionStrategy -->
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>durable-task</artifactId>
- <version>1.34</version>
+ <dependency>
+ <!-- DeclarativeAgent -->
+ <groupId>org.jenkinsci.plugins</groupId>
+ <artifactId>pipeline-model-extensions</artifactId>
+ <optional>true</optional>
  </dependency>
  <dependency>
  <groupId>org.mockito</groupId>
  <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
  <scope>test</scope>
  </dependency>
  </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgs>
- <arg>-Xlint:all</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <checkModificationExcludes>
- <checkModificationExclude>pom.xml</checkModificationExclude>
- </checkModificationExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
 </project>
diff --git a/src/test/java/com/cloudbees/jenkins/plugins/amazonecs/ECSCloudTest.java b/src/test/java/com/cloudbees/jenkins/plugins/amazonecs/ECSCloudTest.java
@@ -10,7 +10,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...va/com/cloudbees/jenkins/plugins/amazonecs/pipeline/ECSTaskTemplateStepExecutionTest.java b/...va/com/cloudbees/jenkins/plugins/amazonecs/pipeline/ECSTaskTemplateStepExecutionTest.java
@@ -11,7 +11,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;