Skip to content

Commit

Permalink
Merge pull request #963 from jglick/commons-compress
Browse files Browse the repository at this point in the history
Adapt `SerialFormTest` to removal of `commons-compress`
  • Loading branch information
jglick authored Dec 19, 2024
2 parents 5198556 + 3efdc02 commit 80cad0f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
13 changes: 2 additions & 11 deletions plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,11 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.426.x</artifactId>
<version>3023.v02a_987a_b_3ff9</version>
<artifactId>bom-2.452.x</artifactId>
<version>3696.vb_b_4e2d1a_0542</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1369.v9b_98a_4e95b_2d</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -235,10 +230,6 @@
<scope>test</scope>
<exclusions>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<jenkins.version>2.426.3</jenkins.version>
<jenkins.version>2.452.4</jenkins.version>
<groovy.version>2.4.21</groovy.version> <!-- TODO: Add org.codehaus.groovy:groovy and org.codehaus.groovy:groovy:sources to Jenkins core BOM so this can be deleted? (currently it only specifies groovy-all) -->
</properties>
<modules>
Expand Down

0 comments on commit 80cad0f

Please sign in to comment.