Updating fmt-maven-plugin

jenkinsci · Aug 30, 2018 · 1853603 · 1853603
1 parent edb66bf
commit 1853603
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 83 deletions.
diff --git a/pom.xml b/pom.xml
@@ -138,7 +138,7 @@ Changelog of Violation Comments to Bitbucket Server Plugin.
 			<plugin>
 				<groupId>com.coveo</groupId>
 				<artifactId>fmt-maven-plugin</artifactId>
-				<version>1.3.0</version>
+				<version>2.5.1</version>
 				<executions>
 					<execution>
 						<goals>

diff --git a/src/main/java/org/jenkinsci/plugins/jvctb/ViolationsToBitbucketServerDescriptor.java b/src/main/java/org/jenkinsci/plugins/jvctb/ViolationsToBitbucketServerDescriptor.java
@@ -2,17 +2,16 @@
 
 import static org.jenkinsci.plugins.jvctb.config.ViolationsToBitbucketServerConfigHelper.FIELD_MINSEVERITY;
 
-import org.apache.commons.lang.StringUtils;
-import org.jenkinsci.Symbol;
-import org.jenkinsci.plugins.jvctb.config.ViolationsToBitbucketServerConfig;
-import org.kohsuke.stapler.StaplerRequest;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.model.AbstractProject;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.Publisher;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
+import org.jenkinsci.Symbol;
+import org.jenkinsci.plugins.jvctb.config.ViolationsToBitbucketServerConfig;
+import org.kohsuke.stapler.StaplerRequest;
 
 @Extension
 @Symbol("ViolationsToBitbucketServer")

diff --git a/...main/java/org/jenkinsci/plugins/jvctb/ViolationsToBitbucketServerGlobalConfiguration.java b/...main/java/org/jenkinsci/plugins/jvctb/ViolationsToBitbucketServerGlobalConfiguration.java
@@ -2,8 +2,14 @@
 
 import static org.jenkinsci.plugins.jvctb.config.CredentialsHelper.migrateCredentials;
 
+import com.google.common.base.Optional;
+import hudson.Extension;
+import hudson.model.Item;
+import hudson.util.FormValidation;
+import hudson.util.ListBoxModel;
 import java.io.Serializable;
-
+import jenkins.model.GlobalConfiguration;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.jvctb.config.CredentialsHelper;
 import org.kohsuke.accmod.Restricted;
@@ -12,15 +18,6 @@
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
-
-import com.google.common.base.Optional;
-
-import hudson.Extension;
-import hudson.model.Item;
-import hudson.util.FormValidation;
-import hudson.util.ListBoxModel;
-import jenkins.model.GlobalConfiguration;
-import net.sf.json.JSONObject;
 import se.bjurr.violations.lib.model.SEVERITY;
 
 /** Created by magnayn on 07/04/2016. */

diff --git a/src/main/java/org/jenkinsci/plugins/jvctb/ViolationsToBitbucketServerRecorder.java b/src/main/java/org/jenkinsci/plugins/jvctb/ViolationsToBitbucketServerRecorder.java
@@ -1,5 +1,8 @@
 package org.jenkinsci.plugins.jvctb;
 
+import static hudson.tasks.BuildStepMonitor.NONE;
+import static org.jenkinsci.plugins.jvctb.perform.JvctbPerformer.jvctsPerform;
+
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.FilePath;
 import hudson.Launcher;
@@ -10,23 +13,17 @@
 import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Publisher;
 import hudson.tasks.Recorder;
-import jenkins.model.Jenkins;
-import jenkins.tasks.SimpleBuildStep;
-import org.jenkinsci.plugins.jvctb.config.ViolationsToBitbucketServerConfig;
-import org.kohsuke.stapler.DataBoundConstructor;
-import se.bjurr.violations.comments.bitbucketserver.lib.ViolationCommentsToBitbucketServerApi;
-
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.SocketAddress;
 import java.net.URL;
