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

refactor: upgrade dependencies and java from 11 to 17 #159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: upgrade dependencies and java from 11 to 17 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.55</version>
<version>4.83</version>
<relativePath />
</parent>
<groupId>io.jenkins.plugins</groupId>
Expand Down Expand Up @@ -58,18 +58,18 @@ THE SOFTWARE.
<tag>remote-file-1.24</tag>
</scm>
<properties>
<jenkins.version>2.361.4</jenkins.version>
<cloudbees-bitbucket-branch-source.version>796.v6cb_1559e1673</cloudbees-bitbucket-branch-source.version>
<java.version>11</java.version>
<jenkins.version>2.452.1</jenkins.version>
<cloudbees-bitbucket-branch-source.version>886.v44cf5e4ecec5</cloudbees-bitbucket-branch-source.version>
<java.version>17</java.version>
<workflow-aggregator.version>596.v8c21c963d92d</workflow-aggregator.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>1763.v092b_8980a_f5e</version>
<artifactId>bom-2.452.x</artifactId>
<version>3105.v672692894683</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -158,7 +158,7 @@ THE SOFTWARE.
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10.5</version>
<version>2.12.7</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/org/jenkinsci/plugins/workflow/multibranch/extended/ExcludeFromPollTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
import org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject;
import org.jenkinsci.plugins.workflow.multibranch.extended.scm.ExcludeFromPoll;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import java.io.IOException;
import java.util.concurrent.TimeUnit;

import static org.junit.Assert.assertEquals;

Expand Down Expand Up @@ -44,6 +46,16 @@ public void setup() throws Exception {
this.initSourceCodeRepo();
}

@After
public void dispose() throws Exception {
// On Windows, test is not executed, because of below error:
// ExcludeFromPollTest.testRemoteJenkinsFile » FileSystem ...\remote-file-plugin\target\tmp\j h14274673471981878038\workspace\RemoteJenkinsFileProject_master@script\a0f6ab0a0a5fefdeec6a896ffe3ae660a88d73d9fe90d600368f502366cf31c7: The process cannot access the file because it is being used by another process
// This error occurs when invoking org.jvnet.hudson.test.TestEnvironment.dispose(TestEnvironment.java:84)
// Basically it is trying to delete temporary directory
// After adding a small timeout, it is working
TimeUnit.SECONDS.sleep(1);
}

@Test
public void testRemoteJenkinsFile() throws Exception {
// Init Remote Jenkins File Repo with test Jenkinsfile
Expand Down
Loading