Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 4 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@
<hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.504</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<!-- TODO https://github.com/jenkinsci/jenkins/pull/11269 -->
<jenkins.version>2.537-rc37714.d5718019b_8ff</jenkins.version>
<spotless.check.skip>false</spotless.check.skip>
<!-- AvatarContributor in GitHubOrgMetadataAction; SuppressRestrictedWarnings doesn't work -->
<useBeta>true</useBeta>
</properties>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.ObjectStreamException;
import java.util.Objects;
import jenkins.scm.api.metadata.AvatarMetadataAction;
import jenkins.security.csp.AvatarContributor;
import org.apache.commons.lang3.StringUtils;
import org.kohsuke.github.GHUser;
import org.kohsuke.stapler.Stapler;
Expand All @@ -52,6 +53,7 @@

public GitHubOrgMetadataAction(@CheckForNull String avatar) {
this.avatar = Util.fixEmpty(avatar);
AvatarContributor.allow(avatar);
}

public GitHubOrgMetadataAction(@NonNull GitHubOrgMetadataAction that) {
Expand All @@ -60,6 +62,7 @@

private Object readResolve() throws ObjectStreamException {
if (avatar != null && StringUtils.isBlank(avatar)) return new GitHubOrgMetadataAction(this);
AvatarContributor.allow(avatar);

Check warning on line 65 in src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubOrgMetadataAction.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line

Line 65 is not covered by tests
return this;
}

Expand Down
Loading