Upgrade dependencies required for jersey2-api plugin (#927)

jfrog · Mar 27, 2024 · 6150d13 · 6150d13
1 parent 5e91ed1
commit 6150d13
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -143,7 +143,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>apache-httpcomponents-client-4-api</artifactId>
-            <version>4.5.10-1.0</version>
+            <version>4.5.13-1.0</version>
             <exclusions>
                 <!-- An updated version of httpcomponents is received from the buildinfo dependency -->
                 <exclusion>
@@ -542,6 +542,12 @@
             <version>2.4.21</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>jackson2-api</artifactId>
+            <version>2.13.2.20220328-281.v9ecc7a_5e834f</version>
+        </dependency>
+
         <!--Tests-->
         <dependency>
             <groupId>org.jenkins-ci.main</groupId>
@@ -594,6 +600,22 @@
         <!--/Tests-->
     </dependencies>
 
+    <!-- TODO: Remove this section when these transitive dependencies are upgraded in our direct dependency org.mock-server.mockserver-netty -->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk18on</artifactId>
+                <version>1.77</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk18on</artifactId>
+                <version>1.77</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

diff --git a/src/main/java/org/jfrog/hudson/pipeline/common/types/buildInfo/Env.java b/src/main/java/org/jfrog/hudson/pipeline/common/types/buildInfo/Env.java
@@ -28,8 +28,10 @@ public class Env implements Serializable {
 
     private static final String apiKeySecretPrefix = "AKCp8";
     private static final int apiKeySecretMinimalLength = 73;
+    // jfrog-ignore - Prefix used to identify a reference token
     private static final String referenceTokenSecretPrefix = "cmVmdGtuOjAxOj";
     private static final int referenceTokenSecretMinimalLength = 64;
+    // jfrog-ignore - Prefix used to identify an access token
     private static final String accessTokenSecretPrefix = "eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJ";
     private static final int accessTokenSecretMinimalLength = 0;