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

chore: switch to 2.479 baseline #857

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

chore: switch to 2.479 baseline #857

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
2 changes: 1 addition & 1 deletion .../test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepMavenExecResolutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ private void registerAgentForContainer(GenericContainer<?> slaveContainer) throw
registerAgentForSlaveContainer(slaveContainer);
}

private void addTestSshCredentials() {
private void addTestSshCredentials() throws Exception {
Credentials credentials =
new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, SSH_CREDENTIALS_ID, null, "test", "test");

Expand Down
2 changes: 1 addition & 1 deletion pipeline-maven/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private void registerAgentForContainer(GenericContainer<?> container) throws Exc
registerAgentForSlaveContainer(container);
}

private void addTestSshCredentials() {
private void addTestSshCredentials() throws Exception {
Credentials credentials =
new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, SSH_CREDENTIALS_ID, null, "test", "test");

Expand Down
11 changes: 8 additions & 3 deletions ...aven/src/test/java/org/jenkinsci/plugins/pipeline/maven/util/FakeCredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,14 @@ public <C extends Credentials> List<C> getCredentials(
ItemGroup itemGroup,
Authentication authentication,
List<DomainRequirement> domainRequirements) {
UsernamePasswordCredentialsImpl creds = new UsernamePasswordCredentialsImpl(GLOBAL, id, "", username, password);
creds.setUsernameSecret(usernameIsSecret);
return (List<C>) asList(creds);
UsernamePasswordCredentialsImpl creds;
try {
creds = new UsernamePasswordCredentialsImpl(GLOBAL, id, "", username, password);
creds.setUsernameSecret(usernameIsSecret);
return (List<C>) asList(creds);
} catch (FormException e) {
throw new IllegalStateException("Cannot create fake credentials", e);
}
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.88</version>
<version>5.3</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -100,8 +100,8 @@
<jenkins-plugin-mysql.version>8.4.0-31.va_b_5ce7933762</jenkins-plugin-mysql.version>
<jenkins-plugin-postgresql.version>42.7.2-40.v76d376d65c77</jenkins-plugin-postgresql.version>
<jenkins-plugin-tasks.version>4.53</jenkins-plugin-tasks.version>
<jenkins-tools-bom.version>3258.vcdcf15936a_fd</jenkins-tools-bom.version>
<jenkins.version>2.440.3</jenkins.version>
<jenkins-tools-bom.version>3696.vb_b_4e2d1a_0542</jenkins-tools-bom.version>
<jenkins.version>2.479.1</jenkins.version>
<junit.version>5.11.3</junit.version>
<mariadb-client.version>3.5.0</mariadb-client.version>
<maven-plugin-sisu.version>0.3.5</maven-plugin-sisu.version>
Expand All @@ -120,7 +120,7 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.440.x</artifactId>
<artifactId>bom-2.479.x</artifactId>
<version>${jenkins-tools-bom.version}</version>
<type>pom</type>
<scope>import</scope>
Expand Down