[pkg-java] r13158 - in trunk/maven-debian-helper: maven-packager-utils/src/main/java/org/debian/maven/packager maven-packager-utils/src/main/resources maven-packager-utils/src/test/java/org/debian/maven/packager maven-packager-utils/src/test/resources maven-packager-utils/src/test/resources/repository maven-packager-utils/src/test/resources/repository/commons-beanutils maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/1.8.3 maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/debian maven-packager-utils/src/test/resources/repository/commons-collection maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.2.1 maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.x maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin/2.2 maven-packager-utils/src/test/resources/repository/org/codehaus maven-packager-utils/src/test/resources/repository/org/codehaus/mojo maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin/2.1 share/cdbs/1/class

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Dec 5 20:40:19 UTC 2010


Author: ludovicc-guest
Date: 2010-12-05 20:40:18 +0000 (Sun, 05 Dec 2010)
New Revision: 13158

Added:
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.ignoreRules
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/1.8.3/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.pom
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/debian/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/debian/commons-beanutils-debian.jar
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/debian/commons-beanutils-debian.pom
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.2.1/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.2.1/commons-collections-3.2.1.jar
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.2.1/commons-collections-3.2.1.pom
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.x/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.x/commons-collections-3.x.jar
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.x/commons-collections-3.x.pom
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin/2.2/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.jar
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin/2.1/
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin/2.1/antlr-maven-plugin-2.1.jar
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin/2.1/antlr-maven-plugin-2.1.pom
Modified:
   trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
   trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
   trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm
   trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
   trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java
   trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.poms
   trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
Log:
* Add last minute fixes

Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java	2010-12-05 20:07:05 UTC (rev 13157)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java	2010-12-05 20:40:18 UTC (rev 13158)
@@ -153,6 +153,8 @@
     private Map versionToRules = new HashMap();
     // Keep the list of known files and their package
     private Map filesInPackages = new HashMap();
