diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java index fe44063d9e..da8af7fc32 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java @@ -99,9 +99,12 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo List excludeList = new ArrayList(); InputStream input = null; + JarFile file = null; + try { - JarFile file = new JarFile(warFile); + file = new JarFile(warFile); + JarEntry entry = file.getJarEntry(RESOURCE_DEPENDENCY_LIST); if (entry == null) @@ -124,19 +127,17 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo } finally { - if (scanner != null) - { - scanner.close(); - } + IOUtils.closeQuietly(scanner); } } catch (IOException ex) { - throw new MojoExecutionException("could not read dependency file"); + throw new MojoExecutionException("could not read dependency file", ex); } finally { IOUtils.closeQuietly(input); + IOUtils.closeQuietly(file); } return excludeList; @@ -219,6 +220,19 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo //~--- get methods ---------------------------------------------------------- + /** + * Method description + * + * + * @param artifact + * + * @return + */ + protected String getId(Artifact artifact) + { + return artifact.getGroupId().concat(":").concat(artifact.getArtifactId()); + } + /** * Method description * @@ -358,7 +372,6 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo throws MojoExecutionException { String id = getId(artifact); - if (!excludeList.contains(id)) { @@ -384,10 +397,6 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo } } } - - protected String getId(Artifact artifact){ - return artifact.getGroupId().concat(":").concat(artifact.getArtifactId()); - } /** * Method description diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/FixDescriptorMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/FixDescriptorMojo.java index 4ff8429f56..0b4350cf27 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/FixDescriptorMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/FixDescriptorMojo.java @@ -307,11 +307,7 @@ public class FixDescriptorMojo extends AbstractMojo project.getDescription()); } - if (!author) - { - - // ?? - } + // TODO handle author node } /**