Merge branch 'pr-1450'

pmd-dist/pom.xml

@@ -11,8 +11,33 @@
         <version>6.11.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <pmd.dist.bin.baseDirectory>pmd-bin-${project.version}</pmd.dist.bin.baseDirectory>
+    </properties>
+
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/extra-resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
@@ -30,9 +55,9 @@
                             <goal>single</goal>
                         </goals>
                         <configuration>
-                            <finalName>pmd-bin-${project.version}</finalName>
+                            <finalName>${pmd.dist.bin.baseDirectory}</finalName>
                             <descriptors>
-                                <descriptor>src/main/assembly/bin.xml</descriptor>
+                                <descriptor>src/main/resources/assemblies/pmd-bin.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
@@ -45,7 +70,7 @@
                         <configuration>
                             <finalName>pmd-src-${project.version}</finalName>
                             <descriptors>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
+                                <descriptor>src/main/resources/assemblies/pmd-src.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>

pmd-dist/src/main/resources/assemblies/pmd-bin.xml

@@ -1,13 +1,13 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
 
-    <id>bin</id>
+    <id>pmd-bin</id>
     <formats>
         <format>zip</format>
     </formats>
 
     <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>pmd-bin-${project.version}</baseDirectory>
+    <baseDirectory>${pmd.dist.bin.baseDirectory}</baseDirectory>
 
     <fileSets>
         <fileSet>
@@ -18,7 +18,7 @@
                 <include>designer.bat</include>
                 <include>pmd.bat</include>
             </includes>
-            <directory>src/main/scripts</directory>
+            <directory>target/extra-resources/scripts</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
             <directoryMode>0755</directoryMode>
@@ -29,7 +29,7 @@
             <includes>
                 <include>run.sh</include>
             </includes>
-            <directory>src/main/scripts</directory>
+            <directory>target/extra-resources/scripts</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
             <directoryMode>0755</directoryMode>
@@ -40,6 +40,8 @@
             <includes>
                 <include>LICENSE</include>
             </includes>
+            <directory>target/extra-resources</directory>
+            <outputDirectory>.</outputDirectory>
             <directoryMode>0755</directoryMode>
             <fileMode>0644</fileMode>
         </fileSet>

pmd-dist/src/main/resources/assemblies/pmd-src.xml

@@ -1,7 +1,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
 
-    <id>src</id>
+    <id>pmd-src</id>
     <formats>
         <format>zip</format>
     </formats>

pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java

@@ -5,6 +5,7 @@
 package net.sourceforge.pmd.it;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
@@ -59,6 +60,7 @@ public class BinaryDistributionIT {
         Set<String> result = new HashSet<>();
         String basedir = "pmd-bin-" + PMDVersion.VERSION + "/";
         result.add(basedir);
+        result.add(basedir + "LICENSE");
         result.add(basedir + "bin/run.sh");
         result.add(basedir + "bin/pmd.bat");
         result.add(basedir + "bin/cpd.bat");
@@ -81,7 +83,9 @@ public class BinaryDistributionIT {
 
         zip.close();
 
-        assertTrue(expectedFileNames.isEmpty());
+        if (!expectedFileNames.isEmpty()) {
+            fail("Missing files in archive: " + expectedFileNames);
+        }
     }
 
     @Test