From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Fri, 7 Apr 2017 14:24:43 +0000 (+0900)
Subject: modify assembly descriptor
X-Git-Tag: fromMercurial~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8fbdd3822ff58564f841298d3ff67e5bcfdcd80e;p=jindolf%2FJinCore.git

modify assembly descriptor
---

diff --git a/pom.xml b/pom.xml
index ce00799..4e71910 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,12 +26,12 @@
 -->Javaパッケージです。<!--
  --></description>
 
-    <url>https://osdn.jp/projects/jindolf/devel/</url>
+    <url>https://ja.osdn.net/projects/jindolf/devel/</url>
     <inceptionYear>2009</inceptionYear>
 
     <organization>
         <name>Jindolf Partners</name>
-        <url>https://osdn.jp/projects/jindolf/devel/</url>
+        <url>https://ja.osdn.net/projects/jindolf/devel/</url>
     </organization>
 
     <licenses>
@@ -47,7 +47,7 @@
             <id>olyutorskii</id>
             <url>https://sites.google.com/site/olyutorskiipit/</url>
             <organization>Jindolf Partners</organization>
-            <organizationUrl>https://osdn.jp/projects/jindolf/devel/</organizationUrl>
+            <organizationUrl>https://ja.osdn.net/projects/jindolf/devel/</organizationUrl>
             <roles>
                 <role>Project Founder</role>
                 <role>Java Developer</role>
@@ -65,14 +65,14 @@
     <modules/>
 
     <scm>
-        <connection>scm:hg:http://hg.osdn.jp/view/jindolf/JinCore</connection>
-        <developerConnection>scm:hg:ssh://hg.osdn.jp//hgroot/jindolf/JinCore</developerConnection>
-        <url>https://osdn.jp/projects/jindolf/scm/hg/JinCore/</url>
+        <connection>scm:hg:http://hg.osdn.net/view/jindolf/JinCore</connection>
+        <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/JinCore</developerConnection>
+        <url>https://osdn.net/projects/jindolf/scm/hg/JinCore/</url>
     </scm>
 
     <issueManagement>
         <system>OSDN.JP</system>
-        <url>https://osdn.jp/projects/jindolf/ticket/</url>
+        <url>https://osdn.net/projects/jindolf/ticket/</url>
     </issueManagement>
 
     <ciManagement/>
@@ -299,11 +299,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
--- 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>