Fixed licenses inside distribution zip

forge · Sep 9, 2015 · ea3cb01 · ea3cb01
1 parent 6ef07d4
commit ea3cb01
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- ~ Copyright 2012 Red Hat, Inc. and/or its affiliates. ~ ~ Licensed under the Eclipse Public License version 1.0, available at ~ http://www.eclipse.org/legal/epl-v10.html -->
+<!-- ~ Copyright 2012 Red Hat, Inc. and/or its affiliates. ~ ~ Licensed under the Eclipse Public License version 1.0, available 
+   at ~ http://www.eclipse.org/legal/epl-v10.html -->
 
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
@@ -106,13 +108,13 @@
                         <goals>
                            <goal>download-licenses</goal>
                         </goals>
-                        <phase>package</phase>
+                        <phase>prepare-package</phase>
                         <configuration>
                            <licensesOutputDirectory>
-                              ${project.build.directory}/forge-distribution-${forge.release.version}/docs/licenses
+                              ${project.build.directory}/docs/licenses
                            </licensesOutputDirectory>
                            <licensesOutputFile>
-                              ${project.build.directory}/forge-distribution-${forge.release.version}/docs/licenses/licenses.xml
+                              ${project.build.directory}/docs/licenses/licenses.xml
                            </licensesOutputFile>
                         </configuration>
                      </execution>

diff --git a/dist/src/main/assembly/assembly-offline.xml b/dist/src/main/assembly/assembly-offline.xml
@@ -23,7 +23,13 @@
             <include>**</include>
          </includes>
       </fileSet>
-
+      <fileSet>
+         <directory>${project.build.directory}/docs</directory>
+         <outputDirectory>docs</outputDirectory>
+         <includes>
+            <include>**</include>
+         </includes>
+      </fileSet>
    </fileSets>
 
    <dependencySets>

diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
@@ -16,6 +16,13 @@
             <include>**</include>
          </includes>
       </fileSet>
+      <fileSet>
+         <directory>${project.build.directory}/docs</directory>
+         <outputDirectory>docs</outputDirectory>
+         <includes>
+            <include>**</include>
+         </includes>
+      </fileSet>
    </fileSets>
 
    <dependencySets>