[maven-release-plugin] prepare for next development iteration

[importpicture/importpicture.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index dafe22e..4e88a16 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,21 +1,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>osm.surveyor</groupId>
-  <artifactId>AdjustTime</artifactId>
-  <version>5.3.8</version>
+  <artifactId>adjustgpx-core</artifactId>
+  <version>5.3.16-SNAPSHOT</version>
   <scm>
-    <connection>scm:git:http://surveyor.mydns.jp/gitbucket/git/yuu/AdjustTime.git</connection>
-    <url>http://surveyor.mydns.jp/gitbucket/yuu/AdjustTime/wiki</url>
-    <developerConnection>scm:git:http://surveyor.mydns.jp/gitbucket/git/yuu/AdjustTime.git</developerConnection>
-    <tag>v5.3.8</tag>
+    <connection>scm:git:http://surveyor.mydns.jp/gitbucket/git/yuu/adjustgpx-core.git</connection>
+    <url>http://surveyor.mydns.jp/gitbucket/yuu/adjustgpx-core/wiki</url>
+    <developerConnection>scm:git:http://surveyor.mydns.jp/gitbucket/git/yuu/adjustgpx-core.git</developerConnection>
+    <tag>v5.3.13</tag>
   </scm>
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>11</java.version>
+    <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <gpg.skip>true</gpg.skip>
+    <maven.javadoc.skip>true</maven.javadoc.skip>
   </properties>
   
   <!-- DEPLOY先の指定  mvn deploy -->
@@ -33,17 +34,6 @@
 
   <repositories>
     <repository>
-      <id>surveyor.mirror</id>
-      <name>Hayashi Repository</name>
-      <url>http://surveyor.mydns.jp/archiva/repository/mirror/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
       <id>surveyor.haya4</id>
       <name>Hayashi Repository</name>
       <url>http://surveyor.mydns.jp/archiva/repository/haya4/</url>
@@ -65,7 +55,6 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
-
   </repositories>
 
   <pluginRepositories>
@@ -172,13 +161,6 @@
       <type>jar</type>
     </dependency>
 
-    <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-javadoc-plugin -->
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-javadoc-plugin</artifactId>
-      <version>3.2.0</version>
-    </dependency>
-
   </dependencies>
   
   <build>
@@ -202,7 +184,7 @@
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
-             
+      
       <!-- mvn generate-test-resources:get -->
       <plugin>
         <groupId>com.googlecode.maven-download-plugin</groupId>
@@ -216,7 +198,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/data/Sony20170518.tar.gz</url>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/Sony20170518/5/Sony20170518-5.tar.gz</url>
               <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
@@ -228,7 +210,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/data/WiMiUS20170518.tar.gz</url>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/WiMiUS20170518/5/WiMiUS20170518-5.tar.gz</url>
               <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
@@ -240,7 +222,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>http://surveyor.mydns.jp/data/separate.tar.gz</url>
+              <url>http://surveyor.mydns.jp/archiva/repository/haya4/adjustgpx-data/separate/5/separate-5.tar.gz</url>
               <unpack>false</unpack>
               <outputDirectory>${project.build.directory}/test-classes/imgdata</outputDirectory>
             </configuration>
@@ -248,6 +230,19 @@
         </executions>
       </plugin>
       
+      <!-- mvn test -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <junitArtifactName>junit:junit</junitArtifactName>
+          <encoding>UTF-8</encoding>
+          <inputEncoding>UTF-8</inputEncoding>
+          <outputEncoding>UTF-8</outputEncoding>
+          <argLine>-Dfile.encoding=UTF-8</argLine>
+        </configuration>
+      </plugin>
+
       <!-- mvn release:prepare -->
       <!-- mvn release:perform -Dmaven.javadoc.skip -->
       <plugin>
@@ -259,22 +254,6 @@
           <tagNameFormat>v@{project.version}</tagNameFormat>
         </configuration>
       </plugin>
-
-      <!-- 対策 "[ERROR] Exit code: 1 - javadoc: エラー - ドキュメント化しようとしているコードではモジュールが使用されていますが、" -->
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.2.0</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-          <docencoding>UTF-8</docencoding>
-          <charset>UTF-8</charset>
-          <source>8</source>
-        </configuration>
-      </plugin>
-
     </plugins>
-    
-    
   </build>
-  
 </project>