From 5429c943182807cac46bb3dcf5db085578510e40 Mon Sep 17 00:00:00 2001
From: jufukuka <jufukuka@yahoo-corp.jp>
Date: Fri, 30 Apr 2021 15:39:22 +0900
Subject: [PATCH] Change circleci/config.yml

---
 .circleci/.maven.xml | 11 +++++++
 .circleci/config.yml | 56 +++++++++++++++++++++++++++------
 pom.xml              | 73 +++++++++++++++++++++++++++-----------------
 3 files changed, 103 insertions(+), 37 deletions(-)
 create mode 100644 .circleci/.maven.xml

diff --git a/.circleci/.maven.xml b/.circleci/.maven.xml
new file mode 100644
index 00000000..683c3036
--- /dev/null
+++ b/.circleci/.maven.xml
@@ -0,0 +1,11 @@
+<settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/SETTINGS/1.0.0" xsi:schemalocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <!-- Maven Central Deployment -->
+            <id>ossrh</id>
+            <username>${env.SONATYPE_USERNAME}</username>
+            <password>${env.SONATYPE_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
\ No newline at end of file
diff --git a/.circleci/config.yml b/.circleci/config.yml
index b6521e8f..e7dca458 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,9 @@
-version: 2
+version: 2.1
+
+orbs:
+  sonatype: sonatype-nexus-community/circleci-maven-release-orb@0.0.16
+  sonatype-dryrun: sonatype-nexus-community/circleci-maven-release-orb@0.0.16
+
 jobs:
   build:
     docker:
@@ -40,16 +45,10 @@ jobs:
       - run: mvn clean package
 
       # Save JUnit result.
-      - run:
-          name: Save test results
-          command: |
-            mkdir -p ~/junit/
-            find . -type f -regex "./src/.*/target/surefire-reports/.*xml" -exec cp {} ~/junit/ \;
-          when: always
       - store_test_results:
-          path: ~/junit
+          path: target/surefire-reports
       - store_artifacts:
-          path: ~/junit     
+          path: target/surefire-reports
 
       # run site
       - run: mvn site
@@ -60,3 +59,42 @@ jobs:
 
       - store_artifacts:
           path: ~/site
+
+custom_filters:
+  master_only: &master_only
+    filters:
+      branches:
+        only: master
+  master_ignore: &master_ignore
+    filters:
+      branches:
+        ignore: master
+
+workflows:
+  build-and-test:
+    jobs:
+      - build:
+          <<: *master_ignore
+  run-release:
+    jobs:
+      - build:
+          <<: *master_only
+      - sonatype-dryrun/run-maven-release:
+          <<: *master_only
+          requires:
+            - build
+          mvn-release-perform-command: |
+            mvn --batch-mode release:perform -DdryRun=true -s .circleci/.maven.xml
+          mvn-release-prepare-command: |
+            mvn --batch-mode release:prepare -DscmCommentPrefix="[skip ci][maven-release-plugin] " -DdryRun=true -s .circleci/.maven.xml
+          ssh-fingerprints: b2:fa:12:27:7a:f5:b8:39:85:90:05:6d:58:8e:24:32
+      - approve:
+          type: approval
+          <<: *master_only
+          requires:
+            - sonatype-dryrun/run-maven-release
+      - sonatype/run-maven-release:
+          <<: *master_only
+          requires:
+            - approve
+          ssh-fingerprints: b2:fa:12:27:7a:f5:b8:39:85:90:05:6d:58:8e:24:32
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 26bacd89..ed9bc221 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 
   <groupId>jp.co.yahoo.yosegi</groupId>
   <artifactId>yosegi</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Yosegi</name>
   <description>Yosegi package.</description>
@@ -213,32 +213,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ossrh</serverId>
-          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-          <autoReleaseAfterClose>true</autoReleaseAfterClose>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
@@ -247,7 +221,7 @@
           <excludes>
             <exclude>**/*.json</exclude>
             <exclude>.gitignore</exclude>
-            <exclude>.circleci/config.yml</exclude>
+            <exclude>.circleci/*</exclude>
             <exclude>.github/PULL_REQUEST_TEMPLATE.md</exclude>
           </excludes>
         </configuration>
@@ -306,6 +280,15 @@
           <propertyName>surefireArgLine</propertyName>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <releaseProfiles>gpg-sign</releaseProfiles>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -327,4 +310,38 @@
     </plugins>
   </reporting>
 
+  <profiles>
+    <profile>
+      <id>gpg-sign</id>
+      <!--
+      only sign during deploy phase
+      -->
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.5</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+                <configuration>
+                  <gpgArguments>
+                    <arg>--pinentry-mode</arg>
+                    <arg>loopback</arg>
+                  </gpgArguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
+      </properties>
+    </profile>
+  </profiles>
 </project>