This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-debian-helper.
commit 17d65c42b00b44ac25b2430127a6ae384d873202 Author: Emmanuel Bourg <[email protected]> Date: Sat Aug 31 12:51:56 2013 +0200 Use the new methods in org.debian.maven.repo.Dependency to check the type of the artifacts (requires maven-repo-helper 1.8.5) --- debian/changelog | 2 +- debian/control | 4 ++-- .../debian/maven/packager/DependenciesSolver.java | 18 +++++++++--------- .../packager/util/IgnoreDependencyQuestions.java | 2 +- .../debian/maven/packager/util/PackageScanner.java | 2 +- pom.xml | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 067032e..38a818e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ maven-debian-helper (1.6.6) UNRELEASED; urgency=low * Added com.mycila.maven-license-plugin:maven-license-plugin to the ignored plugins * Added wagon-gitsite to the ignored extensions - * Updated the Maven dependency on maven-repo-helper (1.8.4) + * Depend on maven-repo-helper >= 1.8.5 * Improved the detection of the documentation packages * Fixed an IllegalArgumentException when a documentation package is not found (Closes: #712506) diff --git a/debian/control b/debian/control index 61fce72..e587471 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]>, Damien Raude-Morvan <[email protected]>, Thomas Koch <[email protected]>, Emmanuel Bourg <[email protected]>, Wolodja Wentland <[email protected]> Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper (>= 7.0), ant-optional, help2man -Build-Depends-Indep: maven-repo-helper (>= 1.8.3), junit4, libmaven-plugin-tools-java, +Build-Depends-Indep: maven-repo-helper (>= 1.8.5), junit4, libmaven-plugin-tools-java, libplexus-velocity-java, libcommons-io-java Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-java/maven-debian-helper.git @@ -14,7 +14,7 @@ Homepage: http://wiki.debian.org/Java/MavenBuilder Package: maven-debian-helper Architecture: all -Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.8.3), maven2 (>= 2.2.1-5), +Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.8.5), maven2 (>= 2.2.1-5), libmaven-clean-plugin-java, libmaven-resources-plugin-java, libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-site-plugin-java, libsurefire-java, velocity, libplexus-velocity-java diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java index 49d8cb1..59488f4 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java @@ -314,7 +314,7 @@ public class DependenciesSolver { getRepository().registerPom(projectPom, pom); // Also register automatically the test jar which may accompany the current jar and be // used in another module of the same project - if ("jar".equals(pom.getThisPom().getType())) { + if (pom.getThisPom().isJar()) { POMInfo testPom = (POMInfo) pom.clone(); testPom.getThisPom().setType("test-jar"); getRepository().registerPom(projectPom, testPom); @@ -356,7 +356,7 @@ public class DependenciesSolver { } } - if (interactive && !explicitlyMentionedInRules && !"maven-plugin".equals(pom.getThisPom().getType())) { + if (interactive && !explicitlyMentionedInRules && !pom.getThisPom().isPlugin()) { Rule selectedRule = userInteraction.askForVersionRule(pom.getThisPom(), versionToRules, defaultRules); versionToRules.put(pom.getThisPom().getVersion(), selectedRule); if (selectedRule.getPattern().equals("CUSTOM")) { @@ -372,7 +372,7 @@ public class DependenciesSolver { getRepository().registerPom(projectPom, transformedPom); projectPoms.add(transformedPom.getThisPom()); - if ("bundle".equals(pom.getThisPom().getType())) { + if (pom.getThisPom().isBundle()) { String question2 = pom.getThisPom().getGroupId() + ":" + pom.getThisPom().getArtifactId() + " is a bundle.\n" + "Inform mh_make that dependencies of type jar which may match this library should be transformed into bundles automatically?"; @@ -456,7 +456,7 @@ public class DependenciesSolver { private static boolean canBeSkippedBecauseAntIsUsedForPackaging(Dependency thisPom, String packageType, Dependency dependency, boolean runTests, boolean verbose) { if (!packageType.equals("ant")) return false; - if ("maven-plugin".equals(dependency.getType()) && !thisPom.getType().equals("pom")) { + if (dependency.isPlugin() && !thisPom.isPom()) { if(verbose) System.out.println("[skipped - Maven plugins are not used during a build with Ant]"); return true; } @@ -559,7 +559,7 @@ public class DependenciesSolver { } } - if (pom == null && "maven-plugin".equals(dependency.getType())) { + if (pom == null && dependency.isPlugin()) { List<POMInfo> matchingPoms = getRepository().searchMatchingPOMsIgnoreVersion(dependency); if (matchingPoms.size() > 1) { issues.add(sourcePomLoc + ": More than one version matches the plugin " + dependency.getGroupId() + ":" @@ -577,7 +577,7 @@ public class DependenciesSolver { if (management) { if (verbose) System.out.println("[skipped dependency or plugin management]"); return null; - } else if ("maven-plugin".equals(dependency.getType()) && packageType.equals("ant")) { + } else if (dependency.isPlugin() && packageType.equals("ant")) { if (verbose) System.out.println("[skipped - not used in Ant build]"); return null; } @@ -596,7 +596,7 @@ public class DependenciesSolver { // libraries from jar type into bundle types, and apply as well the version substitution (for example to 2.x) // for Debian. // - if (pom == null && "jar".equals(dependency.getType())) { + if (pom == null && dependency.isJar()) { if (verbose) System.out.println("[check dependency with bundle type]"); Dependency bundleDependency = dependency.builder().setType("bundle").build(); @@ -703,7 +703,7 @@ public class DependenciesSolver { // Handle the case of Maven plugins built and used in a multi-module build: // they need to be added to maven.cleanIgnoreRules to avoid errors during // a mvn clean - if ("maven-plugin".equals(dependency.getType()) && containsDependencyIgnoreVersion(projectPoms, dependency)) { + if (dependency.isPlugin() && containsDependencyIgnoreVersion(projectPoms, dependency)) { String ruleDef = dependency.getGroupId() + " " + dependency.getArtifactId() + " maven-plugin *"; pomTransformer.getRulesFiles().get(CLEAN).add(new DependencyRule(ruleDef)); } @@ -726,7 +726,7 @@ public class DependenciesSolver { if (buildTime) { if ("test".equals(dependency.getScope())) { debianDeps.add(TEST, libraryWithVersionConstraint); - } else if ("maven-plugin".equals(dependency.getType())) { + } else if (dependency.isPlugin()) { if (!packageType.equals("ant")) { debianDeps.add(COMPILE, libraryWithVersionConstraint); } diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java index 2765c31..16147ab 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java @@ -180,7 +180,7 @@ public class IgnoreDependencyQuestions { } public String askIgnoreNeededDependency(String sourcePomLoc, Dependency dependency) { - String type = "maven-plugin".equals(dependency.getType()) ? "plugin" : "dependency"; + String type = dependency.isPlugin() ? "plugin" : "dependency"; String question = "This " + type + " cannot be found in the Debian Maven repository. Ignore this " + type + "?"; if (!askIgnoreDependency(sourcePomLoc, dependency, question, false)) { diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java index e3a3f61..d7e3d15 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java @@ -180,7 +180,7 @@ public class PackageScanner { List<DebianDependency> docDeps = new ArrayList<DebianDependency>(); for (DebianDependency dependency : debianDeps) { Dependency runtimeDependency = versionedPackagesAndDependencies.get(dependency); - if (runtimeDependency != null && "pom".equals(runtimeDependency.getType())) { + if (runtimeDependency != null && runtimeDependency.isPom()) { continue; } DebianDependency docPkg = searchJavaDocPkg(dependency); diff --git a/pom.xml b/pom.xml index 9edbe50..10e29e0 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>org.debian.maven</groupId> <artifactId>maven-repo-helper</artifactId> - <version>1.8.4</version> + <version>1.8.5</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
