Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade dependencies required for jersey2-api plugin #927

Merged
merged 10 commits into from
Mar 27, 2024
Merged

Upgrade dependencies required for jersey2-api plugin #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1d8444e
Update core and add jersey
RobiNino Mar 24, 2024
de855d5
upgrade dependencies
RobiNino Mar 24, 2024
f32d441
add scan ignore
RobiNino Mar 24, 2024
e58bc02
upgrade jersey
RobiNino Mar 25, 2024
f0dd04e
upgrade jenkins core, httpcomponents, jackson2
RobiNino Mar 25, 2024
b24e225
Improve todo explanation
RobiNino Mar 27, 2024
77e31c4
cr comment
RobiNino Mar 27, 2024
d35a6b5
Merge branch 'master' of https://github.com/jfrog/jenkins-artifactory…
RobiNino Mar 27, 2024
7822b1e
update after pull
RobiNino Mar 27, 2024
3d45d39
cr comment
RobiNino Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/jfrog/hudson/pipeline/common/types/buildInfo/Env.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
RobiNino marked this conversation as resolved.
Show resolved Hide resolved
private static final int accessTokenSecretMinimalLength = 0;

Expand Down
Loading