fix bundling of eddsa

src/main/java/org/jfrog/hudson/release/maven/MavenReleaseWrapper.java

@@ -66,7 +66,7 @@ public class MavenReleaseWrapper extends BuildWrapper {
     private boolean useReleaseBranch;
 
     private List<String> mavenModules = new ArrayList<String>();
-    private final String POM_NAME = "pom.xml";
+    private static final String POM_NAME = "pom.xml";
 
     @DataBoundConstructor
     public MavenReleaseWrapper(String releaseBranchPrefix, String tagPrefix, String targetRemoteName, String alternativeGoals,

src/main/java/org/jfrog/hudson/release/scm/perforce/P4Manager.java

@@ -4,12 +4,16 @@
 import com.perforce.p4java.server.IOptionsServer;
 import hudson.EnvVars;
 import hudson.model.AbstractBuild;
+import hudson.model.Item;
 import hudson.model.TaskListener;
+import hudson.scm.SCM;
+
 import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.p4.PerforceScm;
 import org.jenkinsci.plugins.p4.client.ClientHelper;
 import org.jenkinsci.plugins.p4.client.ConnectionFactory;
 import org.jenkinsci.plugins.p4.client.ConnectionHelper;
+import org.jenkinsci.plugins.p4.workspace.Workspace;
 import org.jfrog.build.vcs.perforce.PerforceClient;
 
 import java.nio.charset.StandardCharsets;
@@ -36,12 +40,12 @@ public void prepare() {
         PerforceScm perforceScm = getJenkinsScm();
         String credentials = perforceScm.getCredential();
 
-        ConnectionHelper connection = new ConnectionHelper(credentials, buildListener);
-        IOptionsServer server = ConnectionFactory.getConnection();
         try {
-            String clientString = getClientString();
-            if (connection.isClient(clientString)) {
-                ClientHelper perforceClient = new ClientHelper(credentials, buildListener, clientString, StandardCharsets.UTF_8.toString());
+            ConnectionHelper connection = new ConnectionHelper(build, credentials, buildListener);
+            IOptionsServer server = ConnectionFactory.getConnection();
+            Workspace clientString = getClientWorkspace();
+            if (connection.isClient(clientString.getName())) {
+                ClientHelper perforceClient = new ClientHelper((Item)this.build.getProject(), credentials, buildListener, clientString);
                 IClient client = perforceClient.getClient();
                 try {
                     this.perforce = new PerforceClient(server, client);
@@ -64,14 +68,13 @@ public PerforceClient establishConnection() throws Exception {
         return this.perforce;
     }
 
-    private String getClientString() {
-        String client = StringUtils.EMPTY;
-        try {
-            EnvVars envVars = build.getEnvironment(buildListener);
-            client = envVars.get("P4_CLIENT");
-        } catch (Exception e) {
-            logger.log(Level.FINE, "P4: Unable to read P4_CLIENT");
+    private Workspace getClientWorkspace() {
+        SCM scm = this.build.getProject().getScm();
+        if (scm instanceof PerforceScm) {
+            PerforceScm p4scm = (PerforceScm)scm;
+            return p4scm.getWorkspace();
         }
-        return client;
+        logger.log(Level.FINE, "Unable to determine P4 workspace");
+        return null;
     }
 }

src/main/resources/index.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--
   This view is used to render the plugin list page.
 

src/main/resources/org/jfrog/hudson/ArtifactoryBuilder/global.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"
          xmlns:f="/lib/form"
          xmlns:st="jelly:stapler"

src/main/resources/org/jfrog/hudson/ArtifactoryRedeployPublisher/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:r="/lib/jfrog" xmlns:st="jelly:stapler">
     <j:set var="uniqueId" value="${h.generateId()}"/>
     <f:dropdownList name="deployerDetails" title="${%Artifactory server}">

src/main/resources/org/jfrog/hudson/BuildInfoResultAction/summary.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"
          xmlns:t="/lib/hudson">
     <t:summary icon="${it.iconFileName}">

src/main/resources/org/jfrog/hudson/XrayScanResultAction/summary.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"
          xmlns:t="/lib/hudson">
     <t:summary icon="${it.iconFileName}">

src/main/resources/org/jfrog/hudson/generic/ArtifactoryGenericConfigurator/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form"
          xmlns:r="/lib/jfrog" xmlns:st="jelly:stapler">
 

src/main/resources/org/jfrog/hudson/gradle/ArtifactoryGradleConfigurator/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--suppress XmlUnusedNamespaceDeclaration -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:r="/lib/jfrog">

src/main/resources/org/jfrog/hudson/ivy/ArtifactoryIvyConfigurator/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--suppress XmlUnusedNamespaceDeclaration -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:r="/lib/jfrog" xmlns:c="/lib/credentials">

src/main/resources/org/jfrog/hudson/ivy/ArtifactoryIvyFreeStyleConfigurator/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"
          xmlns:f="/lib/form"
          xmlns:r="/lib/jfrog"

src/main/resources/org/jfrog/hudson/maven3/ArtifactoryMaven3Configurator/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--
   ~ Copyright (C) 2010 JFrog Ltd.
   ~

src/main/resources/org/jfrog/hudson/maven3/ArtifactoryMaven3NativeConfigurator/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:r="/lib/jfrog" xmlns:st="jelly:stapler">
     <j:set var="uniqueId" value="${h.generateId()}"/>
     <f:dropdownList name="resolverDetails" title="${%Artifactory server}">

src/main/resources/org/jfrog/hudson/maven3/Maven3Builder/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--
   ~ Copyright (C) 2010 JFrog Ltd.
   ~

src/main/resources/org/jfrog/hudson/pipeline/action/DeployedGradleArtifactsAction/index.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
     <l:layout title="Gradle Artifacts">
         <st:include it="${it.build}" page="sidepanel.jelly"/>

src/main/resources/org/jfrog/hudson/pipeline/action/DeployedGradleArtifactsAction/summary.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"
          xmlns:t="/lib/hudson">
     <j:if test="${!empty it.deployedArtifacts}">

src/main/resources/org/jfrog/hudson/pipeline/action/DeployedMavenArtifactsAction/index.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
     <l:layout title="Maven Artifacts">
         <st:include it="${it.build}" page="sidepanel.jelly"/>

src/main/resources/org/jfrog/hudson/pipeline/action/DeployedMavenArtifactsAction/summary.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core"
          xmlns:t="/lib/hudson">
     <j:if test="${!empty it.deployedArtifacts}">

src/main/resources/org/jfrog/hudson/release/PromoteBuildAction/badge.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
     <j:choose>
         <j:when test="${it.hasPromotionPermission()}">

src/main/resources/org/jfrog/hudson/release/PromoteBuildAction/progress.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <l:layout norefresh="true">

src/main/resources/org/jfrog/hudson/release/gradle/GradleReleaseAction/index.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!-- displays a form to choose the next release and development version and re-schedules a build -->
 <!--suppress XmlUnusedNamespaceDeclaration -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"

src/main/resources/org/jfrog/hudson/release/maven/MavenReleaseAction/index.jelly

@@ -1,5 +1,6 @@
 <!-- displays a form to choose the next release and development version and re-schedules a build -->
 <!--suppress XmlUnusedNamespaceDeclaration -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <l:layout title="">

src/main/resources/org/jfrog/hudson/release/maven/MavenReleaseWrapper/config.jelly

@@ -1,4 +1,5 @@
 <!--suppress XmlUnusedNamespaceDeclaration -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:entry field="tagPrefix" title="VCS tags name/base URL"

src/main/resources/org/jfrog/hudson/trigger/ArtifactoryMultibranchTrigger/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <f:dropdownList name="details" title="${%Artifactory server}">
         <j:forEach var="s" items="${instance.jfrogInstances ?: descriptor.jfrogInstances}" varStatus="loop">

src/main/resources/org/jfrog/hudson/trigger/ArtifactoryTrigger/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <f:dropdownList name="details" title="${%Artifactory server}">
         <j:forEach var="s" items="${instance.jfrogInstances ?: descriptor.jfrogInstances}" varStatus="loop">