Skip to content

Commit c87e522

Browse files
authored
Revert Gpg plugin changes (#3888)
1 parent 32b7219 commit c87e522

File tree

2 files changed

+31
-23
lines changed

2 files changed

+31
-23
lines changed

.github/workflows/java-unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# it's safe to remove the first line entirely.
2929
- name: Test Build Tools with Maven
3030
run: |
31-
mvn install -P github-actions -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true -B -V
31+
mvn install -P github-actions -DskipTests=true -Dmaven.javadoc.skip=true -B -V
3232
mvn -P github-actions test
3333
- name: Test Java API with Ant
3434
run: |

java/pom.xml

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -167,28 +167,6 @@
167167
<encoding>UTF-8</encoding>
168168
</configuration>
169169
</plugin>
170-
<plugin>
171-
<groupId>org.apache.maven.plugins</groupId>
172-
<artifactId>maven-gpg-plugin</artifactId>
173-
<version>3.1.0</version>
174-
<executions>
175-
<execution>
176-
<id>sign-artifacts</id>
177-
<phase>verify</phase>
178-
<goals>
179-
<goal>sign</goal>
180-
</goals>
181-
</execution>
182-
</executions>
183-
<configuration>
184-
<gpgArguments>
185-
<arg>--batch</arg>
186-
<arg>--yes</arg>
187-
<arg>--pinentry-mode</arg>
188-
<arg>loopback</arg>
189-
</gpgArguments>
190-
</configuration>
191-
</plugin>
192170
<plugin>
193171
<groupId>org.sonatype.central</groupId>
194172
<artifactId>central-publishing-maven-plugin</artifactId>
@@ -201,6 +179,36 @@
201179
</plugins>
202180
</build>
203181

182+
<profiles>
183+
<profile>
184+
<id>release-sign-artifacts</id>
185+
<activation>
186+
<property>
187+
<name>performRelease</name>
188+
<value>true</value>
189+
</property>
190+
</activation>
191+
<build>
192+
<plugins>
193+
<plugin>
194+
<groupId>org.apache.maven.plugins</groupId>
195+
<artifactId>maven-gpg-plugin</artifactId>
196+
<version>3.1.0</version>
197+
<executions>
198+
<execution>
199+
<id>sign-artifacts</id>
200+
<phase>verify</phase>
201+
<goals>
202+
<goal>sign</goal>
203+
</goals>
204+
</execution>
205+
</executions>
206+
</plugin>
207+
</plugins>
208+
</build>
209+
</profile>
210+
</profiles>
211+
204212
<!-- Until 08. Dec 2016, this pom worked with maven-release-plugin at 2.2.1
205213
and default SCM dependencies. On 11. Jan, 2017 that was no longer the
206214
case, presumably because the default SCM version changed (cannot find

0 commit comments

Comments
 (0)