modify assembly

diff --git a/pom.xml b/pom.xml
index f2fff3d..d5b6b03 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -65,9 +65,9 @@
     <modules/>
 
     <scm>
-        <connection>scm:hg:http://hg.osdn.jp/view/jindolf/JinParser</connection>
-        <developerConnection>scm:hg:ssh://hg.osdn.jp//hgroot/jindolf/JinParser</developerConnection>
-        <url>https://osdn.jp/projects/jindolf/scm/hg/JinParser/</url>
+        <connection>scm:hg:http://hg.osdn.net/view/jindolf/JinParser</connection>
+        <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/JinParser</developerConnection>
+        <url>https://osdn.net/projects/jindolf/scm/hg/JinParser/</url>
     </scm>
 
     <issueManagement>
@@ -349,11 +349,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.0.0</version>
                 <configuration>
-                    <archiveBaseDirectory>.</archiveBaseDirectory>
                     <descriptors>
-                        <descriptor>src/main/assembly/descriptor.xml</descriptor>
+                        <descriptor>src/assembly/src.xml</descriptor>
                     </descriptors>
                 </configuration>
             </plugin>

diff --git a/src/main/assembly/descriptor.xml b/src/assembly/src.xml
similarity index 58%
rename from src/main/assembly/descriptor.xml
rename to src/assembly/src.xml
index 41810c6..0610012 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,7 @@
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
-            <directory>src/</directory>
+            <directory>${project.basedir}/src</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>