Skip to content

Commit db846d7

Browse files
authored
Merge pull request #896 from jgarciacloudbees/cascUpdate
Fix Casc test upgrading after upgrading to CasC 1995.v540b_50a_eb_0c1
2 parents 411feec + 3268df9 commit db846d7

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>5.19</version>
7+
<version>5.24</version>
88
<relativePath />
99
</parent>
1010

@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.jenkins.tools.bom</groupId>
4646
<artifactId>bom-${jenkins.baseline}.x</artifactId>
47-
<version>4948.vcf1d17350668</version>
47+
<version>5294.va_d2e144c80e1</version>
4848
<type>pom</type>
4949
<scope>import</scope>
5050
</dependency>
@@ -91,11 +91,15 @@
9191
<dependency>
9292
<groupId>io.jenkins</groupId>
9393
<artifactId>configuration-as-code</artifactId>
94+
<!-- TODO: remove when included in jenkins-bom via parent -->
95+
<version>1995.v540b_50a_eb_0c1</version>
9496
<scope>test</scope>
9597
</dependency>
9698
<dependency>
9799
<groupId>io.jenkins.configuration-as-code</groupId>
98100
<artifactId>test-harness</artifactId>
101+
<!-- TODO: remove when included in jenkins-bom via parent -->
102+
<version>1995.v540b_50a_eb_0c1</version>
99103
<scope>test</scope>
100104
</dependency>
101105
<dependency>

src/test/resources/org/jenkinsci/plugins/github_branch_source/github-app-jcasc-minimal-expected-export.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
folder: {
2+
}
3+
providerImpl: {
4+
}
15
system:
26
domainCredentials:
37
- credentials:
@@ -6,6 +10,9 @@ system:
610
description: "GitHub app 1111"
711
id: "github-app"
812
privateKey: "some-secret-value"
13+
repositoryAccessStrategy:
14+
specificRepositories: {
15+
}
916
- gitHubApp:
1017
appID: "1111"
1118
id: "old-owner"
@@ -17,6 +24,9 @@ system:
1724
appID: "1111"
1825
id: "new-specific-empty"
1926
privateKey: "some-secret-value"
27+
repositoryAccessStrategy:
28+
specificRepositories: {
29+
}
2030
- gitHubApp:
2131
appID: "1111"
2232
id: "new-specific-owner"
@@ -46,3 +56,7 @@ system:
4656
id: "new-infer-repo"
4757
privateKey: "some-secret-value"
4858
repositoryAccessStrategy: "inferRepository"
59+
domain: {
60+
}
61+
user: {
62+
}

0 commit comments

Comments
 (0)