Merge commit 'c273eaeb2e7f84eb5e002982d62bcbff90f15a2d'

[jindolf/JinParser.git] / src / assembly / src.xml

diff --git a/src/main/assembly/descriptor.xml b/src/assembly/src.xml
similarity index 55%
rename from src/main/assembly/descriptor.xml
rename to src/assembly/src.xml
index 41810c6..13aaec4 100644 (file)
--- a/src/main/assembly/descriptor.xml
+++ b/src/assembly/src.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+  xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
   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/ASSEMBLY/2.0.0
+  http://maven.apache.org/xsd/assembly-2.0.0.xsd"
 >
 
 <!--
-    OSDN.JP用リリースファイル構成定義ファイル
-    Maven2(or3) assembly用
+    OSDN.NET用リリースファイル構成定義ファイル
+    Maven3 assembly用
 -->
 
     <id>src</id>
@@ -20,10 +20,9 @@
 
     <fileSets>
         <fileSet>
-            <directory>.</directory>
+            <directory>${project.basedir}</directory>
             <includes>
-                <include>pom.xml</include>
-                <include>fixcrlf.xml</include>
+                <include>*.xml</include>
                 <include>*.txt</include>
             </includes>
             <excludes>
@@ -33,7 +32,11 @@
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
-            <directory>src/</directory>
+            <directory>${project.basedir}/src</directory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/config</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>