Skip to content

Commit

Permalink
don't build for Java 8 anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
maxlaverse committed Jan 29, 2023
1 parent 01ff284 commit c7d6fe4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
9 changes: 5 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Java versions to test against
String[] jdkVersions = [8, 11]
String[] unitTestJdkVersions = [11]
String integrationJdkVersions = 11

// Platform to test for
String[] platforms = [
Expand Down Expand Up @@ -91,15 +92,15 @@ for (int i = 0; i < kubectlVersions.size(); i++) {

def stepName = "integration/${platform}/v${kubectlVersion}"
stepsForParallel[stepName] = { ->
integrationTest(platform, jdkVersions[1], kubectlVersion)
integrationTest(platform, integrationJdkVersions, kubectlVersion)
}
}
}
for (int j = 0; j < platforms.size(); j++) {
def platform = platforms[j]

for (int k = 0; k < jdkVersions.size(); k++) {
def jdkVersion = jdkVersions[k]
for (int k = 0; k < unitTestJdkVersions.size(); k++) {
def jdkVersion = unitTestJdkVersions[k]
def stepName = "unit/${platform}/${jdkVersion}"
stepsForParallel[stepName] = { ->
unitTest(platform, jdkVersion)
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.50</version>
<version>4.53</version>
<relativePath />
</parent>

Expand All @@ -17,12 +17,12 @@
<properties>
<revision>1.11.1</revision>
<changelist>-SNAPSHOT</changelist>
<java.level>8</java.level>
<java.level>11</java.level>
<hpi.compatibleSinceVersion>1.0.0</hpi.compatibleSinceVersion>

<!-- dependency versions -->
<jenkins.version>2.332.4</jenkins.version>
<bom.artifactId>bom-2.332.x</bom.artifactId>
<jenkins.version>2.361.4</jenkins.version>
<bom.artifactId>bom-2.361.x</bom.artifactId>
<bom.version>1763.v092b_8980a_f5e</bom.version>

<!-- jenkins plugins versions -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public void testListingCredentialsWithoutAncestorAndMissingPermissions() throws
as.add(Jenkins.READ, "user-not-enough-permissions");
r.jenkins.setAuthorizationStrategy(as);

try (ACLContext _ = ACL.as(User.get("user-not-enough-permissions", true, null).impersonate())) {
try (ACLContext unused = ACL.as(User.get("user-not-enough-permissions", true, null).impersonate())) {
ListBoxModel options = d.doFillCredentialsIdItems(null, "", "1");
assertEquals("- current -", options.get(0).name);
assertEquals(1, options.size());
Expand Down

0 comments on commit c7d6fe4

Please sign in to comment.