Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.13.2-SNAPSHOT into master #270

Merged
merged 7 commits into from
Mar 16, 2024
Merged

2.13.2-SNAPSHOT into master #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fcb1a6
Update keyname for test (not)secret
Mar 16, 2024
befe8f6
Use real gpg secrets for testjar in release profile
Mar 16, 2024
2a3ce2a
Use real gpg secrets for testjar in release profile
Mar 16, 2024
24fc60b
Use real gpg secrets for testjar in release profile
Mar 16, 2024
f925f2f
release and !release profile
Mar 16, 2024
9281158
2.13.1
Mar 16, 2024
787021e
Open 2.13.2-SNAPSHOT for development
Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jmock-example/pom.xml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading