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.

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

Bump to Jenkins core 2.401 and refresh dependencies #449

Merged
merged 1 commit into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.6</version>
<version>1.7</version>
</extension>
</extensions>
38 changes: 27 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.70</version>
<relativePath/>
<version>4.76</version>
<relativePath />
</parent>
<groupId>io.jenkins.plugins</groupId>
<artifactId>artifact-manager-s3</artifactId>
Expand All @@ -15,7 +15,7 @@

<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.361.4</jenkins.version>
<jenkins.version>2.401.3</jenkins.version>
<useBeta>true</useBeta>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
Expand All @@ -42,7 +42,6 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>aws-global-configuration</artifactId>
<version>108.v47b_fd43dfec6</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
Expand All @@ -51,12 +50,16 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>2.8.0</version>
<version>2.9.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId> <!-- take version from Jenkins Core -->
<artifactId>commons-io</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -74,12 +77,18 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>aws-credentials</artifactId>
<version>191.vcb_f183ce58b_9</version>
<exclusions>
<!-- TODO JCLOUDS-1620 -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/JCLOUDS-1620 FTR. Serious problems would I hope get caught by

public RealJenkinsRule rr = new RealJenkinsRule().javaOptions("-Xmx150m");
Supposedly fixed in 2.6.0
<groupId>org.apache.jclouds.provider</groupId>
<artifactId>aws-s3</artifactId>
<version>2.5.0</version>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this relate to #447?

<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sso</artifactId>
<version>2.20.92</version>
<version>2.22.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -120,7 +129,7 @@
<dependency>
<groupId>org.jenkins-ci.test</groupId>
<artifactId>docker-fixtures</artifactId>
<version>166.v912b_95083ffe</version>
<version>178.v2c7d2343886b_</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -136,6 +145,13 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-slaves</artifactId>
<exclusions>
<!-- TODO JCLOUDS-1620 -->
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -226,7 +242,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.18.3</version>
<version>1.19.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -248,8 +264,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>1948.veb_1fd345d3a_e</version>
<artifactId>bom-2.401.x</artifactId>
<version>2671.va_73a_b_4c103fb_</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down