Merge pull request #127 from jenkinsci/java-11

Require Java 11 & Jenkins 2.361 LTS baseline

Jenkinsfile

@@ -1,8 +1,11 @@
 #!groovy
-def recentLTS = '2.361.2'
-buildPlugin(configurations: [
-  [ platform: 'linux', jdk: '8', jenkins: null ],
-  [ platform: 'windows', jdk: '11', jenkins: recentLTS ],
-  [ platform: 'linux', jdk: '11', jenkins: recentLTS ],
-  [ platform: 'linux', jdk: '17', jenkins: recentLTS ],
-])
+def recentLTS = '2.375.2'
+buildPlugin(
+  // Container agents start faster and are easier to administer
+  useContainerAgent: true,
+  configurations: [
+    [platform: 'linux',   jdk: '11'],
+    [platform: 'linux',   jdk: '17', jenkins: recentLTS],
+    [platform: 'windows', jdk: '17', jenkins: recentLTS],
+  ]
+)

LICENSE

@@ -1,5 +1,5 @@
 Copyright 2015-2017 CloudBees, Inc.
-Copyright 2021 TobiX
+Copyright 2021-2023 TobiX
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -1,5 +1,12 @@
 # Amazon ECR Plugin
 
+[![Jenkins Plugin](https://img.shields.io/jenkins/plugin/v/amazon-ecr.svg)](https://plugins.jenkins.io/amazon-ecr)
+[![GitHub release](https://img.shields.io/github/release/jenkinsci/amazon-ecr-plugin.svg?label=release)](https://github.com/jenkinsci/amazon-ecr-plugin/releases/latest)
+[![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/amazon-ecr.svg?color=blue)](https://plugins.jenkins.io/amazon-ecr)
+[![Build Status](https://ci.jenkins.io/buildStatus/icon?job=Plugins%2Famazon-ecr-plugin%2Fmain)](https://ci.jenkins.io/job/Plugins/job/amazon-ecr-plugin/job/main/)
+[![GitHub license](https://img.shields.io/github/license/jenkinsci/amazon-ecr-plugin.svg)](https://github.com/jenkinsci/amazon-ecr-plugin/blob/main/LICENSE.txt)
+[![Maintenance](https://img.shields.io/maintenance/yes/2023.svg)]()
+
 This plugin offers integration with [Amazon Container Registry
 (ECR)](https://aws.amazon.com/ecr/) as a [DockerRegistryToken] source to convert
 Amazon Credentials into a Docker CLI Authentication Token.

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.48</version>
+    <version>4.54</version>
   </parent>
 
   <groupId>com.cloudbees.jenkins.plugins</groupId>
@@ -33,21 +33,22 @@
         <role>Maintainer</role>
       </roles>
     </developer>
-    <developer>
-      <id>ndeloof</id>
+  </developers>
+
+  <contributors>
+    <contributor>
       <name>Nicolas De Loof</name>
       <roles>
         <role>Maintainer (retired)</role>
       </roles>
-    </developer>
-    <developer>
-      <id>ifernandezcalvo</id>
+    </contributor>
+    <contributor>
       <name>Ivan Fernandez Calvo</name>
       <roles>
         <role>Maintainer (retired)</role>
       </roles>
-    </developer>
-  </developers>
+    </contributor>
+  </contributors>
 
   <scm>
     <connection>scm:git:ssh://github.com/${gitHubRepo}.git</connection>
@@ -60,15 +61,15 @@
     <revision>1</revision>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/amazon-ecr-plugin</gitHubRepo>
-    <jenkins.version>2.332.4</jenkins.version>
+    <jenkins.version>2.361.4</jenkins.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.332.x</artifactId>
-        <version>1654.vcb_69d035fa_20</version>
+        <artifactId>bom-2.361.x</artifactId>
+        <version>1798.vc671fe94856f</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -120,11 +121,7 @@
             <endWithNewline />
             <importOrder />
             <removeUnusedImports />
-            <googleJavaFormat>
-              <!-- Last version that supports Java 8, the plugin does handle this internally
-              but it will give different versions based off of the JVM version, not good for CI -->
-              <version>1.7</version>
-            </googleJavaFormat>
+            <googleJavaFormat />
           </java>
           <pom>
             <sortPom>

src/main/java/com/cloudbees/jenkins/plugins/amazonecr/AmazonECSRegistryTokenSource.java

@@ -34,7 +34,6 @@
 import jenkins.authentication.tokens.api.AuthenticationTokenSource;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryToken;
 
-/** @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a> */
 @Extension
 public class AmazonECSRegistryTokenSource
     extends AuthenticationTokenSource<DockerRegistryToken, AmazonECSRegistryCredential> {