OSDN Git Service

DMG生成時のバージョン情報取得方法の変更。
[charactermanaj/CharacterManaJ.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 18bcb6e..5c6fae6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,18 +4,21 @@
 \r
        <groupId>jp.seraphyware.charactermanaj</groupId>\r
        <artifactId>CharacterManaJ</artifactId>\r
-       <version>1.0</version>\r
+       <version>0.9.9.8</version>\r
 \r
        <url>https://osdn.net/projects/charactermanaj/</url>\r
 \r
        <properties>\r
                <appname>CharacterManaJ</appname>\r
                <exename>${appname}.exe</exename>\r
+               <email>seraphy@users.osdn.me</email>\r
                <mainClass>charactermanaj.CharacterManaJ</mainClass>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <maven.compiler.source>1.5</maven.compiler.source>\r
                <maven.compiler.target>1.5</maven.compiler.target>\r
-               <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>\r
+               <animalSnifferArtifact>java15</animalSnifferArtifact>\r
+               <animalSnifferArtifactVersion>1.0</animalSnifferArtifactVersion>\r
+               <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>\r
        </properties>\r
 \r
        <dependencies>\r
@@ -26,6 +29,7 @@
                        <version>1.4</version>\r
                        <scope>provided</scope>\r
                </dependency>\r
+\r
                <!-- テスト -->\r
                <dependency>\r
                        <groupId>junit</groupId>\r
                        <version>4.11</version>\r
                        <scope>test</scope>\r
                </dependency>\r
-               <!-- テストモック https://mvnrepository.com/artifact/org.mockito/mockito-all -->\r
-               <dependency>\r
-                       <groupId>org.mockito</groupId>\r
-                       <artifactId>mockito-all</artifactId>\r
-                       <version>1.10.19</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
        </dependencies>\r
 \r
        <build>\r
                <plugins>\r
-                       <!-- プロパティの参照 -->\r
-                       <plugin>\r
-                               <groupId>org.codehaus.mojo</groupId>\r
-                               <artifactId>properties-maven-plugin</artifactId>\r
-                               <version>1.0.0</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <phase>initialize</phase>\r
-                                               <goals>\r
-                                                       <goal>read-project-properties</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <files>\r
-                                                               <file>src/main/resources/version.properties</file>\r
-                                                       </files>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
                        <plugin>\r
                                <!-- コンパイラープラグイン -->\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                </configuration>\r
                        </plugin>\r
                        <plugin>\r
+                               <!-- 互換性チェック -->\r
+                               <groupId>org.codehaus.mojo</groupId>\r
+                               <artifactId>animal-sniffer-maven-plugin</artifactId>\r
+                               <version>1.16</version>\r
+                               <configuration>\r
+                                       <signature>\r
+                                               <groupId>org.codehaus.mojo.signature</groupId>\r
+                                               <artifactId>${animalSnifferArtifact}</artifactId>\r
+                                               <version>${animalSnifferArtifactVersion}</version>\r
+                                       </signature>\r
+                                       <ignoreDependencies>true</ignoreDependencies>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>check-java-api</id>\r
+                                               <phase>test</phase>\r
+                                               <goals>\r
+                                                       <goal>check</goal>\r
+                                               </goals>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+                       <plugin>\r
                                <!-- 実行可能jar本体のパッケージを行う (package時) -->\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-jar-plugin</artifactId>\r
@@ -83,9 +84,6 @@
                                        <finalName>${project.artifactId}</finalName>\r
                                        <archive>\r
                                                <manifest>\r
-                                                       <!-- 依存ライブラリ/lib/*.jarをクラスパスに追加する -->\r
-                                                       <addClasspath>true</addClasspath>\r
-                                                       <classpathPrefix>lib/</classpathPrefix>\r
                                                        <mainClass>${mainClass}</mainClass>\r
                                                        <addDefaultImplementationEntries>true</addDefaultImplementationEntries>\r
                                                        <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>\r
                                                <manifestEntries>\r
                                                        <!-- 起動時のスプラッシュ画像 -->\r
                                                        <SplashScreen-Image>splash.png</SplashScreen-Image>\r
-                                                       <Built-By>${vendor}</Built-By>\r
+                                                       <Built-By>${email}</Built-By>\r
                                                        <Build-At>${maven.build.timestamp}</Build-At>\r
-                                                       <Implementation-Vendor><![CDATA[Copyright (C) 2010 ${vendor}]]></Implementation-Vendor>\r
+                                                       <Implementation-Vendor><![CDATA[Copyright (C) 2010 ${email}]]></Implementation-Vendor>\r
                                                </manifestEntries>\r
                                        </archive>\r
                                </configuration>\r
                        </plugin>\r
-                       <plugin>\r
-                               <!-- 依存ライブラリをターゲットのlibフォルダ下にコピーする(package時) -->\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-dependency-plugin</artifactId>\r
-                               <version>2.10</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>copyLibs</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>copy-dependencies</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <outputDirectory>\r
-                                                               ${project.build.directory}/lib\r
-                                                       </outputDirectory>\r
-                                                       <includeScope>runtime</includeScope>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <!-- リソースコピープラグイン -->\r
-                               <artifactId>maven-resources-plugin</artifactId>\r
-                               <version>2.7</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>copy-resources</id>\r
-                                               <phase>validate</phase>\r
-                                               <goals>\r
-                                                       <goal>copy-resources</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <outputDirectory>${basedir}/target/conf</outputDirectory>\r
-                                                       <resources>\r
-                                                               <resource>\r
-                                                                       <directory>conf</directory>\r
-                                                                       <filtering>false</filtering>\r
-                                                               </resource>\r
-                                                       </resources>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>copy-ini-resources</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>copy-resources</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <outputDirectory>${basedir}/target</outputDirectory>\r
-                                                       <resources>\r
-                                                               <resource>\r
-                                                                       <directory>src/main/resources</directory>\r
-                                                                       <includes>\r
-                                                                               <include>*.l4j.ini</include>\r
-                                                                       </includes>\r
-                                                                       <filtering>false</filtering>\r
-                                                               </resource>\r
-                                                       </resources>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <!-- 生成したexe, jar, iniをdistフォルダにコピーする -->\r
-                               <artifactId>maven-resources-plugin</artifactId>\r
-                               <version>2.7</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>copy-resources</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>copy-resources</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <outputDirectory>${basedir}/dist</outputDirectory>\r
-                                                       <resources>\r
-                                                               <resource>\r
-                                                                       <directory>${basedir}/target</directory>\r
-                                                                       <includes>\r
-                                                                               <include>*.exe</include>\r
-                                                                               <include>*.jar</include>\r
-                                                                               <include>*.ini</include>\r
-                                                                       </includes>\r
-                                                                       <filtering>false</filtering>\r
-                                                               </resource>\r
-                                                       </resources>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
                </plugins>\r
        </build>\r
 \r
                                        <family>windows</family>\r
                                </os>\r
                        </activation>\r
+                       <properties>\r
+                               <jre.dir>${java.home}</jre.dir>\r
+                       </properties>\r
                        <build>\r
                                <plugins>\r
                                        <plugin>\r
                                                                                <maxHeapSize>128</maxHeapSize>\r
                                                                        </jre>\r
                                                                        <versionInfo>\r
-                                                                               <fileVersion>${exe_file_version}</fileVersion>\r
-                                                                               <txtFileVersion>${implements_version}</txtFileVersion>\r
+                                                                               <fileVersion>${project.version}</fileVersion>\r
+                                                                               <txtFileVersion>${project.version}</txtFileVersion>\r
                                                                                <fileDescription>${appname}</fileDescription>\r
-                                                                               <copyright>${vendor}</copyright>\r
-                                                                               <productVersion>${exe_file_version}</productVersion>\r
-                                                                               <txtProductVersion>${exe_file_version}</txtProductVersion>\r
+                                                                               <copyright>${maven.build.timestamp} ${email}</copyright>\r
+                                                                               <productVersion>${project.version}</productVersion>\r
+                                                                               <txtProductVersion>${project.version}</txtProductVersion>\r
                                                                                <productName>${appname}</productName>\r
                                                                                <internalName>${appname}</internalName>\r
                                                                                <originalFilename>${exename}</originalFilename>\r
                                                        </execution>\r
                                                </executions>\r
                                        </plugin>\r
+                                       <plugin>\r
+                                               <groupId>org.apache.maven.plugins</groupId>\r
+                                               <artifactId>maven-assembly-plugin</artifactId>\r
+                                               <version>2.6</version>\r
+                                               <executions>\r
+                                                       <execution>\r
+                                                               <!-- JREつきの配布用zipを生成する -->\r
+                                                               <id>create-distribution-with-jre</id>\r
+                                                               <phase>package</phase>\r
+                                                               <goals>\r
+                                                                       <goal>single</goal>\r
+                                                               </goals>\r
+                                                               <configuration>\r
+                                                                       <finalName>${appname}_${project.version}_with_JRE.zip</finalName>\r
+                                                                       <appendAssemblyId>false</appendAssemblyId>\r
+                                                                       <descriptors>\r
+                                                                               <descriptor>src/main/assembly/charactermanaj_with_jre_zip.xml</descriptor>\r
+                                                                       </descriptors>\r
+                                                               </configuration>\r
+                                                       </execution>\r
+                                                       <execution>\r
+                                                               <!-- JRE無しの配布用zipを生成する -->\r
+                                                               <id>create-distribution</id>\r
+                                                               <phase>package</phase>\r
+                                                               <goals>\r
+                                                                       <goal>single</goal>\r
+                                                               </goals>\r
+                                                               <configuration>\r
+                                                                       <finalName>${appname}_${project.version}.zip</finalName>\r
+                                                                       <appendAssemblyId>false</appendAssemblyId>\r
+                                                                       <descriptors>\r
+                                                                               <descriptor>src/main/assembly/charactermanaj_zip.xml</descriptor>\r
+                                                                       </descriptors>\r
+                                                               </configuration>\r
+                                                       </execution>\r
+                                               </executions>\r
+                                       </plugin>\r
                                </plugins>\r
                        </build>\r
                </profile>\r
 \r
                <profile>\r
+                       <!-- MAC OSXの場合のビルド -->\r
                        <id>osx-profile</id>\r
                        <activation>\r
                                <os>\r
                        <build>\r
                                <plugins>\r
                                        <plugin>\r
+                                               <!-- 生成されたjarをdistフォルダにコピーする-->\r
+                                               <artifactId>maven-resources-plugin</artifactId>\r
+                                               <version>2.7</version>\r
+                                               <executions>\r
+                                                       <execution>\r
+                                                               <id>copy-jar</id>\r
+                                                               <phase>package</phase>\r
+                                                               <goals>\r
+                                                                       <goal>copy-resources</goal>\r
+                                                               </goals>\r
+                                                               <configuration>\r
+                                                                       <outputDirectory>${basedir}/dist</outputDirectory>\r
+                                                                       <resources>\r
+                                                                               <resource>\r
+                                                                                       <directory>${basedir}/target</directory>\r
+                                                                                       <includes>\r
+                                                                                               <include>${project.artifactId}.jar</include>\r
+                                                                                       </includes>\r
+                                                                                       <filtering>false</filtering>\r
+                                                                               </resource>\r
+                                                                               <resource>\r
+                                                                                       <directory>src/main/attachment</directory>\r
+                                                                                       <includes>\r
+                                                                                               <include>charactermanaj.l4j.ini</include>\r
+                                                                                               <include>README_mac.txt</include>\r
+                                                                                       </includes>\r
+                                                                                       <filtering>false</filtering>\r
+                                                                               </resource>\r
+                                                                       </resources>\r
+                                                               </configuration>\r
+                                                       </execution>\r
+                                               </executions>\r
+                                       </plugin>\r
+                                       <plugin>\r
+                                               <!-- 配布用dmg作成のためのシェルの呼び出し -->\r
                                                <groupId>org.codehaus.mojo</groupId>\r
                                                <artifactId>exec-maven-plugin</artifactId>\r
                                                <version>1.6.0</version>\r
                                                <executions>\r
                                                        <execution>\r
-                                                               <id>Version Calculation</id>\r
+                                                               <id>make-dmg</id>\r
                                                                <phase>package</phase>\r
                                                                <goals>\r
                                                                        <goal>exec</goal>\r
                                                                <configuration>\r
                                                                        <executable>sh</executable>\r
                                                                        <workingDirectory>${basedir}/dist</workingDirectory>\r
-                                                                       <commandlineArgs>-c 'chmod +x *.sh;./build_all.sh'</commandlineArgs>\r
+                                                                       <commandlineArgs>-c 'export VERSION="${project.version}";chmod +x *.sh;./build_all.sh'</commandlineArgs>\r
                                                                </configuration>\r
                                                        </execution>\r
                                                </executions>\r