Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg
--- a/debian-maven-plugin/pom.xml
+++ b/debian-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <artifactId>maven-debian</artifactId>
        <groupId>org.debian.maven</groupId>
-        <version>2.3</version>
+        <version>2.3.1</version>
    </parent>

    <artifactId>debian-maven-plugin</artifactId>

--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
@@ -767,6 +767,8 @@ public class SysInstallMojo extends AbstractMojo {
    protected void relocatePoms() throws IOException {
        if (relocatedArtifacts != null) {
            for (Dependency relocated : relocatedArtifacts) {
+                relocated.setType(new File(fullJarName()).exists() ? "jar" : "pom");
+
                getLog().info("Relocating " + relocated.formatCompactNotation());

                File relocatedPath = new File(packagePath() + "/usr/share/maven-repo" + artifactPath(relocated.getGroupId(), relocated.getArtifactId(), relocated.getVersion()));
@@ -784,6 +786,7 @@ public class SysInstallMojo extends AbstractMojo {
                "  <groupId>" + relocateArtifact.getGroupId() + "</groupId>\n" +
                "  <artifactId>" + relocateArtifact.getArtifactId() + "</artifactId>\n" +
                "  <version>" + relocateArtifact.getVersion() + "</version>\n" +
+                "  <packaging>" + relocateArtifact.getType() + "</packaging>\n" +
                "  <properties>\n" +
                "    <debian.package>" + destPackage + "</debian.package>\n" +
                "  </properties>\n" +

--- a/debian/changelog
+++ b/debian/changelog
+maven-debian-helper (2.3.1) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the relocation pom for artifacts of type 'pom' (Closes: #907554)
+  * Added glassfish-copyright-maven-plugin to the ignored plugins
+  * Standards-Version updated to 4.2.1
+  * The generated control file now specifies Standards-Version: 4.2.1
+  * Build the plugin metadata for the org.apache.xbean and
+    org.jvnet.jaxb2.maven2 groups when copying the Maven repository.
+  * Detect the CDDL licenses when generating the debian/copyright file
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 06 Sep 2018 09:00:57 +0200
+
 maven-debian-helper (2.3) unstable; urgency=medium

  * Team upload.

--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
 libplexus-velocity-java,
 maven-ant-helper,
 maven-repo-helper (>= 1.9)
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/maven-debian-helper.git
 Vcs-Browser: https://salsa.debian.org/java-team/maven-debian-helper
 Homepage: https://wiki.debian.org/Java/MavenBuilder

--- a/maven-debian-helper/pom.xml
+++ b/maven-debian-helper/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.debian.maven</groupId>
        <artifactId>maven-debian</artifactId>
-        <version>2.3</version>
+        <version>2.3.1</version>
    </parent>

    <artifactId>maven-debian-helper</artifactId>

--- a/maven-packager-utils/pom.xml
+++ b/maven-packager-utils/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <artifactId>maven-debian</artifactId>
        <groupId>org.debian.maven</groupId>
-        <version>2.3</version>
+        <version>2.3.1</version>
    </parent>

    <artifactId>maven-packager-utils</artifactId>

--- 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
@@ -73,6 +73,7 @@ public class IgnoreDependencyQuestions {
        {"org.codehaus.mojo", "dbunit-maven-plugin"},
        {"org.codehaus.mojo", "failsafe-maven-plugin"},
        {"org.codehaus.mojo", "shitty-maven-plugin"},
+        {"org.glassfish.copyright", "glassfish-copyright-maven-plugin"},
        {"com.mycila.maven-license-plugin", "maven-license-plugin"},
        {"com.google.code.maven-license-plugin", "maven-license-plugin"},
    };

--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/LicensesScanner.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/LicensesScanner.java
@@ -65,7 +65,7 @@ public class LicensesScanner {

    private String getAvailableLicenses() {
        return "Apache-2.0 Artistic BSD-2-clause BSD-3-clause BSD-4-clause ISC CC-BY CC-BY-SA\n"
-             + "CC-BY-ND CC-BY-NC CC-BY-NC-SA CC-BY-NC-ND CC0 CDDL CPL Eiffel EPL-1.0 Expat\n"
+             + "CC-BY-ND CC-BY-NC CC-BY-NC-SA CC-BY-NC-ND CC0 CDDL CDDL-1.1 CPL Eiffel EPL-1.0 Expat\n"
             + "GPL-2 GPL-3 LGPL-2 LGPL-2.1 LGPL-3 GFDL-1.2 GFDL-1.3 GFDL-NIV LPPL MPL-1.1\n"
             + "MPL-2.0 Perl PSF QPL W3C-Software ZLIB Zope";
    }
@@ -135,6 +135,14 @@ public class LicensesScanner {
                licenses.add("MPL-2.0");
                recognized = true;
            }
+        } else if (licenseName.contains("cddl") || licenseUrl.contains("cddl")) {
+            if (licenseName.contains("1.1") || licenseUrl.contains("1.1")) {
+                licenses.add("CDDL-1.1");
+                recognized = true;
+            } else if (licenseName.contains("1.0") || licenseUrl.contains("1.0")) {
+                licenses.add("CDDL");
+                recognized = true;
+            }
        } else if (licenseUrl.contains("http://creativecommons.org/licenses/by-sa/3.0")) {
            licenses.add("CC-BY-SA-3.0");
            recognized = true;

--- a/maven-packager-utils/src/main/resources/control.ant.vm
+++ b/maven-packager-utils/src/main/resources/control.ant.vm
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 11), default-jdk, maven-repo-helper (>= 1.9)#if ($p
 #if(!$buildDependencies.isEmpty())
 Build-Depends-Indep:#printDependencies($buildDependencies)$space
 #end
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/${package}.git
 Vcs-Browser: https://salsa.debian.org/java-team/${package}
 Homepage:#if(${project.Url}) ${project.Url}#else TODO #end

--- a/maven-packager-utils/src/main/resources/control.vm
+++ b/maven-packager-utils/src/main/resources/control.vm
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 11), default-jdk, maven-debian-helper (>= 2.1)
 #if(!$buildDependencies.isEmpty())
 Build-Depends-Indep:#printDependencies($buildDependencies)$space
 #end
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/${package}.git
 Vcs-Browser: https://salsa.debian.org/java-team/${package}
 Homepage:#if(${project.Url}) ${project.Url}#else TODO #end

--- a/maven-packager-utils/src/test/java/org/debian/maven/packager/util/LicensesScannerTest.java
+++ b/maven-packager-utils/src/test/java/org/debian/maven/packager/util/LicensesScannerTest.java
@@ -70,5 +70,17 @@ public class LicensesScannerTest extends TestCase {
        assertTrue(scanner.recognizeLicense(licenses, "", "https://www.mozilla.org/MPL/2.0/"));
        assertEquals("MPL-2.0", licenses.iterator().next());
        licenses.clear();
+
+        assertTrue(scanner.recognizeLicense(licenses, "CDDL (v1.0)", ""));
+        assertEquals("CDDL", licenses.iterator().next());
+        licenses.clear();
+
+        assertTrue(scanner.recognizeLicense(licenses, "", "https://opensource.org/licenses/CDDL-1.0"));
+        assertEquals("CDDL", licenses.iterator().next());
+        licenses.clear();
+
+        assertTrue(scanner.recognizeLicense(licenses, "CDDL (v1.1)", ""));
+        assertEquals("CDDL-1.1", licenses.iterator().next());
+        licenses.clear();
    }
 }
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@

    <groupId>org.debian.maven</groupId>
    <artifactId>maven-debian</artifactId>
-    <version>2.3</version>
+    <version>2.3.1</version>
    <packaging>pom</packaging>
    <description>Helper tools for using Maven to build Debian packages</description>


--- a/share/maven-debian-helper/copy-repo.sh
+++ b/share/maven-debian-helper/copy-repo.sh
@@ -18,7 +18,7 @@ set -e

 SRC_REPO="/usr/share/maven-repo"
 DEST_REPO="$1/maven-repo"
-PLUGIN_GROUPS="net.bytebuddy org.apache.maven.plugins org.codehaus.modello org.codehaus.mojo org.codehaus.plexus org.apache.felix org.eclipse.tycho org.sonatype.plugins com.thoughtworks.paranamer com.google.code.maven-replacer-plugin"
+PLUGIN_GROUPS="net.bytebuddy org.apache.maven.plugins org.apache.xbean org.codehaus.modello org.codehaus.mojo org.codehaus.plexus org.apache.felix org.eclipse.tycho org.sonatype.plugins org.jvnet.jaxb2.maven2 com.thoughtworks.paranamer com.google.code.maven-replacer-plugin"
 METADATA_NAME="maven-metadata-local.xml"

 find_src_poms() {