Skip to content

Commit 4f4f118

Browse files
committed
Update add-on plugin, help links, and ZAP version
Update add-on plugin to 0.3.0: - Specify the repo URL in the add-on manifest. - Change info URL to point to the help page. - Remove wiki gen configurations, no longer needed. Set minimum ZAP version to 2.9.0. Update online help link in the README to the new location. Signed-off-by: thc202 <[email protected]>
1 parent bf3eaf3 commit 4f4f118

File tree

3 files changed

+5
-21
lines changed

3 files changed

+5
-21
lines changed

README.md

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

33
Welcome to the OWASP Zed Attack Proxy (ZAP) Desktop User Guide.
44

5-
This is available both as context sensitive help within ZAP and online here in the [wiki](https://github.com/zaproxy/zap-core-help/wiki).
5+
This is available both as context sensitive help within ZAP and online in the [ZAP website](https://www.zaproxy.org/docs/desktop/).
66

77
The English help files are under the [/addOns/help](https://github.com/zaproxy/zap-core-help/tree/master/addOns/help) directory, so if you'd like to make a change, create a pull request against those files, and they will be updated in the wiki.
88

addOns/addOns.gradle.kts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import org.zaproxy.gradle.addon.manifest.ManifestExtension
44
import org.zaproxy.gradle.addon.misc.ConvertMarkdownToHtml
55
import org.zaproxy.gradle.addon.misc.CreateGitHubRelease
66
import org.zaproxy.gradle.addon.misc.ExtractLatestChangesFromChangelog
7-
import org.zaproxy.gradle.addon.wiki.WikiGenExtension
87

98
plugins {
109
eclipse
11-
id("org.zaproxy.add-on") version "0.2.0" apply false
10+
id("org.zaproxy.add-on") version "0.3.0" apply false
1211
}
1312

1413
eclipse {
@@ -34,24 +33,16 @@ subprojects {
3433
targetCompatibility = JavaVersion.VERSION_1_8
3534
}
3635

37-
tasks.named<Jar>("jarJavaHelpDataForWiki") {
38-
from(configurations.named("runtimeClasspath").map { it.files.map { file -> if (file.isDirectory) file else project.zipTree(file) } })
39-
}
40-
4136
zapAddOn {
4237
zapVersion.set("2.7.0")
4338

4439
releaseLink.set(project.provider { "https://github.com/zaproxy/zap-core-help/releases/${zapAddOn.addOnId.get()}-v@CURRENT_VERSION@" })
4540

4641
manifest {
4742
author.set("ZAP Crowdin Team")
48-
url.set("https://github.com/zaproxy/zap-core-help/")
43+
repo.set("https://github.com/zaproxy/zap-core-help/")
4944
changesFile.set(tasks.named<ConvertMarkdownToHtml>("generateManifestChanges").flatMap { it.html })
5045
}
51-
52-
wikiGen {
53-
wikiFilesPrefix.set("Help")
54-
}
5546
}
5647

5748
dependencies {
@@ -122,6 +113,3 @@ val Project.zapAddOn: AddOnPluginExtension get() =
122113

123114
fun AddOnPluginExtension.manifest(configure: ManifestExtension.() -> Unit): Unit =
124115
(this as ExtensionAware).extensions.configure("manifest", configure)
125-
126-
fun AddOnPluginExtension.wikiGen(configure: WikiGenExtension.() -> Unit): Unit =
127-
(this as ExtensionAware).extensions.configure("wikiGen", configure)

addOns/help/help.gradle.kts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ zapAddOn {
77
addOnStatus.set(AddOnStatus.RELEASE)
88

99
manifest {
10-
url.set("https://github.com/zaproxy/zap-core-help/wiki/HelpIntro")
11-
notBeforeVersion.set("2.8.0")
12-
}
13-
14-
wikiGen {
15-
wikiDir.set(file("$rootDir/../zap-core-help-wiki/"))
10+
url.set("https://www.zaproxy.org/docs/desktop/")
11+
notBeforeVersion.set("2.9.0")
1612
}
1713
}

0 commit comments

Comments
 (0)