1.206.6版リリース準備

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1e742c2..992c4b1 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,7 +4,7 @@
 JinCore 変更履歴
 
 
-1.206.5-SNAPSHOT (201X-XX-XX)
+1.206.6 (2012-06-20)
     ・Maven3対応。
     ・ninjin氏の連絡先を http://ninjinix.com へ変更。
 

diff --git a/pom.xml b/pom.xml
index fec9807..586ad20 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <groupId>jp.sourceforge.jindolf</groupId>
     <artifactId>jincore</artifactId>
 
-    <version>1.206.5-SNAPSHOT</version>
+    <version>1.206.6</version>
 
     <packaging>jar</packaging>
     <name>JinCore</name>
@@ -121,7 +121,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0.1</version>
+                <version>1.1</version>
                 <configuration>
                     <rules>
                         <requireMavenVersion>
@@ -137,7 +137,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>2.5</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -159,7 +159,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.5.1</version>
                 <configuration>
                     <source>1.5</source>  <!-- for NetBeans IDE -->
                     <target>1.5</target>
@@ -174,7 +174,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.4</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -187,7 +187,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>2.3</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/main/assembly/descriptor.xml</descriptor>
@@ -227,7 +227,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.12</version>
                 <configuration>
                     <skipTests>false</skipTests>
                     <enableAssertions>true</enableAssertions>
@@ -237,7 +237,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.1</version>
                 <configuration>
                     <generateReports>true</generateReports>
                     <locales>ja</locales>
@@ -249,14 +249,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9.1</version>
                 <!-- config from property value -->
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7.1</version>
                 <configuration>
                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
@@ -268,7 +268,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.3.3</version> <!-- 2.4.0 has BUG-->
                 <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
@@ -363,13 +363,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.8.1</version>
                 <configuration>
                     <skip>false</skip>
                     <notimestamp>true</notimestamp>
                     <quiet>true</quiet>
                     <show>protected</show>
-                    <stylesheet>maven</stylesheet>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -392,7 +391,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.12</version>
                 <configuration>
                     <showSuccess>false</showSuccess>
                 </configuration>
@@ -417,7 +416,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9.1</version>
                 <configuration>
                     <skip>false</skip>
                     <!-- config from property value -->
@@ -434,7 +433,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7.1</version>
                 <configuration>
                     <skip>false</skip>
                     <targetJdk>${maven.compiler.target}</targetJdk>
@@ -455,7 +454,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.3.3</version> <!-- 2.4.0 has BUG-->
                 <configuration>
                     <skip>false</skip>
                     <effort>Max</effort>

diff --git a/src/main/config/checks.xml b/src/main/config/checks.xml
index c21c580..cf55cf6 100644 (file)
--- a/src/main/config/checks.xml
+++ b/src/main/config/checks.xml
@@ -7,7 +7,7 @@
 <!--
     Checkstyle用チェック項目定義。
 
-    Checkstyle 5.3 以降向けに記述。
+    Checkstyle 5.5 以降向けに記述。
 
     [ http://checkstyle.sourceforge.net/ ]
 
@@ -167,6 +167,9 @@
         <module name="FallThrough" />
         <module name="MultipleStringLiterals" />
         <module name="MultipleVariableDeclarations" />
+        <module name="RequireThis">
+            <property name="checkMethods" value="false" />
+        </module>
         <module name="UnnecessaryParentheses" />
         <module name="OneStatementPerLine" />
 
@@ -369,10 +372,6 @@
         <module name="RegexpSinglelineJava" />
 -->
 
-<!-- バグ？
-        <module name="RequireThis" />
--->
-
 <!-- Obsolated
         <module name="TabCharacter" />
 -->

diff --git a/src/main/config/pmdrules.xml b/src/main/config/pmdrules.xml
index 65d196b..a77bfcc 100644 (file)
--- a/src/main/config/pmdrules.xml
+++ b/src/main/config/pmdrules.xml
@@ -3,7 +3,7 @@
 <!--
     PMD用ルールセット定義
 
-    PMD [ http://pmd.sourceforge.net/ ] 4.2.5 以降用に記述されています。
+    PMD [ http://pmd.sourceforge.net/ ] 4.3 以降用に記述されています。
 
     Copyright(c) 2010 olyutorskii
 -->
@@ -47,6 +47,7 @@
         <exclude name="DefaultPackage" />
         <exclude name="DataflowAnomalyAnalysis" />
         <exclude name="AvoidUsingShortType" />
+        <exclude name="AvoidLiteralsInIfCondition" />
     </rule>
 
     <rule ref="rulesets/coupling.xml" />