remove redundant MANIFEST.MF from JAR

diff --git a/.gitignore b/.gitignore
index 3bf3b09..c659fa3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
-##### Git ignore pattern   https://git-scm.com/docs/gitignore
+##### Git ignore pattern
+## See https://git-scm.com/docs/gitignore
+## See https://docs.github.com/en/free-pro-team@latest/github/using-git/ignoring-files
+## See https://github.com/github/gitignore
+## See https://www.toptal.com/developers/gitignore
 
 
 ### Unix
@@ -20,7 +24,8 @@ __MACOSX
 ### Windows
 
 Thumbs.db
-desktop.ini
+[Dd]esktop.ini
+*.lnk
 
 
 ### JDK
@@ -64,4 +69,9 @@ hs_err_pid*
 *.ipr
 
 
+### Visual Studio Code
+
+/.vscode/
+
+
 ### EOF ###

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5767b84..f7ed006 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,9 @@
 JinArchiver 変更履歴
 
 
+1.504.X (2022-XX-XX)
+    ・JinParser 2.102.6 に対応。
+
 1.504.6 (2020-10-12)
     ・G国URL変更に伴い JinParser 2.102.4 に対応。
 

diff --git a/pom.xml b/pom.xml
index 6294daa..a62fd33 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -406,6 +406,26 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <filters>
+                                <filter>
+                                    <artifact>jp.sourceforge.jindolf:jincore</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>jp.osdn.jindolf:jinparser</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>io.bitbucket.olyutorskii:jiocema</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index b4f4424..c543c11 100644 (file)
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -8,13 +8,13 @@
 >
 
 <!--
-    OSDN.net用リリースファイル構成定義ファイル
-    Maven3 assembly用
+    for maven-assembly-plugin
 -->
 
     <id>src</id>
 
     <formats>
+        <format>tar.gz</format>
         <format>zip</format>
     </formats>