Ver código fonte

fix pom release bundle

Jason Rivard 8 anos atrás
pai
commit
3979f33e27
2 arquivos alterados com 14 adições e 5 exclusões
  1. 2 2
      pom.xml
  2. 12 3
      src/build/assembly/release-bundle.xml

+ 2 - 2
pom.xml

@@ -95,13 +95,13 @@
                         <version>2.6</version>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/assembly/pwm-bundle.xml</descriptor>
+                                <descriptor>src/build/assembly/release-bundle.xml</descriptor>
                             </descriptors>
                             <finalName>${project.build.finalName}-${timestamp.iso}</finalName>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>make-assembly</id>
+                                <id>make-release-bundle</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>single</goal>

+ 12 - 3
src/build/assembly/pwm-bundle.xml → src/build/assembly/release-bundle.xml

@@ -21,9 +21,9 @@
   -->
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
 
-    <id>pwm-bundle</id>
+    <id>release-bundle</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -34,10 +34,19 @@
             <destName>pwm.war</destName>
         </file>
         <file>
-            <source>target/${project.build.finalName}-sources.jar</source>
+            <source>${project.basedir}/LICENSE</source>
+        </file>
+        <file>
+            <source>${project.basedir}/pom.xml</source>
         </file>
     </files>
     <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src</directory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>${project.basedir}/supplemental</directory>
             <includes>