Skip to content

Commit b930ab1

Browse files
committed
Merge branch 'main' of https://github.com/wiremock/wiremock-testcontainers-java into feature/simplify-ext-config
2 parents 1104494 + 78f7a42 commit b930ab1

41 files changed

Lines changed: 1601 additions & 308 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github:oleg-nenashev

.github/dependabot.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,9 @@ updates:
55
schedule:
66
interval: daily
77
time: "00:00"
8-
open-pull-requests-limit: 10
8+
open-pull-requests-limit: 10
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
labels: chore
12+
schedule:
13+
interval: "weekly"

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@ jobs:
3131
java-version: ${{ matrix.jdk }}
3232
distribution: 'temurin'
3333
cache: maven
34+
- name: Build with Gradle
35+
run: ./gradlew build
3436
- name: Build with Maven
3537
run: mvn -B package --file pom.xml

.github/workflows/release.yml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release to GitHub Packages
1+
name: Release
22

33
on:
44
workflow_dispatch:
@@ -21,6 +21,19 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323

24+
- name: Configure Git user
25+
run: |
26+
git config user.email "actions@github.com"
27+
git config user.name "GitHub Actions"
28+
29+
- id: install-secret-key
30+
name: Install gpg secret key
31+
run: |
32+
# Install gpg secret key
33+
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
34+
# Verify gpg secret key
35+
gpg --list-secret-keys --keyid-format LONG
36+
2437
- name: Setup Java
2538
uses: actions/setup-java@v3
2639
with:
@@ -29,20 +42,29 @@ jobs:
2942
distribution: 'temurin'
3043
cache: maven
3144

32-
- name: Configure Git user
33-
run: |
34-
git config user.email "actions@github.com"
35-
git config user.name "GitHub Actions"
36-
3745
- name: Set Release Version
3846
id: vars
3947
shell: bash
4048
run: |
4149
echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
42-
mvn -ntp -B versions:set -DnewVersion=${{ github.event.inputs.version }}-SNAPSHOT
50+
mvn -ntp --batch-mode versions:set -DnewVersion=${{ github.event.inputs.version }}
4351
git diff-index --quiet HEAD || git commit -m "Releasing version ${{ github.event.inputs.version }}" pom.xml
4452
4553
- name: Publish to GitHub Packages
46-
run: mvn -ntp -B release:prepare release:perform
54+
run: mvn -ntp --batch-mode -Dgpg.passphrase="${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}" clean deploy -Prelease
4755
env:
4856
GITHUB_TOKEN: ${{ github.token }}
57+
58+
- name: Set up Java for publishing to Maven Central
59+
uses: actions/setup-java@v3
60+
with:
61+
java-version: '11'
62+
distribution: 'temurin'
63+
server-id: ossrh
64+
server-username: MAVEN_USERNAME
65+
server-password: MAVEN_PASSWORD
66+
- name: Publish to the Maven Central
67+
run: mvn --batch-mode -Dgpg.passphrase="${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}" clean deploy -Prelease,mavencentral-release
68+
env:
69+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
70+
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### Gradle ###
2+
.gradle/
3+
build/
4+
15
### Maven ###
26
target/
37

CONTRIBUTING.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Contributing
2+
3+
This repository is implemented as a standard Maven project.
4+
All contributions are welcome!
5+
Just submit a pull request.
6+
7+
See [this page](https://wiremock.org/docs/participate/) for a generic WireMock Contributor Guide.
8+
9+
## Road towards 1.0
10+
11+
The next major and well overdue milestone is 1.0.
12+
The scope for this release is listed [here](https://github.com/wiremock/wiremock-testcontainers-java/milestone/1).
13+
Contributions are welcome!
14+
15+
## Good First Issues
16+
17+
There are some [good first issues](https://github.com/wiremock/wiremock-testcontainers-java/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) listed in the repository.
18+
19+
Apart from that, you can always create some new examples, demos and tests.
20+
There are many WireMock extensions and also many features that can be potentially added to the distribution.
21+
22+
## Maintainer Notes
23+
24+
### Releasing
25+
26+
The release is done automatically using the GitHub actions.
27+
Steps:
28+
29+
1. Run the release pipeline with a proper version
30+
2. Create the release notes for the release (Release Drafter is at your service)

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
same "printed page" as the copyright notice for easier
188188
identification within third-party archives.
189189

190-
Copyright [yyyy] [name of copyright owner]
190+
Copyright 2023 WireMock Inc., Oleg Nenashev and all project contributors
191191

192192
Licensed under the Apache License, Version 2.0 (the "License");
193193
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)