Skip to content

Commit

Permalink
Merge commit '96a4207a'
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverbye committed Jan 9, 2018
2 parents 030d4c3 + 96a4207 commit 0ff8243
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 90 deletions.
11 changes: 4 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ jdk:

env:
# Travis has slow VMs?
- blitzerThreads=1 blitzerActions=1 blitzerTimeout=1000

secure: "XBIyEF5RxH/zKjh0gle5ce/FRe9pP5b46LXKNOfwlau5QYvn8WXC41Sb6yYC8VW3vI9S930BnVGZONiDXsSWuylLezdu2g88nwJ2CsTxHU0Yg2GAzKwaorBQqyK/6w2foRRXtz69NJccfdIdPuDZSEhJtTKWSmMMQ7U65KH+zzQ="
secure: "SSlAKOg8QLEAkZX1ehy9c6FR5R6gMzLhc6u2Smq9tm8JsWVz4EtS6NnTQaosthrNEfLJwVVCfmOh2dzvYZfhtbKAUMdkox45tem4+LZfgkSaQAGjSvsC6geioa4Alo6AKyR8foc5Y7P34f9ujYSZHNyRG9F6E0Qq2zj/hzHhstU="

after_success:
- mvn deploy --settings settings.xml -DskipTests=true -B
global:
- blitzerThreads=1 blitzerActions=1 blitzerTimeout=1000
- secure: "XBIyEF5RxH/zKjh0gle5ce/FRe9pP5b46LXKNOfwlau5QYvn8WXC41Sb6yYC8VW3vI9S930BnVGZONiDXsSWuylLezdu2g88nwJ2CsTxHU0Yg2GAzKwaorBQqyK/6w2foRRXtz69NJccfdIdPuDZSEhJtTKWSmMMQ7U65KH+zzQ="
- secure: "SSlAKOg8QLEAkZX1ehy9c6FR5R6gMzLhc6u2Smq9tm8JsWVz4EtS6NnTQaosthrNEfLJwVVCfmOh2dzvYZfhtbKAUMdkox45tem4+LZfgkSaQAGjSvsC6geioa4Alo6AKyR8foc5Y7P34f9ujYSZHNyRG9F6E0Qq2zj/hzHhstU="
41 changes: 23 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<packaging>pom</packaging>
<name>jMock 2 Parent</name>

<!-- mvn versions:set -DoldVersion=2.8.3 -DnewVersion=2.8.4-SNAPSHOT -DgroupId=org.jmock -->
<!-- mvn versions:set -DoldVersion=2.8.3 -DnewVersion=2.8.4-SNAPSHOT
-DgroupId=org.jmock -->
<!-- find . -name pom.xml.versionsBackup -exec rm {} \; -->

<parent>
Expand Down Expand Up @@ -203,25 +204,29 @@
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.5</version>
<reportSets>
<reportSet>
<reports>
<report>dependency-updates-report</report>
<report>plugin-updates-report</report>
<report>property-updates-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.5</version>
<reportSets>
<reportSet>
<reports>
<report>dependency-updates-report</report>
<report>plugin-updates-report</report>
<report>property-updates-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>

<profiles>
Expand Down
1 change: 1 addition & 0 deletions settings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<settings>
<!-- http://central.sonatype.org/pages/apache-maven.html -->
<servers>
<server>
<!-- Maven Central Deployment -->
Expand Down
2 changes: 2 additions & 0 deletions testjar/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
random_seed
trustdb.gpg
*~
.gpg-v21-migrated
private-keys-v1.d
131 changes: 66 additions & 65 deletions testjar/pom.xml
Original file line number Diff line number Diff line change
@@ -1,73 +1,74 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<artifactId>jmock-testjar</artifactId>
<packaging>jar</packaging>
<name>jMock 2 Test Jar</name>
<description>Source for jar files used in jmock core tests</description>
<artifactId>jmock-testjar</artifactId>
<packaging>jar</packaging>
<name>jMock 2 Test Jar</name>
<description>Source for jar files used in jmock core tests</description>

<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.jmock</groupId>
<artifactId>jmock-parent</artifactId>
<version>2.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<build>
<finalName>signed</finalName>
<plugins>
<plugin>
<!-- Copy jar for unsigned tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.9</version>
<executions>
<execution>
<id>copy</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
<destFileName>unsigned.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<build>
<finalName>signed</finalName>
<plugins>
<plugin>
<!-- Copy jar for unsigned tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.9</version>
<executions>
<execution>
<id>copy</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
<destFileName>unsigned.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<keyname>899FD4CB</keyname>
<secretKeyring>${basedir}/secring.gpg</secretKeyring>
<publicKeyring>${basedir}/pubring.gpg</publicKeyring>
<passphrase>secret</passphrase>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<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>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</plugins>
</build>

</project>

0 comments on commit 0ff8243

Please sign in to comment.