Revert "Merge pull request #393 from timja/use-svgs"

This reverts commit 87fe08f, reversing
changes made to 523fad3.

pom.xml

@@ -26,7 +26,7 @@
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
         <java.level>8</java.level>
-        <jenkins.version>2.283</jenkins.version>
+        <jenkins.version>2.277.1</jenkins.version>
         <useBeta>true</useBeta>
     </properties>
 

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<SCMTrait<? extends SCMTrait<?>>> 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));
     }
   }