Skip to content
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.

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

[JENKINS-57917] Add AddHtmlBadge feature #42

Merged
merged 1 commit into from
Jun 15, 2019

Conversation

ikedam
Copy link
Member

@ikedam ikedam commented Jun 8, 2019

https://issues.jenkins-ci.org/browse/JENKINS-57917

Added AddHtmlBadge to groovy-postbuild as a wrapper for the same feature of badge-plugin.

Existing badge features in groovy-postbuild doesn't accept HTML texts since 2.4.
Actually, that was unexpected regression introduced by my fault, but I didn't revert that for security reasons.
This provides an alternate way to use HTML for users used HTML texts in groovy-postbuild before 2.4.

@ikedam ikedam requested a review from bakito June 8, 2019 05:14
@@ -35,7 +35,7 @@
<properties>
<jenkins.version>2.60.3</jenkins.version>
<java.level>8</java.level>
<badge-plugin.version>1.2</badge-plugin.version>
<badge-plugin.version>1.5</badge-plugin.version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addHtmlBadge is introduced in 1.3.
There's a security fix in 1.5.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't you switch to the latest version?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I consider those definitions for other plugins as requirements rather than dependencies in standard Java projects.

@@ -491,6 +492,95 @@ public void testBadgeMigration() throws Exception {
}
}

@Test
public void testAddShortText() throws Exception {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though tests for AddShortText is not directly related to this request,
I added those tests in this request as the unexpected regression was caused
for there was no test codes for badge-related features.

Copy link
Contributor

@bakito bakito left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@ikedam ikedam force-pushed the feature/JENKINS-57917_AddHtmlBadge branch from 42f7b8f to b5e678a Compare June 15, 2019 08:27
@ikedam
Copy link
Member Author

ikedam commented Jun 15, 2019

Rebased to resolve conflict with #40 .

@ikedam ikedam merged commit 60986ad into jenkinsci:master Jun 15, 2019
@MarkEWaite MarkEWaite added the enhancement Improvement or new feature label Dec 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Improvement or new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants