Skip to content

Commit afb6903

Browse files
matreimatrei
authored
Merge pull request #12 from gpc/matrei/merge-4.0.x-into-5.0.x
Merge 4.0.x into 5.x.x
2 parents 5ed95eb + 4d4d650 commit afb6903

File tree

14 files changed

+329
-353
lines changed

14 files changed

+329
-353
lines changed

‎.github/workflows/build.yml

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,51 @@
1-
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
2-
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
3-
4-
name: Build
5-
1+
name: "Build"
62
on:
73
push:
8-
branches: [ master ]
4+
branches:
5+
- '5.x.x'
96
pull_request:
10-
branches: [ master ]
11-
7+
branches:
8+
- '5.x.x'
129
jobs:
13-
build:
14-
15-
runs-on: ubuntu-latest
16-
10+
test_project:
11+
name: "Test Project"
12+
runs-on: ubuntu-24.04
13+
if: github.event_name == 'pull_request'
1714
steps:
18-
- uses: actions/checkout@v2
19-
- name: Set up JDK 8
20-
uses: actions/setup-java@v2
15+
- name: "📥 Checkout repository"
16+
uses: actions/checkout@v4
17+
- name: "☕️ Setup JDK"
18+
uses: actions/setup-java@v4
2119
with:
22-
java-version: '8'
23-
distribution: 'adopt'
24-
cache: gradle
25-
- name: Grant execute permission for gradlew
26-
run: chmod +x gradlew
27-
- name: Build with Gradle
28-
run: ./gradlew build
20+
java-version: 8
21+
distribution: liberica
22+
- name: "🐘 Setup Gradle"
23+
uses: gradle/actions/setup-gradle@v4
24+
with:
25+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
26+
- name: "🏃 Run Tests"
27+
run: ./gradlew check --continue
28+
build_project:
29+
name: "Build Project and Publish Snapshot release"
30+
runs-on: ubuntu-20.04
31+
if: github.event_name == 'push'
32+
steps:
33+
- name: "📥 Checkout repository"
34+
uses: actions/checkout@v4
35+
- name: "☕️ Setup JDK"
36+
uses: actions/setup-java@v4
37+
with:
38+
java-version: 8,
39+
distribution: liberica
40+
- name: "🐘 Setup Gradle"
41+
uses: gradle/actions/setup-gradle@v4
42+
with:
43+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
44+
- name: "🔨 Build Project"
45+
run: ./gradlew build --continue
46+
- name: "📤 Publish Snapshot version to Artifactory (repo.grails.org)"
47+
if: success()
48+
env:
49+
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
50+
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
51+
run: ./gradlew publish

‎.github/workflows/release.yml

Lines changed: 40 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,43 @@
1-
name: Release
1+
name: "Release"
22
on:
3-
release:
4-
types: [ published ]
3+
release:
4+
types: [ published ]
5+
env:
6+
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
7+
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
58
jobs:
6-
release:
7-
runs-on: ubuntu-latest
9+
release:
10+
name: "Release"
11+
runs-on: ubuntu-24.04
12+
steps:
13+
- name: "📥 Checkout repository"
14+
uses: actions/checkout@v4
15+
- name: "☕️ Setup JDK"
16+
uses: actions/setup-java@v4
17+
with:
18+
java-version: 8
19+
distribution: liberica
20+
- name: "🐘 Setup Gradle"
21+
uses: gradle/actions/setup-gradle@v4
22+
with:
23+
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
24+
- name: "⚙ Run pre-release"
25+
uses: grails/github-actions/pre-release@main
26+
- name: "📤 Publish artifacts to Sonatype"
27+
id: publish_to_sonatype
828
env:
9-
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
10-
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
11-
steps:
12-
- name: Checkout repository
13-
uses: actions/checkout@v2
14-
with:
15-
token: ${{ secrets.GH_TOKEN }}
16-
- uses: gradle/wrapper-validation-action@v1
17-
- name: Set up JDK
18-
uses: actions/setup-java@v1
19-
with:
20-
java-version: 8
21-
- name: Get latest release version number
22-
id: get_version
23-
uses: battila7/get-version-action@v2
24-
- name: Run pre-release
25-
uses: micronaut-projects/github-actions/pre-release@master
26-
with:
27-
token: ${{ secrets.GITHUB_TOKEN }}
28-
- name: Publish to Sonatype OSSRH
29-
env:
30-
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
31-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
32-
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
33-
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
34-
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
35-
SECRING_FILE: ${{ secrets.SECRING_FILE }}
36-
RELEASE_VERSION: ${{ steps.get_version.outputs.version-without-v }}
37-
run: |
38-
echo "${SECRING_FILE}" | base64 -d > "${GITHUB_WORKSPACE}/secring.gpg"
39-
echo "Publishing Artifacts for $RELEASE_VERSION"
40-
(set -x; ./gradlew -Pversion="${RELEASE_VERSION}" -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon)
41-
- name: Bump patch version by one
42-
uses: actions-ecosystem/action-bump-semver@v1
43-
id: bump_semver
44-
with:
45-
current_version: ${{steps.get_version.outputs.version-without-v }}
46-
level: patch
47-
- name: Set version in gradle.properties
48-
env:
49-
NEXT_VERSION: ${{ steps.bump_semver.outputs.new_version }}
50-
run: |
51-
echo "Preparing next snapshot"
52-
./gradlew snapshotVersion -Pversion="${NEXT_VERSION}"
53-
- name: Commit & Push changes
54-
uses: actions-js/push@master
55-
with:
56-
github_token: ${{ secrets.GITHUB_TOKEN }}
57-
author_name: ${{ secrets.GIT_USER_NAME }}
58-
author_email: $${ secrets.GIT_USER_EMAIL }}
59-
message: 'Set version to next SNAPSHOT'
60-
- name: Check file documentation exists
61-
id: check_documentation
62-
uses: andstor/file-existence-action@v1
63-
with:
64-
files: "src/docs"
65-
- name: Build documentation
66-
if: steps.check_documentation.outputs.files_exists == 'true'
67-
env:
68-
RELEASE_VERSION: ${{ steps.get_version.outputs.version-without-v }}
69-
run: |
70-
./gradlew asciidoctor -Pversion="${RELEASE_VERSION}"
71-
- name: Export Gradle Properties
72-
uses: micronaut-projects/github-actions/export-gradle-properties@master
73-
- name: Publish to Github Pages
74-
if: steps.check_documentation.outputs.files_exists == 'true' && success()
75-
uses: micronaut-projects/github-pages-deploy-action@master
76-
env:
77-
BETA: ${{ steps.get_version.outputs.isPrerelase }}
78-
TARGET_REPOSITORY: ${{ github.repository }}
79-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
80-
BRANCH: gh-pages
81-
FOLDER: build/asciidoc
82-
DOC_FOLDER: latest
83-
COMMIT_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
84-
COMMIT_NAME: ${{ secrets.GIT_USER_NAME }}
85-
VERSION: ${{ steps.get_version.outputs.version-without-v }}
86-
- name: Run post-release
87-
if: success()
88-
uses: micronaut-projects/github-actions/post-release@master
89-
with:
90-
token: ${{ secrets.GITHUB_TOKEN }}
29+
SECRING_FILE: ${{ secrets.SECRING_FILE }}
30+
SIGNING_KEY: ${{ secrets.SIGNING_KEY_ID }}
31+
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
32+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
33+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
34+
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
35+
run: |
36+
echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
37+
./gradlew --no-build-cache \
38+
-Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg \
39+
publishToSonatype \
40+
closeAndReleaseSonatypeStagingRepository
41+
- name: "⚙️ Run post-release"
42+
if: steps.publish_to_sonatype.outcome == 'success'
43+
uses: grails/github-actions/post-release@main

‎.sdkmanrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
java=8.0.432-librca

‎.travis.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ database with Grails domain classes and sends them by a scheduled Quartz job. Ma
1111
the `sendAsynchronousMail` (or `sendMail`) method returning instantly, is not waiting for the mail to be actually sent. If
1212
the SMTP server isn't available, or other errors occur, the plugin can be set to retry later.
1313

14-
The plugin depends on the [quartz](https://plugins.grails.org/plugin/grails/quartz) and the [mail](https://plugins.grails.org/plugin/grails/mail) plugins. You also need a persistence provider plugin, [hibernate5](https://plugins.grails.org/plugin/grails/hibernate5) (or the appropriate version of hibernate for previous grails versions) and [mongodb](https://plugins.grails.org/plugin/grails/mongodb) are supported.
14+
The plugin depends on the [quartz](https://github.com/grails/grails-quartz) and the [mail](https://github.com/gpc/grails-mail) plugins. You also need a persistence provider plugin, [hibernate5](https://github.com/grails/gorm-hibernate5) (or the appropriate version of hibernate for previous grails versions) and [mongodb](https://github.com/grails/gorm-mongodb) are supported.
1515

1616
Links
1717
-----
@@ -167,6 +167,8 @@ You can report bugs on [GitHub](https://github.com/gpc/grails-asynchronous-mail/
167167
You also can ask questions in the [Grails Community Slack Channels](https://slack.grails.org/).
168168
Please enable logs and attach them to your issue.
169169

170+
Please review this project at [OpenHUB](https://www.openhub.net/p/grails-asynchronous-mail).
171+
170172
Contribution
171173
------------
172174

0 commit comments

Comments
 (0)