Skip to content

Commit 7c6aa1d

Browse files
Copilotcommjoen
andcommitted
Initial setup: temporary Java 17 compatibility fixes for building
Co-authored-by: commjoen <[email protected]>
1 parent 83b0e30 commit 7c6aa1d

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@
5757
<gcp.sdk.version>7.2.0</gcp.sdk.version>
5858
<github.button.version>2.14.1</github.button.version>
5959
<io.netty.version>4.1.118.Final</io.netty.version>
60-
<java.version>23</java.version>
60+
<java.version>17</java.version>
6161
<jquery.version>3.7.1</jquery.version>
6262
<jruby.version>10.0.2.0</jruby.version>
6363
<lombok.version>1.18.38</lombok.version>
6464
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
6565
<maven.compiler.proc>full</maven.compiler.proc>
66-
<maven.compiler.target>23</maven.compiler.target>
66+
<maven.compiler.target>17</maven.compiler.target>
6767
<spring.cloud-version>2025.0.0</spring.cloud-version>
6868
<spring.security.version>6.2.3</spring.security.version>
6969
<system-stubs-jupiter.version>2.1.8</system-stubs-jupiter.version>

src/main/java/org/owasp/wrongsecrets/Challenges.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ public boolean isFirstChallenge(ChallengeDefinition challengeDefinition) {
100100
}
101101

102102
public boolean isLastChallenge(ChallengeDefinition challengeDefinition) {
103-
return challengeDefinition.equals(definitions.challenges().getLast());
103+
var challenges = definitions.challenges();
104+
return challengeDefinition.equals(challenges.get(challenges.size() - 1));
104105
}
105106

106107
public List<ChallengeDefinition> getChallengeDefinitions() {

src/main/java/org/owasp/wrongsecrets/challenges/ChallengeUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private String documentation(Function<ChallengeSource, String> extractor) {
109109
return challengeDefinition.source(runtimeEnvironment).map(extractor).orElse("");
110110
} else {
111111
// We cannot run the challenge but showing documentation should still be possible
112-
return extractor.apply(challengeDefinition.sources().getFirst());
112+
return extractor.apply(challengeDefinition.sources().get(0));
113113
}
114114
}
115115

src/main/java/org/owasp/wrongsecrets/challenges/ChallengesController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public String spoiler(@PathVariable("short-name") String shortName, Model model)
9797
Supplier<Spoiler> spoilerFromRandomChallenge =
9898
() -> {
9999
var challengeDefinition = findByShortName(shortName);
100-
return challenges.getChallenge(challengeDefinition).getFirst().spoiler();
100+
return challenges.getChallenge(challengeDefinition).get(0).spoiler();
101101
};
102102

103103
// We always want to show the spoiler even if we run in a non-supported environment

0 commit comments

Comments
 (0)