From a40627bf3d81963969151749a61dc8ce148aa2f5 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 11 May 2018 17:44:33 -0400 Subject: [PATCH] #368 --- .../java/com/cflint/config/CFLintConfig.java | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/src/main/java/com/cflint/config/CFLintConfig.java b/src/main/java/com/cflint/config/CFLintConfig.java index 0907043ec..576bad4fc 100644 --- a/src/main/java/com/cflint/config/CFLintConfig.java +++ b/src/main/java/com/cflint/config/CFLintConfig.java @@ -18,34 +18,12 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class CFLintConfig extends BaseConfig { - @Deprecated - private List output = new ArrayList<>(); private List rules = new ArrayList<>(); private List excludes = new ArrayList<>(); private List includes = new ArrayList<>(); private HashMap parameters = new HashMap<>(); private boolean inheritParent = true; - @Deprecated - private boolean inheritPlugins = true; - - /* - * (non-Javadoc) - * - * @see com.cflint.config.CFLintConfiguration#getOutput() - */ - @Deprecated - public List getOutput() { - return output; - } - - @XmlElement(name = "output") - @Deprecated - public void setOutput(final List output) { - System.err.println( - "DEPRECATED: The use of \"output\" have been marked as deprecated in CFLint 1.2.x and support for them will be fully removed in CFLint 1.4.0. Please remove the settings from your configuration file(s). Run CFLint in verbose mode for config file location details."); - this.output = output; - } public HashMap getParameters() { return parameters; @@ -109,20 +87,6 @@ public void setInheritParent(final boolean inheritParent) { this.inheritParent = inheritParent; } - @Deprecated - public boolean isInheritPlugins() { - return inheritPlugins; - } - - @XmlAttribute(name = "inheritPlugins") - @Deprecated - public void setInheritPlugins(final boolean inheritPlugins) { - // #315 --- inheritPlugins can not be overwritten to false in 1.2.0 --- will be fully removed in 1.4.0 (but will then break people's setup if the setting remains in .cflintrc or the xml config - System.err.println( - "DEPRECATED: The use of \"inheritPlugins\" have been marked as deprecated in CFLint 1.2.x and support for them will be fully removed in CFLint 1.4.0. Please remove the settings from your configuration file(s). Run CFLint in verbose mode for config file location details."); - this.inheritPlugins = true; - } - public static class ConfigOutput { private String name;