Merge pull request #21 from swisspost/master

Merge master into develop
swisspost · Aug 18, 2023 · 878dba4 · 878dba4
2 parents 35bed33 + 492674c
commit 878dba4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -23,10 +23,19 @@ jobs:
       uses: joschi/setup-jdk@v2
       with:
         java-version: '8'
+        server-id: sonatype-nexus-staging # Value of the distributionManagement/repository/id field of the pom.xml
+        server-username: CI_DEPLOY_USERNAME # env variable for username in deploy
+        server-password: CI_DEPLOY_PASSWORD # env variable for token in deploy
+        gpg-private-key: ${{ secrets.CI_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+        gpg-passphrase: CI_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
     - name: Release
       if: ${{ !contains(github.event.head_commit.message, '[maven-release-plugin]') }}
       run: |
         echo "Preparing release ${RELEASE_VERSION}..."
-        mvn --settings settings.xml -B release:prepare -Pdo-release -DreleaseVersion=${RELEASE_VERSION} -DdevelopmentVersion=${DEVELOP_VERSION}
-        mvn --settings settings.xml release:perform -Pdo-release
+        mvn -B release:prepare -Pdo-release -DreleaseVersion=${RELEASE_VERSION} -DdevelopmentVersion=${DEVELOP_VERSION}
+        mvn release:perform -Pdo-release
+      env:
+        CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+        CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+        CI_GPG_PASSPHRASE: ${{ secrets.CI_GPG_PASSPHRASE }}
diff --git a/apikana-maven-plugin/pom.xml b/apikana-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.swisspush.apikana</groupId>
         <artifactId>apikana</artifactId>
-        <version>0.4.22-SNAPSHOT</version>
+        <version>0.4.23-SNAPSHOT</version>
     </parent>
 
     <groupId>org.swisspush.maven.plugins</groupId>

diff --git a/apikana-parent/pom.xml b/apikana-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.swisspush.apikana</groupId>
         <artifactId>apikana</artifactId>
-        <version>0.4.22-SNAPSHOT</version>
+        <version>0.4.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>apikana-parent</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.swisspush.apikana</groupId>
     <artifactId>apikana</artifactId>
-    <version>0.4.22-SNAPSHOT</version>
+    <version>0.4.23-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -209,6 +209,11 @@
                                 <configuration>
                                     <homedir>${session.executionRootDirectory}</homedir>
                                     <keyname>230584D7</keyname>
+                                    <!-- Prevent gpg from using pinentry programs -->
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
                                 </configuration>
                             </execution>
                         </executions>