Skip to content

Commit

Permalink
Merge pull request #450 from jglick/deps
Browse files Browse the repository at this point in the history
Refresh deps
  • Loading branch information
jglick authored Jan 30, 2024
2 parents b0805c1 + 0a80cdb commit 9419ebb
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 23 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @jenkinsci/artifact-manager-s3-plugin-developers
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>
60 changes: 39 additions & 21 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.443</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 @@ -69,17 +72,31 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>aws-credentials</artifactId>
<version>191.vcb_f183ce58b_9</version>
<exclusions>
<!-- TODO JCLOUDS-1620 -->
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</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 +137,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 +153,17 @@
<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>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -174,10 +202,6 @@
<artifactId>git</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand All @@ -189,12 +213,6 @@
<artifactId>git</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -226,7 +244,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 +266,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>1948.veb_1fd345d3a_e</version>
<artifactId>bom-2.440.x</artifactId>
<version>2779.v391653d9c5da_</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
import org.jenkinsci.plugins.workflow.steps.StepExecution;
import org.jenkinsci.plugins.workflow.steps.StepExecutions;
import org.junit.AssumptionViolatedException;
import org.jvnet.hudson.test.MockAuthorizationStrategy;
import org.jvnet.hudson.test.TestExtension;
import org.kohsuke.stapler.DataBoundConstructor;
Expand All @@ -117,7 +118,13 @@ public class JCloudsArtifactManagerTest extends S3AbstractTest {

@BeforeClass
public static void live() {
S3AbstractTest.live();
try {
S3AbstractTest.live();
} catch (AssumptionViolatedException x) {
// TODO Surefire seems to not display these at all?

Check warning on line 124 in src/test/java/io/jenkins/plugins/artifact_manager_jclouds/s3/JCloudsArtifactManagerTest.java

View check run for this annotation

ci.jenkins.io / Open Tasks Scanner

TODO

NORMAL: Surefire seems to not display these at all?
x.printStackTrace();
throw x;
}
}

private static DockerImage image;
Expand Down

0 comments on commit 9419ebb

Please sign in to comment.