From 0049d2408bc98e34f7e5cf4afc5308295902a5e6 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 3 Jan 2011 17:40:09 +0100 Subject: [PATCH] update changelog for HUDSON-8395 and fix junit --- changelog.html | 2 ++ maven-plugin/src/main/java/hudson/maven/MavenModule.java | 1 + maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java | 1 + .../src/main/java/hudson/maven/MavenModuleSetBuild.java | 1 - test/src/test/java/hudson/maven/Maven3BuildTest.java | 5 ++--- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/changelog.html b/changelog.html index 5b3283454c..f1361268de 100644 --- a/changelog.html +++ b/changelog.html @@ -46,6 +46,8 @@ Upcoming changes (issue 8387)
  • NPE while parsing POMs (issue 8391) +
  • M2 POMs aren't parsed if there is a M3 control error like an invalid scope in a plugin dep. + (issue 8395) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index c4f761e5f6..95b7e1e0c2 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -483,4 +483,5 @@ public final class MavenModule extends AbstractMavenProject