X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=blobdiff_plain;f=pom.xml;h=4ef0c305ed2491d879487c8e7ec3ef91b3e9fe62;hp=b3dc8691f3606720fd1c9237f9804b2bc06fa4a4;hb=e28e393729f4614807c5bab69df8e7a7be6e94b1;hpb=95c0027d7370fe76457213598ad4160c43700ca0

diff --git a/pom.xml b/pom.xml
index b3dc869..4ef0c30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,11 +12,12 @@
   http://maven.apache.org/maven-v4_0_0.xsd"
 >
     <modelVersion>4.0.0</modelVersion>
+    <!--parent/-->
 
     <groupId>jp.sourceforge.mikutoga</groupId>
     <artifactId>togagem</artifactId>
 
-    <version>1.104.2</version>
+    <version>1.105.3-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>TogaGem</name>
@@ -31,7 +32,7 @@
 
     <organization>
         <name>MikuToga Partners</name>
-        <url>http://sourceforge.jp/projects/mikutoga/</url>
+        <url>http://sourceforge.jp/projects/mikutoga/devel/</url>
     </organization>
 
     <licenses>
@@ -59,7 +60,7 @@
     <mailingLists/>
 
     <prerequisites>
-        <maven>2.1</maven>
+        <maven>2.2</maven>
     </prerequisites>
 
     <modules/>
@@ -91,6 +92,13 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <project.myrepoconf>${project.basedir}/src/main/config</project.myrepoconf>
+
+        <!-- Walkaround for Maven3&PMD-plugin bug -->
+        <targetJdk>${maven.compiler.source}</targetJdk>
+
+        <!-- Walkaround for Maven3&checkstyle bug -->
+        <checkstyle.config.location>${project.myrepoconf}/checks.xml</checkstyle.config.location>
+
     </properties>
 
     <dependencyManagement/>
@@ -100,7 +108,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>[4,)</version>
+            <version>[4.8.2,)</version>
             <scope>test</scope>
         </dependency>
 
@@ -116,21 +124,8 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>  <!-- for NetBeans IDE -->
-                    <target>1.6</target>
-                    <showDeprecation>true</showDeprecation>
-                    <showWarnings>true</showWarnings>
-                    <compilerArguments>
-                        <Xlint/>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
+                <version>2.4.1</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -147,7 +142,23 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>  <!-- for NetBeans IDE -->
+                    <target>1.6</target>
+                    <showDeprecation>true</showDeprecation>
+                    <showWarnings>true</showWarnings>
+                    <compilerArguments>
+                        <Xlint/>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.1</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -160,6 +171,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2.1</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/main/assembly/descriptor.xml</descriptor>
@@ -170,10 +182,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.0</version>
                 <configuration>
                     <rules>
                         <requireMavenVersion>
-                            <version>[2.1,3)</version>
+                            <version>[2.2,3)</version>
                         </requireMavenVersion>
                         <requireJavaVersion>
                             <version>[1.6,)</version>
@@ -182,6 +195,29 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
+                <configuration>
+                    <includePom>true</includePom>
+                    <archive>
+                        <manifestEntries>
+                            <Built-By>${project.organization.name}</Built-By>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                          <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
 
         <resources>
@@ -197,7 +233,12 @@
             <resource>
                 <directory>src/main/resources</directory>
                 <includes>
+                    <include>**/*.css</include>
+                    <include>**/*.html</include>
+                    <include>**/*.png</include>
                     <include>**/*.properties</include>
+                    <include>**/*.txt</include>
+                    <include>**/*.xml</include>
                     <include>**/*.xsd</include>
                     <include>**/*.dtd</include>
                 </includes>
@@ -211,33 +252,38 @@
     </build>
 
     <reporting>
+
         <plugins>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.7</version>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>2.2</version>
                 <configuration>
-                    <show>protected</show>
+                    <locales>ja</locales>
+                    <generateReports>true</generateReports>
+                    <generateSitemap>true</generateSitemap>
+                    <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+                    <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
                 </configuration>
             </plugin>
 
             <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>2.1.1</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
                 <configuration>
-                    <locales>ja</locales>
-                    <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-                    <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
+                    <show>protected</show>
                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
                 <configuration>
-                    <configLocation>${project.myrepoconf}/checks.xml</configLocation>
+                    <configLocation>${checkstyle.config.location}</configLocation>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
 
@@ -246,26 +292,35 @@
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>2.5</version>
                 <configuration>
-                    <sourceEncoding>UTF-8</sourceEncoding>
-                    <targetJdk>1.6</targetJdk>
+                    <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
                         <ruleset>${project.myrepoconf}/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>pmd</report>
+                            <report>cpd</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
             </plugin>
 
+<!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>2.3.2</version>
                 <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
-                    <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+                    <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
                     <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
-                    <!--excludeFilterFile/-->
+                    <!- -excludeFilterFile/- ->
                 </configuration>
             </plugin>
+-->
 
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -286,8 +341,11 @@
             </plugin>
 
         </plugins>
+
     </reporting>
 
+    <profiles/>
+
 </project>
 
 <!-- EOF -->