-
-import static hudson.tasks.BuildStepMonitor.NONE;
-import static org.jenkinsci.plugins.jvctb.perform.JvctbPerformer.jvctsPerform;
-import static se.bjurr.violations.comments.bitbucketserver.lib.ViolationCommentsToBitbucketServerApi.violationCommentsToBitbucketServerApi;
+import jenkins.model.Jenkins;
+import jenkins.tasks.SimpleBuildStep;
+import org.jenkinsci.plugins.jvctb.config.ViolationsToBitbucketServerConfig;
+import org.kohsuke.stapler.DataBoundConstructor;
 
 public class ViolationsToBitbucketServerRecorder extends Recorder implements SimpleBuildStep {
 

diff --git a/src/main/java/org/jenkinsci/plugins/jvctb/config/CredentialsHelper.java b/src/main/java/org/jenkinsci/plugins/jvctb/config/CredentialsHelper.java
@@ -4,11 +4,6 @@
 import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.base.Strings.isNullOrEmpty;
 
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.jenkinsci.plugins.plaincredentials.StringCredentials;
-
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import com.cloudbees.plugins.credentials.CredentialsScope;
@@ -20,15 +15,17 @@
 import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
 import com.google.common.base.Optional;
-
 import hudson.model.Item;
 import hudson.model.Queue;
 import hudson.model.queue.Tasks;
 import hudson.security.ACL;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import hudson.util.Secret;
+import java.util.List;
 import jenkins.model.Jenkins;
+import org.apache.commons.lang.StringUtils;
+import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
 /* Read more about credentials api here: https://github.com/jenkinsci/credentials-plugin/blob/master/docs/consumer.adoc */
 public class CredentialsHelper {

diff --git a/src/main/java/org/jenkinsci/plugins/jvctb/config/ViolationConfig.java b/src/main/java/org/jenkinsci/plugins/jvctb/config/ViolationConfig.java
@@ -1,16 +1,14 @@
 package org.jenkinsci.plugins.jvctb.config;
 
-import java.io.Serializable;
-
-import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.DataBoundConstructor;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
 import hudson.util.ListBoxModel;
+import java.io.Serializable;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.DataBoundConstructor;
 import se.bjurr.violations.lib.reports.Parser;
 
 public class ViolationConfig extends AbstractDescribableImpl<ViolationConfig>

diff --git a/src/main/java/org/jenkinsci/plugins/jvctb/config/ViolationsToBitbucketServerConfig.java b/src/main/java/org/jenkinsci/plugins/jvctb/config/ViolationsToBitbucketServerConfig.java
@@ -4,9 +4,16 @@
 import static com.google.common.collect.Lists.newArrayList;
 import static org.jenkinsci.plugins.jvctb.config.CredentialsHelper.migrateCredentials;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
+import hudson.Util;
+import hudson.model.AbstractDescribableImpl;
+import hudson.model.Descriptor;
+import hudson.model.Item;
+import hudson.util.FormValidation;
+import hudson.util.ListBoxModel;
 import java.io.Serializable;
 import java.util.List;
-
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.jvctb.ViolationsToBitbucketServerGlobalConfiguration;
 import org.kohsuke.accmod.Restricted;
@@ -15,15 +22,6 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import hudson.Extension;
-import hudson.Util;
-import hudson.model.AbstractDescribableImpl;
-import hudson.model.Descriptor;
-import hudson.model.Item;
-import hudson.util.FormValidation;
-import hudson.util.ListBoxModel;
 import se.bjurr.violations.lib.model.SEVERITY;
 
 public class ViolationsToBitbucketServerConfig

diff --git a/src/main/java/org/jenkinsci/plugins/jvctb/perform/JvctbPerformer.java b/src/main/java/org/jenkinsci/plugins/jvctb/perform/JvctbPerformer.java
@@ -1,37 +1,5 @@
 package org.jenkinsci.plugins.jvctb.perform;
 
-import com.cloudbees.plugins.credentials.common.StandardCredentials;
-import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
-import com.google.common.io.CharStreams;
-import hudson.EnvVars;
-import hudson.FilePath;
-import hudson.FilePath.FileCallable;
-import hudson.model.Run;
-import hudson.model.TaskListener;
-import hudson.remoting.VirtualChannel;
-import hudson.util.Secret;
-import org.jenkinsci.plugins.jvctb.ProxyConfigDetails;
-import org.jenkinsci.plugins.jvctb.config.ViolationConfig;
-import org.jenkinsci.plugins.jvctb.config.ViolationsToBitbucketServerConfig;
-import org.jenkinsci.plugins.plaincredentials.StringCredentials;
-import org.jenkinsci.remoting.RoleChecker;
-import se.bjurr.violations.comments.bitbucketserver.lib.ViolationCommentsToBitbucketServerApi;
-import se.bjurr.violations.lib.model.SEVERITY;
-import se.bjurr.violations.lib.model.Violation;
-import se.bjurr.violations.lib.reports.Parser;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.util.List;
-import java.util.logging.Logger;
-
 import static com.google.common.base.Charsets.UTF_8;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.base.Throwables.propagate;
@@ -54,6 +22,37 @@
 import static se.bjurr.violations.lib.parsers.FindbugsParser.setFindbugsMessagesXml;
 import static se.bjurr.violations.lib.util.Filtering.withAtLEastSeverity;
 
+import com.cloudbees.plugins.credentials.common.StandardCredentials;
+import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Optional;
+import com.google.common.io.CharStreams;
+import hudson.EnvVars;
+import hudson.FilePath;
+import hudson.FilePath.FileCallable;
+import hudson.model.Run;
+import hudson.model.TaskListener;
+import hudson.remoting.VirtualChannel;
+import hudson.util.Secret;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.util.List;
+import java.util.logging.Logger;
+import org.jenkinsci.plugins.jvctb.ProxyConfigDetails;
+import org.jenkinsci.plugins.jvctb.config.ViolationConfig;
+import org.jenkinsci.plugins.jvctb.config.ViolationsToBitbucketServerConfig;
+import org.jenkinsci.plugins.plaincredentials.StringCredentials;
+import org.jenkinsci.remoting.RoleChecker;
+import se.bjurr.violations.comments.bitbucketserver.lib.ViolationCommentsToBitbucketServerApi;
+import se.bjurr.violations.lib.model.SEVERITY;
+import se.bjurr.violations.lib.model.Violation;
+import se.bjurr.violations.lib.reports.Parser;
+
 public class JvctbPerformer {
   private static Logger LOG = Logger.getLogger(JvctbPerformer.class.getSimpleName());
 

diff --git a/src/test/java/org/jenkinsci/plugins/jvctb/config/ViolationsToBitbucketServerConfigTest.java b/src/test/java/org/jenkinsci/plugins/jvctb/config/ViolationsToBitbucketServerConfigTest.java
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-
 import uk.co.jemos.podam.api.PodamFactoryImpl;
 
 public class ViolationsToBitbucketServerConfigTest {

diff --git a/src/test/java/org/jenkinsci/plugins/jvctb/perform/JvctbPerformerTest.java b/src/test/java/org/jenkinsci/plugins/jvctb/perform/JvctbPerformerTest.java
@@ -1,11 +1,10 @@
 package org.jenkinsci.plugins.jvctb.perform;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import hudson.EnvVars;
 
+import hudson.EnvVars;
 import org.jenkinsci.plugins.jvctb.config.ViolationsToBitbucketServerConfig;
 import org.junit.Test;
-
 import uk.co.jemos.podam.api.PodamFactoryImpl;
 
 public class JvctbPerformerTest {