This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit db253bc052f9fbc178e16c6ece223b4ed629756d
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Mon Sep 26 09:05:54 2022 +0100

    ISIS-2965: consolidates gpg plugin config
---
 bom/pom.xml  | 18 ++++++++++++++++++
 core/pom.xml | 37 -------------------------------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 33259fd719..47d78d59ae 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -992,6 +992,24 @@ It is therefore a copy of org.apache:apache, with 
customisations clearly identif
             <build>
                 <plugins>
                     <!-- APACHE ISIS customisation 17/21: start -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-release-artifacts</id>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.projectlombok</groupId>
                         <artifactId>lombok-maven-plugin</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 2e9620f027..e42f3f546f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1495,43 +1495,6 @@
                        </build>
                </profile>
 
-               <profile>
-                       <!-- as per https://stackoverflow.com/a/28860520/56880 
allows -Dgpg.passphrase=
-                               to be used rather than gpg.useagent inherited 
from parent. Note that this
-                               requires gpg v2.1+ -->
-                       <id>gpg</id>
-                       <activation>
-                               <property>
-                                       <name>gpg.passphrase</name>
-                               </property>
-                       </activation>
-                       <properties>
-                               <gpg.useagent>false</gpg.useagent>
-                       </properties>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               
<groupId>org.apache.maven.plugins</groupId>
-                                               
<artifactId>maven-gpg-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               
<id>sign-release-artifacts</id>
-                                                               <goals>
-                                                                       
<goal>sign</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       
<gpgArguments>
-                                                                               
<arg>--pinentry-mode</arg>
-                                                                               
<arg>loopback</arg>
-                                                                       
</gpgArguments>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-
                <profile>
                        <id>datanucleusenhance</id>
                        <activation>

Reply via email to