Skip to content

Commit 003458a

Browse files
committed
Release version 0.12.0
Update the dependencies and code accordingly. Change minimum Java version to 17. Update GitHub workflows to use Java 17. Update CHANGELOG and build.gradle.kts. Signed-off-by: thc202 <thc202@gmail.com>
1 parent ce265c6 commit 003458a

File tree

10 files changed

+27
-27
lines changed

10 files changed

+27
-27
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
java: [11, 21, 22]
14+
java: [17, 21, 22]
1515

1616
steps:
1717
- uses: actions/checkout@v4

.github/workflows/release-plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/setup-java@v4
1313
with:
1414
distribution: 'temurin'
15-
java-version: 11
15+
java-version: 17
1616
- uses: gradle/actions/setup-gradle@v4
1717
- run: ./gradlew publishPlugin
1818
env:

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [Unreleased]
7+
## [0.12.0] - 2024-12-04
8+
### Changed
9+
- The minimum Java version required is now Java 17.
10+
- Update dependencies to support newer Java versions.
811

912
## [0.11.0] - 2024-06-17
1013
### Changed
@@ -236,7 +239,7 @@ Provided by the plugin:
236239
with a `ZapVersions.xml` from an add-on.
237240

238241

239-
[Unreleased]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.11.0...HEAD
242+
[0.12.0]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.11.0...v0.12.0
240243
[0.11.0]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.10.0...v0.11.0
241244
[0.10.0]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.9.0...v0.10.0
242245
[0.9.0]: https://github.com/zaproxy/gradle-plugin-add-on/compare/v0.8.0...v0.9.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
A Gradle plugin to (help) build ZAP add-ons.
44

5-
The plugin requires at least Java 11 and Gradle 8.8.
5+
The plugin requires at least Java 17 and Gradle 8.8.

build.gradle.kts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@ plugins {
77
}
88

99
group = "org.zaproxy.gradle"
10-
version = "0.12.0-SNAPSHOT"
10+
version = "0.12.0"
1111

1212
dependencies {
13-
implementation("commons-codec:commons-codec:1.15")
14-
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.9")
15-
val flexmarkVersion = "0.42.8"
13+
implementation("commons-codec:commons-codec:1.17.1")
14+
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.2")
15+
val flexmarkVersion = "0.64.8"
1616
implementation("com.vladsch.flexmark:flexmark-java:$flexmarkVersion")
1717
implementation("com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:$flexmarkVersion")
1818
implementation("com.vladsch.flexmark:flexmark-ext-gfm-tasklist:$flexmarkVersion")
1919
implementation("com.vladsch.flexmark:flexmark-ext-tables:$flexmarkVersion")
20-
implementation("io.github.classgraph:classgraph:4.8.36")
21-
val jgitVersion = "5.6.0.201912101111-r"
20+
implementation("io.github.classgraph:classgraph:4.8.179")
21+
val jgitVersion = "7.1.0.202411261347-r"
2222
implementation("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion")
2323
implementation("org.eclipse.jgit:org.eclipse.jgit.archive:$jgitVersion")
2424
implementation("org.zaproxy:zap-clientapi:1.14.0")
25-
implementation("org.kohsuke:github-api:1.95")
25+
implementation("org.kohsuke:github-api:1.326")
2626
// Include annotations used by the above library to avoid compiler warnings.
2727
compileOnly("com.google.code.findbugs:findbugs-annotations:3.0.1")
2828
compileOnly("com.infradna.tool:bridge-method-annotation:1.18") {
2929
exclude(group = "org.jenkins-ci")
3030
}
31-
implementation("com.github.zafarkhaja:java-semver:0.9.0")
31+
implementation("com.github.zafarkhaja:java-semver:0.10.2")
3232
}
3333

3434
tasks.jar {
@@ -41,12 +41,13 @@ tasks.jar {
4141
}
4242

4343
java {
44-
sourceCompatibility = JavaVersion.VERSION_11
45-
targetCompatibility = JavaVersion.VERSION_11
44+
val javaVersion = JavaVersion.VERSION_17
45+
sourceCompatibility = javaVersion
46+
targetCompatibility = javaVersion
4647
}
4748

4849
kotlin {
49-
jvmToolchain(11)
50+
jvmToolchain(17)
5051
}
5152

5253
gradlePlugin {

src/main/java/org/zaproxy/gradle/addon/internal/model/ReleaseState.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import com.fasterxml.jackson.annotation.JsonInclude;
2424
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2525
import com.fasterxml.jackson.databind.ObjectMapper;
26-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
26+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
2727
import com.fasterxml.jackson.databind.annotation.JsonNaming;
2828
import java.io.File;
2929
import java.io.IOException;
3030
import org.zaproxy.gradle.addon.internal.BuildException;
3131

3232
/** The release state computed from {@code gradle.properties} files. */
33-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
33+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
3434
@JsonInclude(value = Include.NON_EMPTY)
3535
public class ReleaseState {
3636

src/main/java/org/zaproxy/gradle/addon/internal/tasks/CreatePullRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void pullRequest() throws Exception {
137137
.head(ghUser.getName() + ":" + getBranchName().get())
138138
.state(GHIssueState.OPEN)
139139
.list()
140-
.asList();
140+
.toList();
141141
String description =
142142
getPullRequestDescription().getOrElse(getCommitDescription().get());
143143
if (pulls.isEmpty()) {

src/main/java/org/zaproxy/gradle/addon/internal/tasks/PrepareNextDevIter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private static String bumpVersion(String version) {
8383
}
8484

8585
try {
86-
return Version.valueOf(version).incrementMinorVersion().toString();
86+
return Version.parse(version).nextMinorVersion().toString();
8787
} catch (IllegalArgumentException | ParseException e) {
8888
throw new InvalidUserDataException(
8989
"Failed to parse the current version: " + version, e);

src/main/java/org/zaproxy/gradle/addon/misc/ConvertMarkdownToHtml.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
import com.vladsch.flexmark.ext.tables.TablesExtension;
2525
import com.vladsch.flexmark.html.HtmlRenderer;
2626
import com.vladsch.flexmark.parser.Parser;
27-
import com.vladsch.flexmark.util.options.MutableDataSet;
27+
import com.vladsch.flexmark.util.data.MutableDataSet;
2828
import java.io.IOException;
2929
import java.io.Writer;
30-
import java.nio.charset.StandardCharsets;
3130
import java.nio.file.Files;
3231
import java.util.Arrays;
3332
import org.gradle.api.DefaultTask;
@@ -80,10 +79,7 @@ public void convert() throws IOException {
8079
Parser parser = Parser.builder(options).build();
8180
HtmlRenderer renderer = HtmlRenderer.builder(options).build();
8281

83-
String changes =
84-
new String(
85-
Files.readAllBytes(markdown.get().getAsFile().toPath()),
86-
StandardCharsets.UTF_8);
82+
String changes = Files.readString(markdown.get().getAsFile().toPath());
8783
try (Writer writer = Files.newBufferedWriter(html.get().getAsFile().toPath())) {
8884
renderer.render(parser.parse(changes), writer);
8985
}

src/main/java/org/zaproxy/gradle/addon/misc/PrepareAddOnNextDevIter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private static String bumpVersion(String version) {
120120
}
121121

122122
try {
123-
return Version.valueOf(version).incrementMinorVersion().toString();
123+
return Version.parse(version).nextMinorVersion().toString();
124124
} catch (IllegalArgumentException | ParseException e) {
125125
throw new InvalidUserDataException(
126126
"Failed to parse the current version: " + version, e);

0 commit comments

Comments
 (0)