From 47f738c54c6e8f5ead678aacfda1faa1d7433db8 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 1 May 2017 13:27:00 -0400 Subject: [PATCH 1/9] [JENKINS-26100] Switch buildEnvVars and others to Run --- pom.xml | 5 +++-- src/main/java/hudson/plugins/git/GitSCM.java | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 128fe7f291..1dcdc84a01 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 2.26 + 2.27-20170501.155323-2 @@ -24,7 +24,8 @@ 2007 - 1.625.3 + 2.58-20170501.171905-3 + 2.58-20170501.171927-3 7 false 1C diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java index f3f567b877..d06c6afbee 100644 --- a/src/main/java/hudson/plugins/git/GitSCM.java +++ b/src/main/java/hudson/plugins/git/GitSCM.java @@ -1255,8 +1255,8 @@ private void computeChangeLog(GitClient git, Revision revToBuild, TaskListener l } } - public void buildEnvVars(AbstractBuild build, java.util.Map env) { - super.buildEnvVars(build, env); + @Override + public void buildEnvVars(Run build, java.util.Map env) { Revision rev = fixNull(getBuildData(build)).getLastBuiltRevision(); if (rev!=null) { Branch branch = Iterables.getFirst(rev.getBranches(), null); @@ -1319,7 +1319,7 @@ private String getBranchName(Branch branch) return name; } - private String getLastBuiltCommitOfBranch(AbstractBuild build, Branch branch) { + private String getLastBuiltCommitOfBranch(Run build, Branch branch) { String prevCommit = null; if (build.getPreviousBuiltBuild() != null) { final Build lastBuildOfBranch = fixNull(getBuildData(build.getPreviousBuiltBuild())).getLastBuildOfBranch(branch.getName()); @@ -1333,7 +1333,7 @@ private String getLastBuiltCommitOfBranch(AbstractBuild build, Branch bran return prevCommit; } - private String getLastSuccessfulBuiltCommitOfBranch(AbstractBuild build, Branch branch) { + private String getLastSuccessfulBuiltCommitOfBranch(Run build, Branch branch) { String prevCommit = null; if (build.getPreviousSuccessfulBuild() != null) { final Build lastSuccessfulBuildOfBranch = fixNull(getBuildData(build.getPreviousSuccessfulBuild())).getLastBuildOfBranch(branch.getName()); From 6ee22da22ec27fa46e8d608c7c1b6694a03226ac Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 1 May 2017 14:26:02 -0400 Subject: [PATCH 2/9] Make findbugs happy. --- src/main/java/hudson/plugins/git/GitChangeSet.java | 14 +++++++++----- src/main/java/hudson/plugins/git/GitSCM.java | 4 ++-- src/main/java/hudson/plugins/git/GitStatus.java | 8 ++++---- src/main/java/hudson/plugins/git/GitTagAction.java | 4 ++-- .../plugins/git/util/BuildChooserDescriptor.java | 2 +- .../jenkins/plugins/git/AbstractGitSCMSource.java | 2 +- .../java/jenkins/plugins/git/GitSCMSource.java | 2 +- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/java/hudson/plugins/git/GitChangeSet.java b/src/main/java/hudson/plugins/git/GitChangeSet.java index 7b09c9d38e..517172dd33 100644 --- a/src/main/java/hudson/plugins/git/GitChangeSet.java +++ b/src/main/java/hudson/plugins/git/GitChangeSet.java @@ -8,6 +8,7 @@ import hudson.scm.ChangeLogSet; import hudson.scm.ChangeLogSet.AffectedFile; import hudson.scm.EditType; +import jenkins.model.Jenkins; import org.apache.commons.lang.math.NumberUtils; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; @@ -420,13 +421,16 @@ private boolean hasHudsonTasksMailer() { } private boolean isCreateAccountBasedOnEmail() { - Hudson hudson = Hudson.getInstance(); - if (hudson == null) { + Jenkins jenkins = Jenkins.getInstanceOrNull(); + if (jenkins == null) { + return false; + } + DescriptorImpl descriptor = (DescriptorImpl) jenkins.getDescriptor(GitSCM.class); + if (descriptor != null) { + return descriptor.isCreateAccountBasedOnEmail(); + } else { return false; } - DescriptorImpl descriptor = (DescriptorImpl) hudson.getDescriptor(GitSCM.class); - - return descriptor.isCreateAccountBasedOnEmail(); } @Override diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java index d06c6afbee..6b98c48a08 100644 --- a/src/main/java/hudson/plugins/git/GitSCM.java +++ b/src/main/java/hudson/plugins/git/GitSCM.java @@ -1772,9 +1772,9 @@ private boolean isRevExcluded(GitClient git, Revision r, TaskListener listener, @Initializer(after=PLUGINS_STARTED) public static void onLoaded() { - Jenkins jenkins = Jenkins.getInstance(); + Jenkins jenkins = Jenkins.getInstanceOrNull(); if (jenkins == null) { - LOGGER.severe("Jenkins.getInstance is null in GitSCM.onLoaded"); + LOGGER.severe("Jenkins.getInstanceOrNull is null in GitSCM.onLoaded"); return; } DescriptorImpl desc = jenkins.getDescriptorByType(DescriptorImpl.class); diff --git a/src/main/java/hudson/plugins/git/GitStatus.java b/src/main/java/hudson/plugins/git/GitStatus.java index b16d38e824..3ae66abbdf 100644 --- a/src/main/java/hudson/plugins/git/GitStatus.java +++ b/src/main/java/hudson/plugins/git/GitStatus.java @@ -152,9 +152,9 @@ public HttpResponse doNotifyCommit(HttpServletRequest request, @QueryParameter(r } final List contributors = new ArrayList<>(); - Jenkins jenkins = Jenkins.getInstance(); + Jenkins jenkins = Jenkins.getInstanceOrNull(); if (jenkins == null) { - return HttpResponses.error(SC_BAD_REQUEST, new Exception("Jenkins.getInstance() null for : " + url)); + return HttpResponses.error(SC_BAD_REQUEST, new Exception("Jenkins.getInstanceOrNull() null for : " + url)); } String origin = SCMEvent.originOf(request); for (Listener listener : jenkins.getExtensionList(Listener.class)) { @@ -339,9 +339,9 @@ public List onNotifyCommit(String origin, URIish uri, Strin boolean scmFound = false, urlFound = false; - Jenkins jenkins = Jenkins.getInstance(); + Jenkins jenkins = Jenkins.getInstanceOrNull(); if (jenkins == null) { - LOGGER.severe("Jenkins.getInstance() is null in GitStatus.onNotifyCommit"); + LOGGER.severe("Jenkins.getInstanceOrNull() is null in GitStatus.onNotifyCommit"); return result; } for (final Item project : Jenkins.getInstance().getAllItems()) { diff --git a/src/main/java/hudson/plugins/git/GitTagAction.java b/src/main/java/hudson/plugins/git/GitTagAction.java index a5ea8805bd..e9d997e3da 100644 --- a/src/main/java/hudson/plugins/git/GitTagAction.java +++ b/src/main/java/hudson/plugins/git/GitTagAction.java @@ -48,9 +48,9 @@ protected GitTagAction(Run build, FilePath workspace, Revision revision) { private static final Logger LOGGER = Logger.getLogger(GitTagAction.class.getName()); public Descriptor getDescriptor() { - Jenkins jenkins = Jenkins.getInstance(); + Jenkins jenkins = Jenkins.getInstanceOrNull(); if (jenkins == null) { - LOGGER.severe("Jenkins.getInstance() null in GitTagAction.getDescriptor"); + LOGGER.severe("Jenkins.getInstanceOrNull() null in GitTagAction.getDescriptor"); return null; } return jenkins.getDescriptorOrDie(getClass()); diff --git a/src/main/java/hudson/plugins/git/util/BuildChooserDescriptor.java b/src/main/java/hudson/plugins/git/util/BuildChooserDescriptor.java index 54bbecba91..6969aabb72 100644 --- a/src/main/java/hudson/plugins/git/util/BuildChooserDescriptor.java +++ b/src/main/java/hudson/plugins/git/util/BuildChooserDescriptor.java @@ -23,7 +23,7 @@ public String getLegacyId() { } public static DescriptorExtensionList all() { - Jenkins jenkins = Jenkins.getInstance(); + Jenkins jenkins = Jenkins.getInstanceOrNull(); if (jenkins == null) { LOGGER.severe("Jenkins instance is null in BuildChooserDescriptor"); return null; diff --git a/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java b/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java index 5997a40726..86c236b6da 100644 --- a/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java +++ b/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java @@ -470,7 +470,7 @@ protected String getCacheEntry() { } protected static File getCacheDir(String cacheEntry) { - Jenkins jenkins = Jenkins.getInstance(); + Jenkins jenkins = Jenkins.getInstanceOrNull(); if (jenkins == null) { LOGGER.severe("Jenkins instance is null in AbstractGitSCMSource.getCacheDir"); return null; diff --git a/src/main/java/jenkins/plugins/git/GitSCMSource.java b/src/main/java/jenkins/plugins/git/GitSCMSource.java index 33337fc915..ffb2544981 100644 --- a/src/main/java/jenkins/plugins/git/GitSCMSource.java +++ b/src/main/java/jenkins/plugins/git/GitSCMSource.java @@ -329,7 +329,7 @@ public List onNotifyCommit(String origin, // run in high privilege to see all the projects anonymous users don't see. // this is safe because when we actually schedule a build, it's a build that can // happen at some random time anyway. - Jenkins jenkins = Jenkins.getInstance(); + Jenkins jenkins = Jenkins.getInstanceOrNull(); if (jenkins == null) { LOGGER.severe("Jenkins instance is null in GitSCMSource.onNotifyCommit"); return result; From 803d0cbab93199735717ce5550cbbe793db22de4 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 2 May 2017 16:07:14 -0400 Subject: [PATCH 3/9] Update to buildEnvironment. --- pom.xml | 8 ++++---- src/main/java/hudson/plugins/git/GitSCM.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 1dcdc84a01..51cb8960c4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 2.27-20170501.155323-2 + 2.27 @@ -24,9 +24,9 @@ 2007 - 2.58-20170501.171905-3 - 2.58-20170501.171927-3 - 7 + 2.58-20170502.192524-8 + 2.58-20170502.192544-8 + 8 false 1C true diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java index 6b98c48a08..a0c9bdceff 100644 --- a/src/main/java/hudson/plugins/git/GitSCM.java +++ b/src/main/java/hudson/plugins/git/GitSCM.java @@ -1256,7 +1256,7 @@ private void computeChangeLog(GitClient git, Revision revToBuild, TaskListener l } @Override - public void buildEnvVars(Run build, java.util.Map env) { + public void buildEnvironment(Run build, java.util.Map env) { Revision rev = fixNull(getBuildData(build)).getLastBuiltRevision(); if (rev!=null) { Branch branch = Iterables.getFirst(rev.getBranches(), null); From e9dbe686130d3930b0112dba978f076d2fa4b740 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 16 May 2017 19:10:59 -0400 Subject: [PATCH 4/9] Switch to release --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 51cb8960c4..d4ad84f98f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,7 @@ 2007 - 2.58-20170502.192524-8 - 2.58-20170502.192544-8 + 2.60 8 false 1C From 3c125fb6cb2b39d391607f8e9ad7d36f7d93c7e1 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Thu, 18 May 2017 13:53:08 -0400 Subject: [PATCH 5/9] Reverting back to 1.625.3 baseline --- pom.xml | 4 ++-- src/main/java/hudson/plugins/git/GitChangeSet.java | 2 +- src/main/java/hudson/plugins/git/GitSCM.java | 8 ++++++-- src/main/java/hudson/plugins/git/GitStatus.java | 8 ++++---- src/main/java/hudson/plugins/git/GitTagAction.java | 4 ++-- .../hudson/plugins/git/util/BuildChooserDescriptor.java | 2 +- .../java/jenkins/plugins/git/AbstractGitSCMSource.java | 2 +- src/main/java/jenkins/plugins/git/GitSCMSource.java | 2 +- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index d4ad84f98f..9d6161a503 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,8 @@ 2007 - 2.60 - 8 + 1.625.3 + 7 false 1C true diff --git a/src/main/java/hudson/plugins/git/GitChangeSet.java b/src/main/java/hudson/plugins/git/GitChangeSet.java index 517172dd33..a6b0a55f9c 100644 --- a/src/main/java/hudson/plugins/git/GitChangeSet.java +++ b/src/main/java/hudson/plugins/git/GitChangeSet.java @@ -421,7 +421,7 @@ private boolean hasHudsonTasksMailer() { } private boolean isCreateAccountBasedOnEmail() { - Jenkins jenkins = Jenkins.getInstanceOrNull(); + Jenkins jenkins = Jenkins.getInstance(); if (jenkins == null) { return false; } diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java index a0c9bdceff..de1c76562b 100644 --- a/src/main/java/hudson/plugins/git/GitSCM.java +++ b/src/main/java/hudson/plugins/git/GitSCM.java @@ -1256,6 +1256,10 @@ private void computeChangeLog(GitClient git, Revision revToBuild, TaskListener l } @Override + public void buildEnvVars(AbstractBuild build, Map env) { + buildEnvironment(build, env); + } + public void buildEnvironment(Run build, java.util.Map env) { Revision rev = fixNull(getBuildData(build)).getLastBuiltRevision(); if (rev!=null) { @@ -1772,9 +1776,9 @@ private boolean isRevExcluded(GitClient git, Revision r, TaskListener listener, @Initializer(after=PLUGINS_STARTED) public static void onLoaded() { - Jenkins jenkins = Jenkins.getInstanceOrNull(); + Jenkins jenkins = Jenkins.getInstance(); if (jenkins == null) { - LOGGER.severe("Jenkins.getInstanceOrNull is null in GitSCM.onLoaded"); + LOGGER.severe("Jenkins.getInstance is null in GitSCM.onLoaded"); return; } DescriptorImpl desc = jenkins.getDescriptorByType(DescriptorImpl.class); diff --git a/src/main/java/hudson/plugins/git/GitStatus.java b/src/main/java/hudson/plugins/git/GitStatus.java index 3ae66abbdf..b16d38e824 100644 --- a/src/main/java/hudson/plugins/git/GitStatus.java +++ b/src/main/java/hudson/plugins/git/GitStatus.java @@ -152,9 +152,9 @@ public HttpResponse doNotifyCommit(HttpServletRequest request, @QueryParameter(r } final List contributors = new ArrayList<>(); - Jenkins jenkins = Jenkins.getInstanceOrNull(); + Jenkins jenkins = Jenkins.getInstance(); if (jenkins == null) { - return HttpResponses.error(SC_BAD_REQUEST, new Exception("Jenkins.getInstanceOrNull() null for : " + url)); + return HttpResponses.error(SC_BAD_REQUEST, new Exception("Jenkins.getInstance() null for : " + url)); } String origin = SCMEvent.originOf(request); for (Listener listener : jenkins.getExtensionList(Listener.class)) { @@ -339,9 +339,9 @@ public List onNotifyCommit(String origin, URIish uri, Strin boolean scmFound = false, urlFound = false; - Jenkins jenkins = Jenkins.getInstanceOrNull(); + Jenkins jenkins = Jenkins.getInstance(); if (jenkins == null) { - LOGGER.severe("Jenkins.getInstanceOrNull() is null in GitStatus.onNotifyCommit"); + LOGGER.severe("Jenkins.getInstance() is null in GitStatus.onNotifyCommit"); return result; } for (final Item project : Jenkins.getInstance().getAllItems()) { diff --git a/src/main/java/hudson/plugins/git/GitTagAction.java b/src/main/java/hudson/plugins/git/GitTagAction.java index e9d997e3da..a5ea8805bd 100644 --- a/src/main/java/hudson/plugins/git/GitTagAction.java +++ b/src/main/java/hudson/plugins/git/GitTagAction.java @@ -48,9 +48,9 @@ protected GitTagAction(Run build, FilePath workspace, Revision revision) { private static final Logger LOGGER = Logger.getLogger(GitTagAction.class.getName()); public Descriptor getDescriptor() { - Jenkins jenkins = Jenkins.getInstanceOrNull(); + Jenkins jenkins = Jenkins.getInstance(); if (jenkins == null) { - LOGGER.severe("Jenkins.getInstanceOrNull() null in GitTagAction.getDescriptor"); + LOGGER.severe("Jenkins.getInstance() null in GitTagAction.getDescriptor"); return null; } return jenkins.getDescriptorOrDie(getClass()); diff --git a/src/main/java/hudson/plugins/git/util/BuildChooserDescriptor.java b/src/main/java/hudson/plugins/git/util/BuildChooserDescriptor.java index 6969aabb72..54bbecba91 100644 --- a/src/main/java/hudson/plugins/git/util/BuildChooserDescriptor.java +++ b/src/main/java/hudson/plugins/git/util/BuildChooserDescriptor.java @@ -23,7 +23,7 @@ public String getLegacyId() { } public static DescriptorExtensionList all() { - Jenkins jenkins = Jenkins.getInstanceOrNull(); + Jenkins jenkins = Jenkins.getInstance(); if (jenkins == null) { LOGGER.severe("Jenkins instance is null in BuildChooserDescriptor"); return null; diff --git a/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java b/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java index 86c236b6da..5997a40726 100644 --- a/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java +++ b/src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java @@ -470,7 +470,7 @@ protected String getCacheEntry() { } protected static File getCacheDir(String cacheEntry) { - Jenkins jenkins = Jenkins.getInstanceOrNull(); + Jenkins jenkins = Jenkins.getInstance(); if (jenkins == null) { LOGGER.severe("Jenkins instance is null in AbstractGitSCMSource.getCacheDir"); return null; diff --git a/src/main/java/jenkins/plugins/git/GitSCMSource.java b/src/main/java/jenkins/plugins/git/GitSCMSource.java index ffb2544981..33337fc915 100644 --- a/src/main/java/jenkins/plugins/git/GitSCMSource.java +++ b/src/main/java/jenkins/plugins/git/GitSCMSource.java @@ -329,7 +329,7 @@ public List onNotifyCommit(String origin, // run in high privilege to see all the projects anonymous users don't see. // this is safe because when we actually schedule a build, it's a build that can // happen at some random time anyway. - Jenkins jenkins = Jenkins.getInstanceOrNull(); + Jenkins jenkins = Jenkins.getInstance(); if (jenkins == null) { LOGGER.severe("Jenkins instance is null in GitSCMSource.onNotifyCommit"); return result; From b4095738d0165127a057e1fed730e07beab23a3f Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 19 May 2017 11:39:57 -0400 Subject: [PATCH 6/9] Another bit of review comments --- src/main/java/hudson/plugins/git/GitChangeSet.java | 14 +++++--------- src/main/java/hudson/plugins/git/GitSCM.java | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/hudson/plugins/git/GitChangeSet.java b/src/main/java/hudson/plugins/git/GitChangeSet.java index a6b0a55f9c..7b09c9d38e 100644 --- a/src/main/java/hudson/plugins/git/GitChangeSet.java +++ b/src/main/java/hudson/plugins/git/GitChangeSet.java @@ -8,7 +8,6 @@ import hudson.scm.ChangeLogSet; import hudson.scm.ChangeLogSet.AffectedFile; import hudson.scm.EditType; -import jenkins.model.Jenkins; import org.apache.commons.lang.math.NumberUtils; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; @@ -421,16 +420,13 @@ private boolean hasHudsonTasksMailer() { } private boolean isCreateAccountBasedOnEmail() { - Jenkins jenkins = Jenkins.getInstance(); - if (jenkins == null) { - return false; - } - DescriptorImpl descriptor = (DescriptorImpl) jenkins.getDescriptor(GitSCM.class); - if (descriptor != null) { - return descriptor.isCreateAccountBasedOnEmail(); - } else { + Hudson hudson = Hudson.getInstance(); + if (hudson == null) { return false; } + DescriptorImpl descriptor = (DescriptorImpl) hudson.getDescriptor(GitSCM.class); + + return descriptor.isCreateAccountBasedOnEmail(); } @Override diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java index de1c76562b..9060ff8450 100644 --- a/src/main/java/hudson/plugins/git/GitSCM.java +++ b/src/main/java/hudson/plugins/git/GitSCM.java @@ -1260,6 +1260,7 @@ public void buildEnvVars(AbstractBuild build, Map env) { buildEnvironment(build, env); } + // TODO: 2.60+ Switch to @Override, optionally remove buildEnvVars public void buildEnvironment(Run build, java.util.Map env) { Revision rev = fixNull(getBuildData(build)).getLastBuiltRevision(); if (rev!=null) { From 6d158dc81e3c8fff76efa04871cfb57b35befb26 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 19 May 2017 11:41:33 -0400 Subject: [PATCH 7/9] Clarification --- src/main/java/hudson/plugins/git/GitSCM.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java index 9060ff8450..1113d00515 100644 --- a/src/main/java/hudson/plugins/git/GitSCM.java +++ b/src/main/java/hudson/plugins/git/GitSCM.java @@ -1255,12 +1255,13 @@ private void computeChangeLog(GitClient git, Revision revToBuild, TaskListener l } } + // TODO: 2.60+ Delete this override. @Override public void buildEnvVars(AbstractBuild build, Map env) { buildEnvironment(build, env); } - // TODO: 2.60+ Switch to @Override, optionally remove buildEnvVars + // TODO: 2.60+ Switch to @Override public void buildEnvironment(Run build, java.util.Map env) { Revision rev = fixNull(getBuildData(build)).getLastBuiltRevision(); if (rev!=null) { From 74cd756cbbc4976d905fb2bed63c082983c2d809 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Sat, 20 May 2017 11:52:59 -0400 Subject: [PATCH 8/9] Switch to modern parameterized-trigger dependency. --- pom.xml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index a089fb3530..3ad96a9781 100644 --- a/pom.xml +++ b/pom.xml @@ -218,17 +218,11 @@ - org.jvnet.hudson.plugins + org.jenkins-ci.plugins parameterized-trigger - 2.4 + 2.33 true - - - org.jvnet.hudson.plugins - subversion - - - + org.jenkins-ci.plugins token-macro From e38f561878cb8299157b1534d49b7cb18462db2c Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 16 Jun 2017 09:53:01 -0400 Subject: [PATCH 9/9] Whoops, fixing merge bork. --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index b1fe2340b8..1a85fede2d 100644 --- a/pom.xml +++ b/pom.xml @@ -222,11 +222,7 @@ parameterized-trigger 2.33 true -<<<<<<< HEAD - -======= ->>>>>>> origin/master org.jenkins-ci.plugins token-macro