Skip to content

Commit

Permalink
Merge pull request #108 from glimmerveen/Maven_3.6.0_compatibility
Browse files Browse the repository at this point in the history
Maven 3.6.0 compatibility
  • Loading branch information
bvarner committed May 9, 2019
2 parents 649537b + ddf6b89 commit 3b01d4d
Showing 1 changed file with 2 additions and 2 deletions.
Expand Up @@ -80,7 +80,7 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
for (MavenProject project : session.getProjects()) {
List<Plugin> dropPlugins = new ArrayList<>();

for (Plugin plugin : project.getBuildPlugins()) {
for (Plugin plugin : project.getModel().getBuild().getPlugins()) {
// Don't drop our plugin. Read it's config
if (plugin.getKey().equals("com.e-gineering:gitflow-helper-maven-plugin")) {
pluginFound = true;
Expand Down Expand Up @@ -189,7 +189,7 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
// invoked goals for which could be mapped back to plugins in our project build.
// Goals invoked from the commandline which cannot be mapped back to our project, will get warnings, but should still execute.
// If someone is on 'master' and starts executing goals, we need to allow them to do that.
project.getBuildPlugins().removeAll(pluginsToDrop.get(project));
project.getModel().getBuild().getPlugins().removeAll(pluginsToDrop.get(project));
}
}
}
Expand Down

0 comments on commit 3b01d4d

Please sign in to comment.