diff --git a/pom.xml b/pom.xml index 3135a8d..a031c90 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,9 @@ 1.29.0-2 -SNAPSHOT + 2.346 + 2.380-rc33164.1fa_0f3ffcdb_c + ${project.groupId}.prism 1.17.5 diff --git a/skip.sh b/skip.sh new file mode 100755 index 0000000..7516eef --- /dev/null +++ b/skip.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -e + +JENKINS_HOME=../docker/volumes/jenkins-home + +mvn clean install -Pskip || { echo "Build failed"; exit 1; } + +echo "Installing plugin in $JENKINS_HOME" + +rm -rf $JENKINS_HOME/plugins/prism-api-plugin* +cp -fv target/prism-api.hpi $JENKINS_HOME/plugins/prism-api.jpi + +CURRENT_UID="$(id -u):$(id -g)" +export CURRENT_UID +IS_RUNNING=$(docker-compose ps -q jenkins-controller) +if [[ "$IS_RUNNING" != "" ]]; then + docker-compose restart + echo "Restarting Jenkins (docker compose with user ID ${CURRENT_UID}) ..." +fi diff --git a/src/main/java/io/jenkins/plugins/prism/SourcePrinter.java b/src/main/java/io/jenkins/plugins/prism/SourcePrinter.java index c9177d6..94485a2 100644 --- a/src/main/java/io/jenkins/plugins/prism/SourcePrinter.java +++ b/src/main/java/io/jenkins/plugins/prism/SourcePrinter.java @@ -4,6 +4,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; +import org.jenkins.ui.symbol.Symbol; +import org.jenkins.ui.symbol.SymbolRequest; import edu.hm.hafner.util.LookaheadStream; import edu.hm.hafner.util.VisibleForTesting; @@ -13,7 +15,6 @@ import j2html.tags.UnescapedText; import io.jenkins.plugins.fontawesome.api.SvgTag; -import io.jenkins.plugins.fontawesome.api.SvgTag.FontAwesomeStyle; import io.jenkins.plugins.util.JenkinsFacade; import static j2html.TagCreator.*; @@ -103,11 +104,11 @@ private ContainerTag createBox(final Marker marker) { private DomContent createIcon(final String name) { if (name.startsWith("symbol")) { - // TODO: replace with Jenkins symbol tag once https://github.com/jenkinsci/jenkins/pull/6659 is merged - return new UnescapedText( - new SvgTag("bookmark", jenkinsFacade, FontAwesomeStyle.REGULAR) - .withClasses(ICON_MD) - .render()); + String symbol = Symbol.get(new SymbolRequest.Builder() + .withRaw(name) + .withClasses(ICON_MD) + .build()); + return new UnescapedText(symbol); } return img().withSrc(jenkinsFacade.getImagePath(name)).withClasses(ICON_MD); }