chore(deps): bump org.jenkins-ci.plugins:plugin from 5.2102.v5f5fe09fccf1 to 6.2152.ve00a_731c3ce9 (#1006)

* chore(deps): bump org.jenkins-ci.plugins:plugin

Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.2102.v5f5fe09fccf1 to 6.2152.ve00a_731c3ce9.
- [Release notes](https://github.com/jenkinsci/plugin-pom/releases)
- [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenkinsci/plugin-pom/commits)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:plugin
  dependency-version: 6.2152.ve00a_731c3ce9
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix duplicate properties keys and spotless formatting

Remove duplicate resource.status.* keys in tableQueue/table.properties
that cause InjectedTest.testProperties failure with plugin-pom 6.x.

Apply spotless formatting fix to LockStepExecution.java.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Martin Pokorny <[email protected]>

Author: dependabot[bot]

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.2102.v5f5fe09fccf1</version>
+    <version>6.2152.ve00a_731c3ce9</version>
     <relativePath />
   </parent>
 

src/main/java/org/jenkins/plugins/lockableresources/LockStepExecution.java

@@ -205,8 +205,8 @@ public static void proceed(
                     context.newBodyInvoker().withCallback(new Callback(resourceNames, resourceDescription));
             if (variable != null && !variable.isEmpty()) {
                 // set the variable for the duration of the block
-                bodyInvoker.withContext(
-                        EnvironmentExpander.merge(context.get(EnvironmentExpander.class), new EnvironmentExpander() {
+                bodyInvoker.withContext(EnvironmentExpander.merge(
+                        context.get(EnvironmentExpander.class), new EnvironmentExpander() {
                             private static final long serialVersionUID = -3431466225193397896L;
 
                             @Override

src/main/resources/org/jenkins/plugins/lockableresources/actions/LockableResourcesRootAction/tableQueue/table.properties

@@ -40,20 +40,11 @@ queue.table.column.action=Action
 queue.table.column.id=Queue ID
 
 #status
-resource.status.free=<strong>FREE</strong>
-resource.status.locked=<strong>LOCKED</strong> by <a class="jenkins-table__link model-link jenkins-table__badge" href="{0}">{1}</a>
-resource.status.reservedBy=<strong>RESERVED</strong> by <strong>{0}</strong> 
-resource.status.queuedBy=<strong>QUEUED</strong> by {0} {1}
-ago={0} ago
-label.requiredNumber={0} label(s) are required.
-label.requiredAll=All possible labels are required.
-label.status=Found {1} free resource(s) from {0} possible.
-
-
 resource.status.locked=<strong class="jenkins-!-warning-color">Locked</strong> by <a class="jenkins-table__link model-link jenkins-table__badge" href="{0}">{1}</a>
 resource.status.reservedBy=<strong class="jenkins-!-destructive-color">Reserved</strong> by <strong>{0}</strong> 
 resource.status.queuedBy=<strong class="jenkins-!-warning-color">Queued</strong> by {0} {1}
 resource.status.free=<strong>Free</strong>
+ago={0} ago
 label.requiredNumber=Requested <strong>{0}</strong> label(s).
 label.requiredAll=Requested <strong class="jenkins-!-warning-color">ALL</strong> possible labels.
 label.status=<br>There are {1} resource(s) matched, but only {0} free.