This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-repo-helper.
commit c7a151b314b8e489f9a67d0d212c7e2696fbc3ad Author: Emmanuel Bourg <[email protected]> Date: Sat Aug 31 12:40:35 2013 +0200 Added several methods to org.debian.maven.repo.Dependency to check the type of the artifact --- debian/changelog | 7 +++++ pom.xml | 2 +- .../java/org/debian/maven/repo/Dependency.java | 28 ++++++++++++++++++++ .../java/org/debian/maven/repo/POMCleaner.java | 4 +-- .../java/org/debian/maven/repo/POMTransformer.java | 4 +-- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 758894d..3a70068 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +maven-repo-helper (1.8.5) unstable; urgency=low + + * Added several methods to org.debian.maven.repo.Dependency to check + the type of the artifact + + -- Emmanuel Bourg <[email protected]> Wed, 30 Aug 2013 12:19:05 +0200 + maven-repo-helper (1.8.4) unstable; urgency=low * Fixed a regression in the pom parser (Closes: #712658) diff --git a/pom.xml b/pom.xml index a810222..07c6b59 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <artifactId>maven-repo-helper</artifactId> <name>Maven Repo helper</name> <packaging>jar</packaging> - <version>1.8.4</version> + <version>1.8.5</version> <description>Provides support for managing the Maven repository in a Debian distribution.</description> <inceptionYear>2009</inceptionYear> diff --git a/src/main/java/org/debian/maven/repo/Dependency.java b/src/main/java/org/debian/maven/repo/Dependency.java index 969b9e2..5136261 100644 --- a/src/main/java/org/debian/maven/repo/Dependency.java +++ b/src/main/java/org/debian/maven/repo/Dependency.java @@ -176,6 +176,34 @@ public class Dependency implements Comparable<Dependency>, Cloneable { return superPom; } + /** + * Tells if this artifact is a pom. + */ + public boolean isPom() { + return "pom".equals(type); + } + + /** + * Tells if this artifact is a jar. + */ + public boolean isJar() { + return "jar".equals(type); + } + + /** + * Tells if this artifact is a Maven plugin. + */ + public boolean isPlugin() { + return "maven-plugin".equals(type); + } + + /** + * Tells if this artifact is an OSGi bundle. + */ + public boolean isBundle() { + return "bundle".equals(type); + } + public boolean equals(Object obj) { if (obj == null) { return false; diff --git a/src/main/java/org/debian/maven/repo/POMCleaner.java b/src/main/java/org/debian/maven/repo/POMCleaner.java index 3421c90..207cf1b 100644 --- a/src/main/java/org/debian/maven/repo/POMCleaner.java +++ b/src/main/java/org/debian/maven/repo/POMCleaner.java @@ -92,7 +92,7 @@ public class POMCleaner extends POMTransformer { } protected void transformingPom(POMInfo pom) { - if (pom.getThisPom().getType().equals("maven-plugin")) { + if (pom.getThisPom().isPlugin()) { getRulesFiles().get(IGNORE).add(new DependencyRule(pom.getThisPom().getGroupId() + " " + pom.getThisPom().getArtifactId() + " maven-plugin s/.*/" + pom.getThisPom().getVersion() + "/")); @@ -130,7 +130,7 @@ public class POMCleaner extends POMTransformer { protected boolean acceptDependency(Dependency dependency, POMInfo info) { return super.acceptDependency(dependency, info) && - ("pom".equals(info.getThisPom().getType()) || !"test".equals(dependency.getScope())); + (info.getThisPom().isPom() || !"test".equals(dependency.getScope())); } protected void createDebianProperties(POMInfo info, POMInfo original, String debianPackage, int inLevel) throws XMLStreamException { diff --git a/src/main/java/org/debian/maven/repo/POMTransformer.java b/src/main/java/org/debian/maven/repo/POMTransformer.java index f772a9c..0f119b7 100644 --- a/src/main/java/org/debian/maven/repo/POMTransformer.java +++ b/src/main/java/org/debian/maven/repo/POMTransformer.java @@ -106,7 +106,7 @@ public class POMTransformer extends POMReader { public void usePluginVersionsFromRepository() { repository.scanOnce(); for (POMInfo pom : repository.getResolvedPoms().values()) { - if (pom.getThisPom().getType().equals("maven-plugin")) { + if (pom.getThisPom().isPlugin()) { Set<DependencyRule> pomRules = pom.getPublishedRules(); depRules.get(RULES).add(MAVEN_PLUGINS_KEEP_VERSION_RULE); boolean found = false; @@ -176,7 +176,7 @@ public class POMTransformer extends POMReader { boolean keepParentVersion = !noParent && keepPomVersion; if (keepParentVersion && repository != null) { POMInfo pom = readPom(pomFile); - if (pom.getThisPom().getType().equals("pom") && pom.getParent() != null) { + if (pom.getThisPom().isPom() && pom.getParent() != null) { keepParentVersion = listOfPOMs.contains(pomFile) || repository.searchMatchingPOM(pom.getParent()) == null; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-repo-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
