Skip to content

[pull] main from zaproxy:main #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Nov 24, 2025
Merged

[pull] main from zaproxy:main #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a11f38
Update Maven URLs and address JavaDoc errors
thc202 Nov 24, 2025
43d88af
Merge pull request #9154 from thc202/mvn-tweaks
kingthorin Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/org/zaproxy/zap/publish.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ val ossrhPassword: String? by project
publishing {
repositories {
maven {
val releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
val snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
val releasesRepoUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
val snapshotsRepoUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
setUrl(provider { if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl })

if (ossrhUsername != null && ossrhPassword != null) {
Expand Down
8 changes: 1 addition & 7 deletions zap/src/main/java/org/parosproxy/paros/model/SiteNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,7 @@ public class SiteNode extends DefaultMutableTreeNode {
*/
private boolean calculateHighestAlert;

/**
* The {@code Alert} with highest risk (and not a false positive).
*
* @see #isHighestAlert(Alert)
*/
/** The {@code Alert} with highest risk (and not a false positive). */
private Alert highestAlert;

public SiteNode(SiteMap siteMap, int type, String nodeName) {
Expand Down Expand Up @@ -209,8 +205,6 @@ public List<ImageIcon> getCustomIcons() {
* <p>After a call to this method the {@link #highestAlert} will have the highest alert (or
* {@code null} if none) and the flag {@link #calculateHighestAlert} will have the value {@code
* false}.
*
* @see #isHighestAlert(Alert)
*/
private void calculateHighestAlert() {
highestAlert = alerts.getHighestRisk();
Expand Down
2 changes: 1 addition & 1 deletion zap/src/main/java/org/zaproxy/zap/authentication/ScriptBasedAuthenticationMethodType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ public void actionPerformed(ActionEvent e) {
/**
* Adds custom fields to the panel.
*
* @param row the new row to add the custom fields.
* @param y the new row to add the custom fields.
* @return the row after adding the custom fields.
* @since 2.17.0
*/
Expand Down
Loading