From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Tue, 26 Apr 2011 09:58:33 +0000 (+0900)
Subject: Maven3への対応準備。
X-Git-Tag: fromMercurial~88
X-Git-Url: http://git.osdn.net/view?p=jindolf%2FJindolf.git;a=commitdiff_plain;h=11d1bc73f00fbcc952aa8a93b6ffdf2977935a17

Maven3への対応準備。
Mavenリポジトリへのソースコード自動格納。
---

diff --git a/pom.xml b/pom.xml
index 9cd455e..935e10e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <mailingLists/>
 
     <prerequisites>
-        <maven>2.1</maven>
+        <maven>2.2</maven>
     </prerequisites>
 
     <modules/>
@@ -91,11 +91,19 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <project.myrepoconf>${project.basedir}/src/main/config</project.myrepoconf>
+
         <project.transformer>
             org.apache.maven.plugins.shade.resource.ManifestResourceTransformer
         </project.transformer>
         <project.mainentry>jp.sourceforge.jindolf.Jindolf</project.mainentry>
         <project.splash>jp/sourceforge/jindolf/resources/image/logo.png</project.splash>
+
+        <!-- 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/>
@@ -105,14 +113,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>[4,)</version>
+            <version>[4.8.2,)</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>jp.sourceforge.jindolf</groupId>
             <artifactId>jinparser</artifactId>
-            <version>1.407.2</version>
+            <version>1.407.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -129,6 +137,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
+                <version>2.4.1</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -146,6 +155,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
                 <configuration>
                     <source>1.5</source>  <!-- for NetBeans IDE -->
                     <target>1.5</target>
@@ -160,6 +170,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.1</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -174,6 +185,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>
@@ -184,6 +196,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>1.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -208,10 +221,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.5,)</version>
@@ -220,6 +234,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>
@@ -235,13 +272,13 @@
             <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>**/*.txt</include>
-                    <include>**/*.html</include>
-                    <include>**/*.css</include>
-                    <include>**/*.png</include>
                 </includes>
                 <excludes>
                     <exclude>**/version.properties</exclude>
@@ -253,33 +290,36 @@
     </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>
+                    <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.7</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>
 
@@ -299,7 +339,7 @@
             <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>
@@ -328,6 +368,7 @@
             </plugin>
 
         </plugins>
+
     </reporting>
 
     <profiles/>