diff --git a/pom.xml b/pom.xml index eaa9eac1e..6bbadcfa0 100644 --- a/pom.xml +++ b/pom.xml @@ -154,18 +154,6 @@ org.jenkins-ci.plugins mailer - - org.jvnet.hudson.plugins - analysis-core - 1.54 - true - - - asm - asm - - - org.jenkins-ci.plugins config-file-provider diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/ScriptContentBuildWrapper.java b/src/main/java/hudson/plugins/emailext/plugins/content/ScriptContentBuildWrapper.java index 74db2eeb6..b80f98f31 100644 --- a/src/main/java/hudson/plugins/emailext/plugins/content/ScriptContentBuildWrapper.java +++ b/src/main/java/hudson/plugins/emailext/plugins/content/ScriptContentBuildWrapper.java @@ -6,7 +6,6 @@ import hudson.tasks.junit.TestResult; import hudson.tasks.junit.TestResultAction; import hudson.tasks.test.AggregatedTestResultAction; -import jenkins.model.Jenkins; import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted; import java.util.ArrayList; @@ -35,35 +34,6 @@ public Action getAction(String className) { return null; } - /** - * Returns all build actions that derive from - * AbstractResultAction. Every action represents a single - * analysis result. - * - * @return The static analysis actions for the current build. The returned - * list might be empty if there are no such actions. - */ - @Whitelisted - public List getStaticAnalysisActions() { - if (isPluginInstalled("analysis-core")) { - return new StaticAnalysisUtilities().getActions(build); - } else { - return Collections.emptyList(); - } - } - - /** - * Returns whether the specified plug-in is installed. - * - * @param shortName - * the plug-in to check - * @return true if the specified plug-in is installed, - * false if not. - */ - public static boolean isPluginInstalled(final String shortName) { - return Jenkins.get().getPlugin(shortName) != null; - } - @Whitelisted public Action getCoberturaAction() { return getAction("hudson.plugins.cobertura.CoberturaBuildAction"); diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/StaticAnalysisUtilities.java b/src/main/java/hudson/plugins/emailext/plugins/content/StaticAnalysisUtilities.java deleted file mode 100644 index b30e4b236..000000000 --- a/src/main/java/hudson/plugins/emailext/plugins/content/StaticAnalysisUtilities.java +++ /dev/null @@ -1,38 +0,0 @@ -package hudson.plugins.emailext.plugins.content; - -import hudson.model.Action; -import hudson.model.Run; -import hudson.plugins.analysis.core.AbstractResultAction; -import hudson.plugins.analysis.core.MavenResultAction; - -import java.util.ArrayList; -import java.util.List; - -/** - * Provides some helper methods to integrate the static analysis plug-ins into - * email-ext. Methods of this class will throw {@link ClassNotFoundException} if - * the analysis-core plug-in is not installed. - * - * @author Ulli Hafner - */ -public class StaticAnalysisUtilities { - - /** - * Returns all build actions that derive from {@link AbstractResultAction}. - * Every action represents a single analysis result. - * - * @param build the build to get the actions for - * @return The static analysis actions for the specified build. The returned - * list might be empty if there are no such actions. - */ - @Deprecated - public List getActions(Run build) { - ArrayList actions = new ArrayList<>(); - for (Action action : build.getActions(Action.class)) { - if (AbstractResultAction.class.isInstance(action) || MavenResultAction.class.isInstance(action)) { - actions.add(action); - } - } - return actions; - } -} diff --git a/src/main/resources/hudson/plugins/emailext/templates/static-analysis.jelly b/src/main/resources/hudson/plugins/emailext/templates/static-analysis.jelly index de1385a2f..00c5a35ff 100644 --- a/src/main/resources/hudson/plugins/emailext/templates/static-analysis.jelly +++ b/src/main/resources/hudson/plugins/emailext/templates/static-analysis.jelly @@ -371,56 +371,6 @@ - - - -
-

Static Analysis Results

- - - - - - - - - - - - - - - - - - - - - -
NameResultTotalHighNormalLow
- - - ${action.displayName} - - - - - - - - - - - - - ${action.result.numberOfAnnotations} ${action.result.getNumberOfAnnotations('HIGH')} ${action.result.getNumberOfAnnotations('NORMAL')} ${action.result.getNumberOfAnnotations('LOW')}
-

- Warning (see JENKINS-55744): Integration with the Static Analysis Utilities plugin has - been deprecated in the Email Extension plugin and will be removed in a future release. -

-
-
-