+    // Keep the list of packages and dependencies
+    private Map versionedPackagesAndDependencies = new HashMap();
     private List defaultRules = new ArrayList();
 
     public DependenciesSolver() {
@@ -384,9 +386,13 @@
             docRuntimeDepends.add("default-jdk-doc");
             for (Iterator i = runtimeDepends.iterator(); i.hasNext();) {
                 String dependency = (String) i.next();
+                Dependency runtimeDependency = (Dependency) versionedPackagesAndDependencies.get(dependency);
                 if (dependency.indexOf(' ') > 0) {
                     dependency = dependency.substring(0, dependency.indexOf(' '));
                 }
+                if (runtimeDependency != null && "pom".equals(runtimeDependency.getType())) {
+                    continue;
+                }
                 String docPkg = searchPkg(new File("/usr/share/doc/" + dependency + "/api/index.html"));
                 if (docPkg != null) {
                     docRuntimeDepends.add(docPkg);
@@ -395,9 +401,13 @@
             Set docOptionalDepends = new TreeSet();
             for (Iterator i = optionalDepends.iterator(); i.hasNext();) {
                 String dependency = (String) i.next();
+                Dependency optionalDependency = (Dependency) versionedPackagesAndDependencies.get(dependency);
                 if (dependency.indexOf(' ') > 0) {
                     dependency = dependency.substring(0, dependency.indexOf(' '));
                 }
+                if (optionalDependency != null && "pom".equals(optionalDependency.getType())) {
+                    continue;
+                }
                 String docPkg = searchPkg(new File("/usr/share/doc/" + dependency + "/api/index.html"));
                 if (docPkg != null) {
                     docOptionalDepends.add(docPkg);
@@ -1039,6 +1049,7 @@
                     runtimeDepends.add(libraryWithVersionConstraint);
                 }
             }
+            versionedPackagesAndDependencies.put(libraryWithVersionConstraint, dependency);
         }
 
         String mavenRules = (String) pom.getProperties().get("debian.mavenRules");

Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java	2010-12-05 20:07:05 UTC (rev 13157)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java	2010-12-05 20:40:18 UTC (rev 13158)
@@ -456,9 +456,12 @@
 
     private void setupArtifactLocation(ListOfPOMs listOfPOMs, MavenProject mavenProject) {
         String basedir = project.getBasedir().getAbsolutePath();
-        String dirRelPath = mavenProject.getBasedir().getAbsolutePath().substring(basedir.length() + 1);
+        String dirRelPath = "";
+        if (! mavenProject.getBasedir().equals(project.getBasedir())) {
+            dirRelPath = mavenProject.getBasedir().getAbsolutePath().substring(basedir.length() + 1) + "/";
+        }
         if (! "pom".equals(mavenProject.getPackaging())) {
-            String pomFile = dirRelPath + "/pom.xml";
+            String pomFile = dirRelPath + "pom.xml";
             listOfPOMs.getOrCreatePOMOptions(pomFile).setJavaLib(true);
             String extension = mavenProject.getPackaging();
             if (extension.equals("bundle")) {
@@ -472,13 +475,13 @@
                 extension = extension.substring(extension.lastIndexOf('.') + 1);
             }
             ListOfPOMs.POMOptions pomOptions = listOfPOMs.getOrCreatePOMOptions(pomFile);
-            pomOptions.setArtifact(dirRelPath + "/target/" + mavenProject.getArtifactId() + "-*."
+            pomOptions.setArtifact(dirRelPath + "target/" + mavenProject.getArtifactId() + "-*."
                 + extension);
             if ("jar".equals(extension) && generateJavadoc && "ant".equals(packageType)) {
                 String artifactId = mavenProject.getArtifact().getArtifactId();
-                String docPom = dirRelPath + "/target/" + artifactId + ".javadoc.pom";
+                String docPom = dirRelPath + "target/" + artifactId + ".javadoc.pom";
                 listOfPOMs.getOrCreatePOMOptions(docPom).setIgnorePOM(true);
-                listOfPOMs.getOrCreatePOMOptions(docPom).setArtifact(dirRelPath + "/target/" + artifactId + ".javadoc.jar");
+                listOfPOMs.getOrCreatePOMOptions(docPom).setArtifact(dirRelPath + "target/" + artifactId + ".javadoc.jar");
                 listOfPOMs.getOrCreatePOMOptions(docPom).setClassifier("javadoc");
                 listOfPOMs.getOrCreatePOMOptions(docPom).setHasPackageVersion(pomOptions.getHasPackageVersion());
                 listOfPOMs.getOrCreatePOMOptions(docPom).setDestPackage(packageName + "-doc");
@@ -513,6 +516,9 @@
                 }
             }
         }
+
+        System.out.println();
+        System.out.println("Checking licenses in the upstream sources...");
         LicenseCheckResult licenseResult = new LicenseCheckResult();
         DependenciesSolver.executeProcess(new String[]{"/bin/sh", "-c", "licensecheck `find . -type f`"},
                 licenseResult);
@@ -608,6 +614,8 @@
         if (library.indexOf("(") > 0) {
             library = library.substring(0, library.indexOf("(")).trim();
         }
+        System.out.println();
+        System.out.println("Look for shared jars in the package...");
         DependenciesSolver.executeProcess(new String[]{"/usr/bin/dpkg", "--listfiles", library},
                 new DependenciesSolver.OutputHandler() {
 
@@ -617,6 +625,7 @@
                             jar = jar.substring(0, jar.length() - 4);
                             if (!line.matches(".*/.*-\\d.*")) {
                                 jars.add(jar);
+                                System.out.println("  Add " + jar + " to the classpath");
                             }
                         }
                     }
@@ -636,9 +645,11 @@
 
     private List split(String s) {
         List l = new ArrayList();
-        StringTokenizer st = new StringTokenizer(s, ",");
-        while (st.hasMoreTokens()) {
-            l.add(st.nextToken().trim());
+        if (s != null) {
+            StringTokenizer st = new StringTokenizer(s, ",");
+            while (st.hasMoreTokens()) {
+                l.add(st.nextToken().trim());
+            }
         }
         return l;
     }

Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm	2010-12-05 20:07:05 UTC (rev 13157)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm	2010-12-05 20:40:18 UTC (rev 13158)
@@ -18,7 +18,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.5)#if ($project.packaging != "pom" || $project.modules.size() > 0), ant-optional, maven-ant-helper (>> 6.7)#end$space
+Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.5)#if ($project.packaging != "pom" || $project.modules.size() > 0), ant-optional, maven-ant-helper (>= 7.1)#end$space
 #if(!$compileDependencies.isEmpty())
 Build-Depends-Indep:#printDependencies($compileDependencies)$space
 #end
@@ -33,7 +33,7 @@
 ## libraries should not depend on runtime - default-jre-headless | java2-runtime-headless,
 Depends: ${dollar}{misc:Depends},#printDependencies($runtimeDependencies)$space
 #if(!$optionalDependencies.isEmpty())
-Recommends: #printDependencies($optionalDependencies)
+Recommends: #printDependencies($optionalDependencies)$space
 #end
 #if ($generateJavadoc)
 Suggests: ${binPackage}-doc
@@ -54,9 +54,9 @@
 Package: ${binPackage}-doc
 Architecture: all
 Section: doc
-Depends: ${dollar}{misc:Depends}, $printDependencies($javadocDependencies)$space
+Depends: ${dollar}{misc:Depends}, #printDependencies($javadocDependencies)$space
 #if(!$javadocOptionalDependencies.isEmpty())
-Recommends: #printDependencies($javadocOptionalDependencies)
+Recommends: #printDependencies($javadocOptionalDependencies)$space
 #end
 Suggests: ${binPackage}
 Description: Documentation for ${project.Name}

Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm	2010-12-05 20:07:05 UTC (rev 13157)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm	2010-12-05 20:40:18 UTC (rev 13158)
@@ -11,10 +11,6 @@
 #else
 export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f /usr/share/maven-ant-helper/maven-build.xml
 #end
-#if ($generateJavadoc)
-DEB_ANT_BUILD_TARGET := package javadoc
-API_DOCS             := target/docs/api
-#end
 
 #end
 %:
@@ -24,10 +20,5 @@
 	dh $@ --buildsystem=ant --with maven_repo_helper
 #end
 
-#if ($generateJavadoc)
-binary-post-install/$binPackage-doc::
-	dh_install -p$binPackage-doc $(API_DOCS) usr/share/doc/$binPackage
-
-#end
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Modified: trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java	2010-12-05 20:07:05 UTC (rev 13157)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java	2010-12-05 20:40:18 UTC (rev 13158)
@@ -194,6 +194,7 @@
         solver.setExploreProjects(false);
         solver.setPackageName("openmrs");
         solver.setPackageType("maven");
+        solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.openmrs.test openmrs-test * *"));
         solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.openmrs.codehaus.mojo buildnumber-maven-plugin * *"));
         solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.codehaus.mojo build-helper-maven-plugin * *"));
         solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.apache.maven.plugins maven-assembly-plugin * *"));

Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.ignoreRules
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.ignoreRules	                        (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.ignoreRules	2010-12-05 20:40:18 UTC (rev 13158)
@@ -0,0 +1 @@
+org.openmrs.test openmrs-test * * *

Modified: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.poms
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.poms	2010-12-05 20:07:05 UTC (rev 13157)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.poms	2010-12-05 20:40:18 UTC (rev 13158)
@@ -1,2 +1,5 @@
 pom.xml --no-parent
+test/pom.xml --ignore
 api/pom.xml
+web/pom.xml --ignore
+webapp/pom.xml --ignore

Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.pom	                        (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.pom	2010-12-05 20:40:18 UTC (rev 13158)
@@ -0,0 +1,137 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>commons-beanutils</groupId>
+	<artifactId>commons-beanutils</artifactId>
+	<version>1.8.3</version>
+	<packaging>jar</packaging>
+	
+	<name>Commons BeanUtils</name>
+	<inceptionYear>2000</inceptionYear>
+	<description>BeanUtils provides an easy-to-use but flexible wrapper around reflection and introspection.</description>
+	<url>http://commons.apache.org/beanutils/</url>
+	<issueManagement>
+		<system>jira</system>
+		<url>http://issues.apache.org/jira/browse/BEANUTILS</url>
+	</issueManagement>
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/beanutils/trunk/</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/beanutils/trunk/</developerConnection>
+		<url>http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/</url>
+	</scm>
+	<developers>
+		<developer>
+			<name>Robert Burrell Donkin</name>
+			<id>rdonkin</id>
+			<email>rdonkin at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>dIon Gillard</name>
+			<id>dion</id>
+			<email>dion at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Craig McClanahan</name>
+			<id>craigmcc</id>
+			<email>craigmcc at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Geir Magnusson Jr.</name>
+			<id>geirm</id>
+			<email>geirm at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Scott Sanders</name>
+			<id>sanders</id>
+			<email>sanders at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>James Strachan</name>
+			<id>jstrachan</id>
+			<email>jstrachan at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Rodney Waldhoff</name>
+			<id>rwaldhoff</id>
+			<email>rwaldhoff at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Martin van den Bemt</name>
+			<id>mvdb</id>
+			<email>mvdb at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Yoav Shapira</name>
+			<id>yoavs</id>
+			<email>yoavs at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Niall Pemberton</name>
+			<id>niallp</id>
+			<email>niallp at apache dot org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Simon Kitching</name>
+			<id>skitching</id>
+			<email>skitching at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>James Carman</name>
+			<id>jcarman</id>
+			<email>jcarman at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Paul Jack</name>
+			<email>
+			</email>
+		</contributor>
+		<contributor>
+			<name>Stephen Colebourne</name>
+			<email>
+			</email>
+		</contributor>
+		<contributor>
+			<name>Berin Loritsch</name>
+			<email>
+			</email>
+		</contributor>
+	</contributors>
+	<dependencies>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>debian</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.x</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+	<properties>
+		<maven.compile.source>1.3</maven.compile.source>
+		<maven.compile.target>1.3</maven.compile.target>
+		<commons.componentid>beanutils</commons.componentid>
+		<commons.release.version>1.8.3</commons.release.version>
+		<commons.jira.id>BEANUTILS</commons.jira.id>
+		<commons.jira.pid>12310460</commons.jira.pid>
+		<commons.osgi.export>org.apache.commons.beanutils.*;version=${pom.version};-noimport:=true</commons.osgi.export>
+		<debian.originalVersion>1.8.3</debian.originalVersion>
+		<debian.package>libcommons-beanutils-java</debian.package>
+	</properties>
+</project>
\ No newline at end of file

Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/debian/commons-beanutils-debian.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/debian/commons-beanutils-debian.pom	                        (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-beanutils/commons-beanutils/debian/commons-beanutils-debian.pom	2010-12-05 20:40:18 UTC (rev 13158)
@@ -0,0 +1,137 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>commons-beanutils</groupId>
+	<artifactId>commons-beanutils</artifactId>
+	<version>debian</version>
+	<packaging>jar</packaging>
+	
+	<name>Commons BeanUtils</name>
+	<inceptionYear>2000</inceptionYear>
+	<description>BeanUtils provides an easy-to-use but flexible wrapper around reflection and introspection.</description>
+	<url>http://commons.apache.org/beanutils/</url>
+	<issueManagement>
+		<system>jira</system>
+		<url>http://issues.apache.org/jira/browse/BEANUTILS</url>
+	</issueManagement>
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/beanutils/trunk/</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/beanutils/trunk/</developerConnection>
+		<url>http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/</url>
+	</scm>
+	<developers>
+		<developer>
+			<name>Robert Burrell Donkin</name>
+			<id>rdonkin</id>
+			<email>rdonkin at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>dIon Gillard</name>
+			<id>dion</id>
+			<email>dion at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Craig McClanahan</name>
+			<id>craigmcc</id>
+			<email>craigmcc at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Geir Magnusson Jr.</name>
+			<id>geirm</id>
+			<email>geirm at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Scott Sanders</name>
+			<id>sanders</id>
+			<email>sanders at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>James Strachan</name>
+			<id>jstrachan</id>
+			<email>jstrachan at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Rodney Waldhoff</name>
+			<id>rwaldhoff</id>
+			<email>rwaldhoff at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Martin van den Bemt</name>
+			<id>mvdb</id>
+			<email>mvdb at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Yoav Shapira</name>
+			<id>yoavs</id>
+			<email>yoavs at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Niall Pemberton</name>
+			<id>niallp</id>
+			<email>niallp at apache dot org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>Simon Kitching</name>
+			<id>skitching</id>
+			<email>skitching at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+		<developer>
+			<name>James Carman</name>
+			<id>jcarman</id>
+			<email>jcarman at apache.org</email>
+			<organization>Apache Software Foundation</organization>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Paul Jack</name>
+			<email>
+			</email>
+		</contributor>
+		<contributor>
+			<name>Stephen Colebourne</name>
+			<email>
+			</email>
+		</contributor>
+		<contributor>
+			<name>Berin Loritsch</name>
+			<email>
+			</email>
+		</contributor>
+	</contributors>
+	<dependencies>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>debian</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.x</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+	<properties>
+		<maven.compile.source>1.3</maven.compile.source>
+		<maven.compile.target>1.3</maven.compile.target>
+		<commons.componentid>beanutils</commons.componentid>
+		<commons.release.version>1.8.3</commons.release.version>
+		<commons.jira.id>BEANUTILS</commons.jira.id>
+		<commons.jira.pid>12310460</commons.jira.pid>
+		<commons.osgi.export>org.apache.commons.beanutils.*;version=${pom.version};-noimport:=true</commons.osgi.export>
+		<debian.originalVersion>1.8.3</debian.originalVersion>
+		<debian.package>libcommons-beanutils-java</debian.package>
+	</properties>
+</project>
\ No newline at end of file

Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.2.1/commons-collections-3.2.1.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.2.1/commons-collections-3.2.1.pom	                        (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.2.1/commons-collections-3.2.1.pom	2010-12-05 20:40:18 UTC (rev 13158)
@@ -0,0 +1,376 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>commons-collections</groupId>
+	<artifactId>commons-collections</artifactId>
+	<version>3.2.1</version>
+	<packaging>jar</packaging>
+	
+	<name>Commons Collections</name>
+	<inceptionYear>2001</inceptionYear>
+	<description>Types that extend and augment the Java Collections Framework.</description>
+	<url>http://commons.apache.org/collections/</url>
+	<issueManagement>
+		<system>jira</system>
+		<url>http://issues.apache.org/jira/browse/COLLECTIONS</url>
+	</issueManagement>
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/collections/trunk</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/collections/trunk</developerConnection>
+		<url>http://svn.apache.org/viewvc/commons/proper/collections/trunk</url>
+	</scm>
+	<developers>
+		<developer>
+			<name>Stephen Colebourne</name>
+			<id>scolebourne</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Morgan Delagrange</name>
+			<id>morgand</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Matthew Hawthorne</name>
+			<id>matth</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Geir Magnusson</name>
+			<id>geirm</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Craig McClanahan</name>
+			<id>craigmcc</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Phil Steitz</name>
+			<id>psteitz</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Arun M. Thomas</name>
+			<id>amamment</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Rodney Waldhoff</name>
+			<id>rwaldhoff</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Henri Yandell</name>
+			<id>bayard</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>James Carman</name>
+			<id>jcarman</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Robert Burrell Donkin</name>
+			<id>rdonkin</id>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Rafael U. C. Afonso</name>
+		</contributor>
+		<contributor>
+			<name>Max Rydahl Andersen</name>
+		</contributor>
+		<contributor>
+			<name>Federico Barbieri</name>
+		</contributor>
+		<contributor>
+			<name>Arron Bates</name>
+		</contributor>
+		<contributor>
+			<name>Nicola Ken Barozzi</name>
+		</contributor>
+		<contributor>
+			<name>Sebastian Bazley</name>
+		</contributor>
+		<contributor>
+			<name>Matt Benson</name>
+		</contributor>
+		<contributor>
+			<name>Ola Berg</name>
+		</contributor>
+		<contributor>
+			<name>Christopher Berry</name>
+		</contributor>
+		<contributor>
+			<name>Nathan Beyer</name>
+		</contributor>
+		<contributor>
+			<name>Janek Bogucki</name>
+		</contributor>
+		<contributor>
+			<name>Chuck Burdick</name>
+		</contributor>
+		<contributor>
+			<name>Dave Bryson</name>
+		</contributor>
+		<contributor>
+			<name>Julien Buret</name>
+		</contributor>
+		<contributor>
+			<name>Jonathan Carlson</name>
+		</contributor>
+		<contributor>
+			<name>Ram Chidambaram</name>
+		</contributor>
+		<contributor>
+			<name>Steve Clark</name>
+		</contributor>
+		<contributor>
+			<name>Eric Crampton</name>
+		</contributor>
+		<contributor>
+			<name>Dimiter Dimitrov</name>
+		</contributor>
+		<contributor>
+			<name>Peter Donald</name>
+		</contributor>
+		<contributor>
+			<name>Steve Downey</name>
+		</contributor>
+		<contributor>
+			<name>Rich Dougherty</name>
+		</contributor>
+		<contributor>
+			<name>Tom Dunham</name>
+		</contributor>
+		<contributor>
+			<name>Stefano Fornari</name>
+		</contributor>
+		<contributor>
+			<name>Andrew Freeman</name>
+		</contributor>
+		<contributor>
+			<name>Gerhard Froehlich</name>
+		</contributor>
+		<contributor>
+			<name>Paul Jack</name>
+		</contributor>
+		<contributor>
+			<name>Eric Johnson</name>
+		</contributor>
+		<contributor>
+			<name>Kent Johnson</name>
+		</contributor>
+		<contributor>
+			<name>Marc Johnson</name>
+		</contributor>
+		<contributor>
+			<name>Nissim Karpenstein</name>
+		</contributor>
+		<contributor>
+			<name>Shinobu Kawai</name>
+		</contributor>
+		<contributor>
+			<name>Mohan Kishore</name>
+		</contributor>
+		<contributor>
+			<name>Simon Kitching</name>
+		</contributor>
+		<contributor>
+			<name>Thomas Knych</name>
+		</contributor>
+		<contributor>
+			<name>Serge Knystautas</name>
+		</contributor>
+		<contributor>
+			<name>Peter KoBek</name>
+		</contributor>
+		<contributor>
+			<name>Jordan Krey</name>
+		</contributor>
+		<contributor>
+			<name>Olaf Krische</name>
+		</contributor>
+		<contributor>
+			<name>Guilhem Lavaux</name>
+		</contributor>
+		<contributor>
+			<name>Paul Legato</name>
+		</contributor>
+		<contributor>
+			<name>David Leppik</name>
+		</contributor>
+		<contributor>
+			<name>Berin Loritsch</name>
+		</contributor>
+		<contributor>
+			<name>Hendrik Maryns</name>
+		</contributor>
+		<contributor>
+			<name>Stefano Mazzocchi</name>
+		</contributor>
+		<contributor>
+			<name>Brian McCallister</name>
+		</contributor>
+		<contributor>
+			<name>Steven Melzer</name>
+		</contributor>
+		<contributor>
+			<name>Leon Messerschmidt</name>
+		</contributor>
+		<contributor>
+			<name>Mauricio S. Moura</name>
+		</contributor>
+		<contributor>
+			<name>Kasper Nielsen</name>
+		</contributor>
+		<contributor>
+			<name>Stanislaw Osinski</name>
+		</contributor>
+		<contributor>
+			<name>Alban Peignier</name>
+		</contributor>
+		<contributor>
+			<name>Mike Pettypiece</name>
+		</contributor>
+		<contributor>
+			<name>Steve Phelps</name>
+		</contributor>
+		<contributor>
+			<name>Ilkka Priha</name>
+		</contributor>
+		<contributor>
+			<name>Jonas Van Poucke</name>
+		</contributor>
+		<contributor>
+			<name>Will Pugh</name>
+		</contributor>
+		<contributor>
+			<name>Herve Quiroz</name>
+		</contributor>
+		<contributor>
+			<name>Daniel Rall</name>
+		</contributor>
+		<contributor>
+			<name>Robert Ribnitz</name>
+		</contributor>
+		<contributor>
+			<name>Huw Roberts</name>
+		</contributor>
+		<contributor>
+			<name>Henning P. Schmiedehausen</name>
+		</contributor>
+		<contributor>
+			<name>Howard Lewis Ship</name>
+		</contributor>
+		<contributor>
+			<name>Joe Raysa</name>
+		</contributor>
+		<contributor>
+			<name>Thomas Schapitz</name>
+		</contributor>
+		<contributor>
+			<name>Jon Schewe</name>
+		</contributor>
+		<contributor>
+			<name>Andreas Schlosser</name>
+		</contributor>
+		<contributor>
+			<name>Christian Siefkes</name>
+		</contributor>
+		<contributor>
+			<name>Michael Smith</name>
+		</contributor>
+		<contributor>
+			<name>Stephen Smith</name>
+		</contributor>
+		<contributor>
+			<name>Jan Sorensen</name>
+		</contributor>
+		<contributor>
+			<name>Jon S. Stevens</name>
+		</contributor>
+		<contributor>
+			<name>James Strachan</name>
+		</contributor>
+		<contributor>
+			<name>Leo Sutic</name>
+		</contributor>
+		<contributor>
+			<name>Chris Tilden</name>
+		</contributor>
+		<contributor>
+			<name>Neil O'Toole</name>
+		</contributor>
+		<contributor>
+			<name>Jeff Turner</name>
+		</contributor>
+		<contributor>
+			<name>Kazuya Ujihara</name>
+		</contributor>
+		<contributor>
+			<name>Jeff Varszegi</name>
+		</contributor>
+		<contributor>
+			<name>Ralph Wagner</name>
+		</contributor>
+		<contributor>
+			<name>David Weinrich</name>
+		</contributor>
+		<contributor>
+			<name>Dieter Wimberger</name>
+		</contributor>
+		<contributor>
+			<name>Serhiy Yevtushenko</name>
+		</contributor>
+		<contributor>
+			<name>Jason van Zyl</name>
+		</contributor>
+	</contributors>
+	<dependencies>
+	</dependencies>
+	<properties>
+		<maven.compile.source>1.2</maven.compile.source>
+		<maven.compile.target>1.2</maven.compile.target>
+		<commons.componentid>collections</commons.componentid>
+		<commons.release.version>3.2.1</commons.release.version>
+		<commons.binary.suffix>-bin</commons.binary.suffix>
+		<commons.jira.id>COLLECTIONS</commons.jira.id>
+		<commons.jira.pid>12310465</commons.jira.pid>
+		<debian.originalVersion>3.2.1</debian.originalVersion>
+		<debian.package>libcommons-collections3-java</debian.package>
+		<debian.mavenRules><![CDATA[commons-collections commons-collections jar s/3\..*/3.x/ *]]></debian.mavenRules>
+	</properties>
+</project>
\ No newline at end of file

Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.x/commons-collections-3.x.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.x/commons-collections-3.x.pom	                        (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/commons-collection/commons-collection/3.x/commons-collections-3.x.pom	2010-12-05 20:40:18 UTC (rev 13158)
@@ -0,0 +1,376 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>commons-collections</groupId>
+	<artifactId>commons-collections</artifactId>
+	<version>3.x</version>
+	<packaging>jar</packaging>
+	
+	<name>Commons Collections</name>
+	<inceptionYear>2001</inceptionYear>
+	<description>Types that extend and augment the Java Collections Framework.</description>
+	<url>http://commons.apache.org/collections/</url>
+	<issueManagement>
+		<system>jira</system>
+		<url>http://issues.apache.org/jira/browse/COLLECTIONS</url>
+	</issueManagement>
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/collections/trunk</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/collections/trunk</developerConnection>
+		<url>http://svn.apache.org/viewvc/commons/proper/collections/trunk</url>
+	</scm>
+	<developers>
+		<developer>
+			<name>Stephen Colebourne</name>
+			<id>scolebourne</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Morgan Delagrange</name>
+			<id>morgand</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Matthew Hawthorne</name>
+			<id>matth</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Geir Magnusson</name>
+			<id>geirm</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Craig McClanahan</name>
+			<id>craigmcc</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Phil Steitz</name>
+			<id>psteitz</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Arun M. Thomas</name>
+			<id>amamment</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Rodney Waldhoff</name>
+			<id>rwaldhoff</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Henri Yandell</name>
+			<id>bayard</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>James Carman</name>
+			<id>jcarman</id>
+			<email>
+			</email>
+			<organization>
+			</organization>
+		</developer>
+		<developer>
+			<name>Robert Burrell Donkin</name>
+			<id>rdonkin</id>
+		</developer>
+	</developers>
+	<contributors>
+		<contributor>
+			<name>Rafael U. C. Afonso</name>
+		</contributor>
+		<contributor>
+			<name>Max Rydahl Andersen</name>
+		</contributor>
+		<contributor>
+			<name>Federico Barbieri</name>
+		</contributor>
+		<contributor>
+			<name>Arron Bates</name>
+		</contributor>
+		<contributor>
+			<name>Nicola Ken Barozzi</name>
+		</contributor>
+		<contributor>
+			<name>Sebastian Bazley</name>
+		</contributor>
+		<contributor>
+			<name>Matt Benson</name>
+		</contributor>
+		<contributor>
+			<name>Ola Berg</name>
+		</contributor>
+		<contributor>
+			<name>Christopher Berry</name>
+		</contributor>
+		<contributor>
+			<name>Nathan Beyer</name>
+		</contributor>
+		<contributor>
+			<name>Janek Bogucki</name>
+		</contributor>
+		<contributor>
+			<name>Chuck Burdick</name>
+		</contributor>
+		<contributor>
+			<name>Dave Bryson</name>
+		</contributor>
+		<contributor>
+			<name>Julien Buret</name>
+		</contributor>
+		<contributor>
+			<name>Jonathan Carlson</name>
+		</contributor>
+		<contributor>
+			<name>Ram Chidambaram</name>
+		</contributor>
+		<contributor>
+			<name>Steve Clark</name>
+		</contributor>
+		<contributor>
+			<name>Eric Crampton</name>
+		</contributor>
+		<contributor>
+			<name>Dimiter Dimitrov</name>
+		</contributor>
+		<contributor>
+			<name>Peter Donald</name>
+		</contributor>
+		<contributor>
+			<name>Steve Downey</name>
+		</contributor>
+		<contributor>
+			<name>Rich Dougherty</name>
+		</contributor>
+		<contributor>
+			<name>Tom Dunham</name>
+		</contributor>
+		<contributor>
+			<name>Stefano Fornari</name>
+		</contributor>
+		<contributor>
+			<name>Andrew Freeman</name>
+		</contributor>
+		<contributor>
+			<name>Gerhard Froehlich</name>
+		</contributor>
+		<contributor>
+			<name>Paul Jack</name>
+		</contributor>
+		<contributor>
+			<name>Eric Johnson</name>
+		</contributor>
+		<contributor>
+			<name>Kent Johnson</name>
+		</contributor>
+		<contributor>
+			<name>Marc Johnson</name>
+		</contributor>
+		<contributor>
+			<name>Nissim Karpenstein</name>
+		</contributor>
+		<contributor>
+			<name>Shinobu Kawai</name>
+		</contributor>
+		<contributor>
+			<name>Mohan Kishore</name>
+		</contributor>
+		<contributor>
+			<name>Simon Kitching</name>
+		</contributor>
+		<contributor>
+			<name>Thomas Knych</name>
+		</contributor>
+		<contributor>
+			<name>Serge Knystautas</name>
+		</contributor>
+		<contributor>
+			<name>Peter KoBek</name>
+		</contributor>
+		<contributor>
+			<name>Jordan Krey</name>
+		</contributor>
+		<contributor>
+			<name>Olaf Krische</name>
+		</contributor>
+		<contributor>
+			<name>Guilhem Lavaux</name>
+		</contributor>
+		<contributor>
+			<name>Paul Legato</name>
+		</contributor>
+		<contributor>
+			<name>David Leppik</name>
+		</contributor>
+		<contributor>
+			<name>Berin Loritsch</name>
+		</contributor>
+		<contributor>
+			<name>Hendrik Maryns</name>
+		</contributor>
+		<contributor>
+			<name>Stefano Mazzocchi</name>
+		</contributor>
+		<contributor>
+			<name>Brian McCallister</name>
+		</contributor>
+		<contributor>
+			<name>Steven Melzer</name>
+		</contributor>
+		<contributor>
+			<name>Leon Messerschmidt</name>
+		</contributor>
+		<contributor>
+			<name>Mauricio S. Moura</name>
+		</contributor>
+		<contributor>
+			<name>Kasper Nielsen</name>
+		</contributor>
+		<contributor>
+			<name>Stanislaw Osinski</name>
+		</contributor>
+		<contributor>
+			<name>Alban Peignier</name>
+		</contributor>
+		<contributor>
+			<name>Mike Pettypiece</name>
+		</contributor>
+		<contributor>
+			<name>Steve Phelps</name>
+		</contributor>
+		<contributor>
+			<name>Ilkka Priha</name>
+		</contributor>
+		<contributor>
+			<name>Jonas Van Poucke</name>
+		</contributor>
+		<contributor>
+			<name>Will Pugh</name>
+		</contributor>
+		<contributor>
+			<name>Herve Quiroz</name>
+		</contributor>
+		<contributor>
+			<name>Daniel Rall</name>
+		</contributor>
+		<contributor>
+			<name>Robert Ribnitz</name>
+		</contributor>
+		<contributor>
+			<name>Huw Roberts</name>
+		</contributor>
+		<contributor>
+			<name>Henning P. Schmiedehausen</name>
+		</contributor>
+		<contributor>
+			<name>Howard Lewis Ship</name>
+		</contributor>
+		<contributor>
+			<name>Joe Raysa</name>
+		</contributor>
+		<contributor>
+			<name>Thomas Schapitz</name>
+		</contributor>
+		<contributor>
+			<name>Jon Schewe</name>
+		</contributor>
+		<contributor>
+			<name>Andreas Schlosser</name>
+		</contributor>
+		<contributor>
+			<name>Christian Siefkes</name>
+		</contributor>
+		<contributor>
+			<name>Michael Smith</name>
+		</contributor>
+		<contributor>
+			<name>Stephen Smith</name>
+		</contributor>
+		<contributor>
+			<name>Jan Sorensen</name>
+		</contributor>
+		<contributor>
+			<name>Jon S. Stevens</name>
+		</contributor>
+		<contributor>
+			<name>James Strachan</name>
+		</contributor>
+		<contributor>
+			<name>Leo Sutic</name>
+		</contributor>
+		<contributor>
+			<name>Chris Tilden</name>
+		</contributor>
+		<contributor>
+			<name>Neil O'Toole</name>
+		</contributor>
+		<contributor>
+			<name>Jeff Turner</name>
+		</contributor>
+		<contributor>
+			<name>Kazuya Ujihara</name>
+		</contributor>
+		<contributor>
+			<name>Jeff Varszegi</name>
+		</contributor>
+		<contributor>
+			<name>Ralph Wagner</name>
+		</contributor>
+		<contributor>
+			<name>David Weinrich</name>
+		</contributor>
+		<contributor>
+			<name>Dieter Wimberger</name>
+		</contributor>
+		<contributor>
+			<name>Serhiy Yevtushenko</name>
+		</contributor>
+		<contributor>
+			<name>Jason van Zyl</name>
+		</contributor>
+	</contributors>
+	<dependencies>
+	</dependencies>
+	<properties>
+		<maven.compile.source>1.2</maven.compile.source>
+		<maven.compile.target>1.2</maven.compile.target>
+		<commons.componentid>collections</commons.componentid>
+		<commons.release.version>3.2.1</commons.release.version>
+		<commons.binary.suffix>-bin</commons.binary.suffix>
+		<commons.jira.id>COLLECTIONS</commons.jira.id>
+		<commons.jira.pid>12310465</commons.jira.pid>
+		<debian.originalVersion>3.2.1</debian.originalVersion>
+		<debian.package>libcommons-collections3-java</debian.package>
+		<debian.mavenRules><![CDATA[commons-collections commons-collections jar s/3\..*/3.x/ *]]></debian.mavenRules>
+	</properties>
+</project>
\ No newline at end of file

Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom	                        (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom	2010-12-05 20:40:18 UTC (rev 13158)
@@ -0,0 +1,92 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-jar-plugin</artifactId>
+	<version>2.2</version>
+	<packaging>maven-plugin</packaging>
+	<properties>
+		<debian.originalVersion>2.2</debian.originalVersion>
+		<debian.package>libmaven-jar-plugin-java</debian.package>
+	</properties>
+	
+	<name>Maven Jar Plugin</name>
+	<issueManagement>
+		<system>JIRA</system>
+		<url>http://jira.codehaus.org/browse/MJAR</url>
+	</issueManagement>
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-jar-plugin-2.2</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-jar-plugin-2.2</developerConnection>
+		<url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-jar-plugin-2.2</url>
+	</scm>
+	<contributors>
+		<contributor>
+			<name>Jerome Lacoste</name>
+			<email>jerome at coffeebreaks.org</email>
+			<organization>CoffeeBreaks</organization>
+			<organizationUrl>http://www.coffeebreaks.org</organizationUrl>
+			<timezone>+1</timezone>
+			<roles>
+				<role>Java Developer</role>
+			</roles>
+		</contributor>
+	</contributors>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-api</artifactId>
+			<version>debian</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-project</artifactId>
+			<version>debian</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-archiver</artifactId>
+			<version>debian</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-archiver</artifactId>
+			<version>debian</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-container-default</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-component-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-io</artifactId>
+			<version>debian</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-container-default</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-component-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>debian</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>debian</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin/2.1/antlr-maven-plugin-2.1.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin/2.1/antlr-maven-plugin-2.1.pom	                        (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/mojo/antlr-maven-plugin/2.1/antlr-maven-plugin-2.1.pom	2010-12-05 20:40:18 UTC (rev 13158)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.codehaus.mojo</groupId>
+	<artifactId>antlr-maven-plugin</artifactId>
+	<version>2.1</version>
+	<packaging>maven-plugin</packaging>
+	<properties>
+		<debian.originalVersion>2.1</debian.originalVersion>
+		<debian.package>libantlr-maven-plugin-java</debian.package>
+	</properties>
+	
+	<name>Maven ANTLR Plugin</name>
+	<description>Maven Plugin for Antlr v2</description>
+	<inceptionYear>2004</inceptionYear>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:svn:https://svn.codehaus.org/mojo/tags/antlr-maven-plugin-2.1</connection>
+		<developerConnection>scm:svn:https://svn.codehaus.org/mojo/tags/antlr-maven-plugin-2.1</developerConnection>
+		<url>https://svn.codehaus.org/mojo/tags/antlr-maven-plugin-2.1</url>
+	</scm>
+	<issueManagement>
+		<system>jira</system>
+		<url>http://jira.codehaus.org/browse/MANTLR</url>
+	</issueManagement>
+	<developers>
+		<developer>
+			<id>vsiveton</id>
+			<name>Vincent Siveton</name>
+			<email>vsiveton at apache.org</email>
+			<organization>ASF</organization>
+			<roles>
+				<role>Java Developer</role>
+			</roles>
+			<timezone>-5</timezone>
+		</developer>
+	</developers>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-project</artifactId>
+			<version>debian</version>
+			<exclusions>
+				<exclusion>
+					<groupId>plexus</groupId>
+					<artifactId>plexus-utils</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.reporting</groupId>
+			<artifactId>maven-reporting-impl</artifactId>
+			<version>debian</version>
+			<exclusions>
+				<exclusion>
+					<groupId>plexus</groupId>
+					<artifactId>plexus-utils</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-api</artifactId>
+			<version>debian</version>
+			<exclusions>
+				<exclusion>
+					<groupId>plexus</groupId>
+					<artifactId>plexus-utils</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-i18n</artifactId>
+			<version>debian</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>debian</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.wagon</groupId>
+			<artifactId>wagon-provider-api</artifactId>
+			<version>debian</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk	2010-12-05 20:07:05 UTC (rev 13157)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk	2010-12-05 20:40:18 UTC (rev 13158)
@@ -28,7 +28,7 @@
 
 # Declare Build-Deps for packages using this file
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.43)
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.5)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.4)
 
 # Maven home directory.  Doesn't need to be changed except when using
 # nonstandard Maven installations.




More information about the pkg-java-commits mailing list