Skip to content

Commit

Permalink
Merge pull request #270 from jmock-developers/release-dev-ops
Browse files Browse the repository at this point in the history 
2.13.2-SNAPSHOT into master
  • Loading branch information
@olibye
olibye authored Mar 16, 2024
2 parents 87d54c1 + 787021e commit fa41d28
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 35 deletions.
2 changes: 1 addition & 1 deletion jmock-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion jmock-imposters-testdata/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
</parent>

<artifactId>jmock-imposters-testdata</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jmock-imposters-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
</parent>
<artifactId>jmock-imposters-tests</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion jmock-imposters/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
</parent>
<artifactId>jmock-imposters</artifactId>
<description>Class mocks are more numerous than interface mocks, so drop the legacy name</description>
Expand Down
2 changes: 1 addition & 1 deletion jmock-junit3/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
</parent>

<artifactId>jmock-junit3</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jmock-junit4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion jmock-junit5/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion jmock-legacy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion jmock/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>jMock 2 Parent</name>

Expand Down
91 changes: 66 additions & 25 deletions testjar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.13.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -46,33 +46,74 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<keyname>899FD4CB</keyname>
<homedir>${basedir}</homedir>
<passphrase>secret</passphrase>
<defaultKeyring>false</defaultKeyring>
<gpgArguments>
<gpgArgument>--pinentry-mode</gpgArgument>
<gpgArgument>loopback</gpgArgument>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

<profiles>
<profile>
<id>!release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<!-- use non secrets for testing -->
<keyname>70840C24899FD4CB</keyname>
<homedir>${basedir}</homedir>
<passphrase>secret</passphrase>
<defaultKeyring>false</defaultKeyring>
<gpgArguments>
<gpgArgument>--pinentry-mode</gpgArgument>
<gpgArgument>loopback</gpgArgument>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<!-- Easier to use real secrets in release profile -->
<configuration>
<useAgent>true</useAgent>
<keyname>${gpg.keyname}</keyname>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down

0 comments on commit fa41d28

Please sign in to comment.