diff --git a/pom.xml b/pom.xml index 1b9cfa9d9..f0ef9e0db 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ jenkinsci/${project.artifactId}-plugin 2.2.0 8 - 2.283 + 2.277.1 true diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java index 425bef352..d44adb13e 100644 --- a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java +++ b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java @@ -83,7 +83,6 @@ import net.jcip.annotations.GuardedBy; import org.apache.commons.lang.StringUtils; import org.jenkins.ui.icon.Icon; -import org.jenkins.ui.icon.IconFormat; import org.jenkins.ui.icon.IconSet; import org.jenkins.ui.icon.IconSpec; import org.jenkinsci.Symbol; @@ -1777,77 +1776,65 @@ public List>> getTraitsDefaults() { IconSet.icons.addIcon( new Icon( "icon-github-logo icon-sm", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", - Icon.ICON_SMALL_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/16x16/github-logo.png", + Icon.ICON_SMALL_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-md", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", - Icon.ICON_MEDIUM_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/24x24/github-logo.png", + Icon.ICON_MEDIUM_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-lg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", - Icon.ICON_LARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/32x32/github-logo.png", + Icon.ICON_LARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-xlg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", - Icon.ICON_XLARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/48x48/github-logo.png", + Icon.ICON_XLARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-sm", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", - Icon.ICON_SMALL_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/16x16/github-repo.png", + Icon.ICON_SMALL_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-md", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", - Icon.ICON_MEDIUM_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/24x24/github-repo.png", + Icon.ICON_MEDIUM_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-lg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", - Icon.ICON_LARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/32x32/github-repo.png", + Icon.ICON_LARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-xlg", - "github-branch-source/images/svgs/sprite-github.svg#github-repo", - Icon.ICON_XLARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/48x48/github-repo.png", + Icon.ICON_XLARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-sm", - "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", - Icon.ICON_SMALL_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/16x16/github-branch.png", + Icon.ICON_SMALL_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-md", - "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", - Icon.ICON_MEDIUM_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/24x24/github-branch.png", + Icon.ICON_MEDIUM_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-lg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", - Icon.ICON_LARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/32x32/github-branch.png", + Icon.ICON_LARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-xlg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", - Icon.ICON_XLARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/48x48/github-branch.png", + Icon.ICON_XLARGE_STYLE)); } } diff --git a/src/main/webapp/images/16x16/github-branch.png b/src/main/webapp/images/16x16/github-branch.png new file mode 100644 index 000000000..50bee5ced Binary files /dev/null and b/src/main/webapp/images/16x16/github-branch.png differ diff --git a/src/main/webapp/images/16x16/github-repo.png b/src/main/webapp/images/16x16/github-repo.png new file mode 100644 index 000000000..8b066c9a6 Binary files /dev/null and b/src/main/webapp/images/16x16/github-repo.png differ diff --git a/src/main/webapp/images/24x24/github-branch.png b/src/main/webapp/images/24x24/github-branch.png new file mode 100644 index 000000000..97e02334f Binary files /dev/null and b/src/main/webapp/images/24x24/github-branch.png differ diff --git a/src/main/webapp/images/24x24/github-repo.png b/src/main/webapp/images/24x24/github-repo.png new file mode 100644 index 000000000..3ccfa3b3b Binary files /dev/null and b/src/main/webapp/images/24x24/github-repo.png differ diff --git a/src/main/webapp/images/32x32/github-branch.png b/src/main/webapp/images/32x32/github-branch.png new file mode 100644 index 000000000..fcd485ed8 Binary files /dev/null and b/src/main/webapp/images/32x32/github-branch.png differ diff --git a/src/main/webapp/images/32x32/github-repo.png b/src/main/webapp/images/32x32/github-repo.png new file mode 100644 index 000000000..9c2102250 Binary files /dev/null and b/src/main/webapp/images/32x32/github-repo.png differ diff --git a/src/main/webapp/images/48x48/github-branch.png b/src/main/webapp/images/48x48/github-branch.png new file mode 100644 index 000000000..4a1a94065 Binary files /dev/null and b/src/main/webapp/images/48x48/github-branch.png differ diff --git a/src/main/webapp/images/48x48/github-repo.png b/src/main/webapp/images/48x48/github-repo.png new file mode 100644 index 000000000..227787a7d Binary files /dev/null and b/src/main/webapp/images/48x48/github-repo.png differ diff --git a/src/main/webapp/images/svgs/sprite-github.svg b/src/main/webapp/images/svgs/sprite-github.svg deleted file mode 100644 index 0f41928da..000000000 --- a/src/main/webapp/images/svgs/sprite-github.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - \ No newline at end of file