diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..6c4938f --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,41 @@ +name-template: $RESOLVED_VERSION +tag-template: v$RESOLVED_VERSION +categories: + - title: ✨ Features + labels: + - "type: enhancement" + - "type: new feature" + - "type: major" + - title: 🐛 Bug Fixes/Improvements + labels: + - "type: improvement" + - "type: bug" + - "type: minor" + - title: 🛠 Dependency upgrades + labels: + - "type: dependency upgrade" + - "dependencies" + - title: ⚙️ Build/CI + labels: + - "type: ci" + - "type: build" +change-template: '- $TITLE @$AUTHOR (#$NUMBER)' +version-resolver: + major: + labels: + - 'type: major' + minor: + labels: + - 'type: minor' + patch: + labels: + - 'type: patch' + default: patch +template: | + ## What's Changed + + $CHANGES + + ## Contributors + + $CONTRIBUTORS diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..7c8c5d1 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,72 @@ +name: Grace CI +on: + push: + branches: + - 'release/5.2.4' + pull_request: + branches: + - 'release/5.2.4' + workflow_dispatch: +jobs: + build: + permissions: + contents: read # to fetch code (actions/checkout) + runs-on: ubuntu-22.04 + strategy: + matrix: + java: ['11'] + env: + WORKSPACE: ${{ github.workspace }} + steps: + - name: Checkout repository + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: actions/checkout@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: ${{ matrix.java }} + - name: Run Build + id: build + uses: gradle/gradle-build-action@v3 + with: + arguments: build -x test + publish: + if: github.event_name == 'push' + needs: ["build"] + permissions: + contents: read # to fetch code (actions/checkout) + checks: write + runs-on: ubuntu-22.04 + steps: + - name: Checkout repository + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: actions/checkout@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: 11 + - name: Generate secring file + env: + SECRING_FILE: ${{ secrets.SECRING_FILE }} + run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg + - name: Publish to Sonatype OSSRH + id: publish + uses: gradle/gradle-build-action@v3 + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }} + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} + SECRING_FILE: ${{ secrets.SECRING_FILE }} + with: + arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml new file mode 100644 index 0000000..4d6e7bc --- /dev/null +++ b/.github/workflows/release-notes.yml @@ -0,0 +1,29 @@ +name: Changelog +on: + issues: + types: [closed,reopened] + push: + branches: + - 5.2.x + workflow_dispatch: +jobs: + release_notes: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Check if it has release drafter config file + id: check_release_drafter + run: | + has_release_drafter=$([ -f .github/release-drafter.yml ] && echo "true" || echo "false") + echo ::set-output name=has_release_drafter::${has_release_drafter} + - name: Extract branch name + id: extract_branch + run: echo ::set-output name=value::${GITHUB_REF:11} + # If it has release drafter: + - uses: release-drafter/release-drafter@v6 + if: steps.check_release_drafter.outputs.has_release_drafter == 'true' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + commitish: ${{ steps.extract_branch.outputs.value }} + filter-by-commitish: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..ca97e36 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,73 @@ +name: Grace Release + +on: + push: + tags: + - v* + +permissions: + contents: write + +jobs: + create_draft_release: + runs-on: ubuntu-22.04 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Create draft release + run: | + gh release create \ + --repo ${{ github.repository }} \ + --title ${{ github.ref_name }} \ + --notes '' \ + --draft \ + ${{ github.ref_name }} + release_and_publish: + needs: create_draft_release + runs-on: ubuntu-22.04 + strategy: + matrix: + java: ['11'] + env: + GIT_USER_NAME: rainboyan + GIT_USER_EMAIL: rain@rainboyan.com + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - uses: gradle/wrapper-validation-action@v2 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: ${{ matrix.java }} + - name: Extract Target Branch + id: extract_branch + run: | + echo "Determining Target Branch" + TARGET_BRANCH=`cat $GITHUB_EVENT_PATH | jq '.release.target_commitish' | sed -e 's/^"\(.*\)"$/\1/g'` + echo $TARGET_BRANCH + echo ::set-output name=value::${TARGET_BRANCH} + - name: Set the current release version + id: release_version + run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT + - name: Generate secring file + id: secring + env: + SECRING_FILE: ${{ secrets.SECRING_FILE }} + run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg + - name: Publish to Sonatype OSSRH + id: publish + if: steps.secring.outcome == 'success' + uses: gradle/gradle-build-action@v3 + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }} + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} + SECRING_FILE: ${{ secrets.SECRING_FILE }} + with: + arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dedd2f2..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: groovy -jdk: -- oraclejdk8 -- openjdk11 -dist: trusty -env: - global: - - TERM=dumb - - MALLOC_ARENA_MAX=1 - - GRADLE_OPTS="-Xmx1024m -Xms256m -XX:MaxPermSize=372m -XX:+CMSClassUnloadingEnabled" - - GIT_NAME="Graeme Rocher" - - GIT_EMAIL="graeme.rocher@gmail.com" - - secure: gr+BVcVJ6wkFpBBNM0vn03V0AgcxJ+RbE8kHem5XR7jMwskVaPsrPnN1G2C6xzc+8SuA6uliSMH65gokSybTYEU8lWlgt87tsY+wQoufHhvi5YsKSfUMAXK8PdA+Yl9JOEz7UiyDdAq6lyu0AxrSO0IL+pORqBkzKyJ5p5jZoyjqW0fq3NkLKnXnJM5nsG6Vno2eKwvy8rGZTs2i/h2kPMtadsFImH0L7giDvxjXh+loz8rp5a7NSMs4fB5M07542dd5MEYXnZVCBkYW2f0YImk6ExeIRXvY64txczliX4EbIp6brTNvDeKoxvNKI/q1VEohFBmYK7Dw09k8xO+V2hpQaWV9eKSNr21PBoCM5HcQYoFjpFGWljwMXOnQIuU3GxqtBDOttZQBWxxo0aTkRJnOSXFplG+Fr9ZqYVlbEpGcUabpZjKq2ceFztiFJ00A/fdzh2jOpKpprmtItYF5waySwT9U0g+w1IvIFbn6yPamdY+oeCBIrZZnW5LaeR4OGjDo0wjXJF0Rf0ggaZj/MXt9bRlRzcwZ73igMoYkQdIKowX1Yht3dqrCprd/NjQOPE1GaGPkoXNIYRvdsELiDF1uQd6u6uNdocbSJWiqws6vmCrEx5P5ZeTSp/Moi4RJen6AWAjA8yPiqf2WcqMN/akozv+4iQrgQYtnyTKIpns= - - secure: ZA1tIW9mKj7tPuyaYv9Z3gLRTkETbxEgmmjFA5beTrN1H4zBukURFcLAeIwmpyfVsOzQEaDBs/SL5BhJULOCed44EazduDTU0CMeGjGKwcTiyInGlxfzzZ15GwBZel2DK4EKb8dXfFjbpfrqBYB+8j7Y37yDJ1lgrdzfHqOlx1iHwB8bgUibUrUX7fNc0K/XJObMxaWIiDIuxqTmdD4t6FKcSnyFTJmuxE7lpD9MJA4YhB9K73fKxCrRAm81lnTkrNO9gXtwns6VHLpiHYn48lpryekPfq7FER0ycJe2kwQhpC2M30kURTPC+oaGLjaT+RWrjw3e6x7yZR7wnsDKBXeslqcI2uNaeP1tjIQ50S01tvCqSsvO+P0aflGIcULbJGBesjQGVk5kTK89Nzcfns/EQVGkzk0UUIjVVGorVw6Ogfo1JwwVKWBk2V1/LO/J4pZqK6HmqBr8RRkEU3DDgi1tY+870zYDB8RokPTy0vmjRC1oijRWUpziqS9s0yWPKtglzqqD9EvuMPVpWYJl0q/uMo0kXyEc2go1U9/bI8/wFcR1KneLFGq3LNzP8QHGq1aOMAbg2V5m6+rCw2jjtcQlseKvPCfgdCD2E5JHxAo/M5SpXKi+g/WIxKM01d/i2xOTtCmCJVDbVFvayFM+6QF7nrufM2q8jl3LCQuRrUM= - - secure: onYM79ebWVScrglufxpWQZwaOFbfgnKs3HFDauHniLc10/8AQeqB962vmwtKFiivmCQwVOMMbeYEBgWsWVbZtUAiVlAjwUPL1uiljcDmHYo8LqaLnK+zezkvfDyhGodVAM+UOmjWj4jLb3D0shEmiufHe96cuwRi8aafU2Cot6cKssg3oN3mw7ob+Nr6JX9RDCrqa1UYF1yD7S52wWMNW/WnvhN3t9vhAhxpb05Zvmj6KjwxgxBicGEU8El+Pz6H1hDZ1xUXmGa9k7DitXLZEp4HCwcAC+CP588NSsGygS/icvjQ6QLc8h3zVjru+P3EVgr/HQXkSBc7uQ4JJ3Ob6ODPiWiuW6ViDr+/lNN2F8qsHkpOlzA/cZjBRG6HXsNoxcMABj31XbkAV/s0BmDLUYNKb4LJ5MLtFnBHX656UhxInaWLgM+1Q/PB+SIPRXx1St8cZU3qPAoMr9UN7nDGjfb2tcuB2BRGn4t6kHj2Sg3EYx+7OTB4X183t/99Ihvb6iBYvtzluwEzL8YiJCKTZMfHUSdx9cZYHyWhi3+HQekMhSaDw/uHG6HD/rrB4Ys2qa9yeCQ+cRR+GVnikH10z44V81R58HLFaIYym+WfiJAqhlb8rx4YFS5WsTjY03t/4I1OB0MxU2TzVyWHHAsW2laHsdRCwaYRBs28p2AZVz4= - - secure: J4aJW/bbPFmeiwqxNahyi2zp3xsQpT0KxpnLRT+jE/h8LAS8p5G7UiP2PGqIDJbcp5uBSS25kvfNSQq5fIAOeDBz9wZgaCu/CiPqU5ZMnFkbaGL38HBYU4Y2JXpjFXkVYi60XemUuWOkTUlPAkweC6Z2UJZAH9R3lpZSGh3QPl3ahDSymapaRfhcDeSUpTun2QcmViGuf2ZbMj492WbkhpEyDBlqVPjRmO5/Rc1hqkg9A7Vj5srRCydSSkvFi1GYESKiqV1BI5aIpScbe5Jh5gd3BCIaiQZ1GqE/elNaS9Y7Qc9qfYm+Yu7PwIJh8FaxIRQV5352im2A0ZE20AvK30yUI6jrjDIMo1hdog6AFs8/i8aCcdERoX8CK0s3qcfprM2jh6gJLoIsR8Rd/wttr7bcEOd8fvuLXxIZca18hs7+VMq78p1YXfYF/lWvEi8hlmazAyB3rohUgxTEI7Gj0OBNeg1SRrBQZ2cxKorpLCUMPdLECVGVta89hX1EbSEgSCU2KTxrkg9TSocqqluSgzOnOuYN8KXJXD7inWZ+1oPde0lZ2du0EdTxts1lnQqU3kbmw/i7NTRICb2rbhyMGHrO1fG+Ck1QMfTkaq0aKiTvuD37Edtj8QGchXezFxIvnwUTVaJyt7oUXczeUBozZ83q95FAGuy5EUdrXmPTmyE= - - secure: ApWT4MJsLy/39njQtCs2TFMgPcWzkpbb82mTgyk43BgIRsXeq5NtilhfAJlDiG8U9GUi2KSIR1jZ1ZUOtJx2Hi8VhYRT526aLdeCeKBh/nfe3iRVpwMvFXzI/Kzqzj92Ns5Cr7/+UWGzu/Ib/c+EqF5CAPBeIq2oohBsXX8k8kSu9cQ7kY5n3un066rAKEyhtxsAn8LulJ1vd3QLWy6h7pNaPqNRlfJ9tr5KBaZR0b9pk30y/86VMjVW8nZOpTRE63BTs1vfUwmhQarjDXQadWIB3DuKoeYBJnK/G/A9Xc9w8Mt8uc4FCKIDXxOZSGM6uznGU4Etqs8euUAPeBvHWghhRa96ox13kH5NNx+CX2mb1tkB8VdsI9b0/OWplM6iya7MBW311d/8mGwEwj/5HhvgYJ2mnulrVPWCnOHsR4Nend6ih1UqmC55hJNqYTP0olHUfVuVUU+8upGxpqBdF27qFcCoXBFeKPurQ1kXEZmzFKur/LhwijevpCzh58ICoWdcChgceI9tOIX0pXHZuI88vI3D/NiB0g52rMMVT5nbT+kLmLPZXHbLTbQuP5myiIJyolYiYI8x3mswX4hNN4QzOzVUu6C39bNEZkfWTFi+J+ODC2aU51i+DLKSvhzU6er9cQJJCSYlV0fw7S1d7w0cJQQwYw4nXfr0Y+MlPpA= - - secure: Ptger8KnUxhaw9oP4P0YJh/0c23rVROiyXTX6czj0wuZzdyGiYhLNXWM+ZQZXhgQLK2jTxuSjvGPv/UJ7RbWsh+voveoCijBO65MpZsFiRb8ymjHKbLvV993SKOwmU64NL1KezmVdjh+OpnugjSVzPZPCLHnkTlEieHcdYtN00DVKi9Sehu55wguhxfzQ4huWmxmbCfKcAKkJc15TOYQrUKQkxnZTUYcHuIFG9WBz6zOedMbBWbk0DcwDlg5Ou32yKjcUGzsskOKw4ndeDz79EDEZ+++hER21hM020ItR1QCmLnYv5fRIEwEPTbzlCd4iu83c6xgMzqlMnv81lIq7rXrBF2FbAn5Zb+T2xuIop/HH5xtzuPe965DuS9q5o8kYftk/eBbl7xuue+KkYl25XN2d9V6Fd3/uXB+vZxfcX21n2F0Hr16fRAz7wjcQ7NqIE0Tpq3YxOvTaubdjvWDo8VqOt8IuHtiKI8HPAHEMJxqsWSfeSyRVgwZu7YtshCTxqd2psimly0Pp+WfaFaR2upwFtZx1gviU/zgHINjxD29y/uEen90WRWnAZD0+Abx4YVWFbjh1zXglk9YIF5eFec6qV/4RMEBCjopw+bpbJubqKrHGT33bOEYdpVHhMLlO2AfLvYPWth48f3TWri6dKJFlSxmAbssNL7kCh+Ikj4= - - secure: UAeyzCb7LUneQOty+/HiB+TTK+Nd9GnIpknDcedOzxTa35iQcjFVCjmn054pYuVlvVa4JZQwDP0KHq63eCyMT4TmlAnL4uGjw/nXUne+6bpEJZVsHvW+SGfe3NaEWrKoogZtR5hGV5dgJWqL4Qr/eWojihdwncR85JeYjXSV/jPKm6P5ASleb93yS+vc7/1/0wDWxDzs0uhhroYX0iEnsCY8CGz+Kuk+Kfz1wL8dp3FFuEOf9/uPhCL+6qQb3XuHSHmyoz6vM9PZLEZxlwnrpA1+d2D65mQVVQR0LpnbBd/cQRFuh403bWYzdzxgRcvvo7WH41GZaiwTNQ2QPs5p0C1yF4YrEW+hL0VRbTvKv2fwaZcLfe3ND5H3BxEzExDXdJhuHV0XY2bxZeFNdjoRUuXsrU7PQfSlS2T/R+QWt0eaVKDs3PrCQL7FG7f6ZTi7HoSkumBJIDYG+R3GxUSFFdGt31YYI/Xg8wVwfnUtMHt+8BaOLMPx/ezNqJ6/I6D8xKT4ZltmQuo4klsV1q51OrjIFEWLt55WxUtNsCIsL4Cs+mS0ij4mzjUB+AJ6phY1iEa3UpxRx+B+xhtsUGhPG+HNdp4FMoBBmvH8vQCseikJvOWk/UtTi7FB1+k1eSCOytgf5kTum1B99LYDBa8kIZiYvUhZMYd3mGLQY2yDUJ4= - - secure: ANoqm7NLJFRHq1Z9//PrWD+8xrgeUleHFRhiMm3vGLNDQU/0T37vebHvGVPW2r1+r7a1RavnIyX7b07TQn712nti1bovdyAV8GWMRwoUwbeOyHr3HbtoTrLWW79W71DsvmeYLkLsNWVwyymBG2sugMB/HsimRJBOifoZWNkqbcbOnzUpjAUxG0e88u0WUHUshJEUqPDQCr2ShRqI1aFORrsetPGFuB+2nZShPYutgC2AnO2dlQ0oo1QyNKilarG1Br+tAI0B+eseym+5dAcD4gkTp2hAq/xJZOx810HYuTjGSqENJeUI6Wt4ZCzAYawcPRXbncgDQUpv9k5XapnTZlLF55/WjWoFOrbuGZQJE01EuWRT4rpMm4Tixlajr07Y2L4Ad7NIP82DczLKpg2qbYZdDhkJNvor4zzZD+SFIFVn2yYkwAh9NY05vPYjZeOx/kLMggzsHpYWVznO9YI7gMtawhP56WWvCibvanFx8QnJ0g4dX3sqz5N6x4Ed1jdMJEGI0N2t/nLdfKimVCFKm7sJQA3RVPwnVVIhDLMPEBBVJwzltTTdeQFxtopwk9Rm6b1La9lmzcw3XcQXXrDm8WZoH1+POSld7zswSLLT4vXGv6YBAsgDUEukyEZtRCk1cPpjpsC/8eOXVsULJsn4RNS8amjDOQBSW9S/d9ol3gU= - - secure: Mh7gfuKjZAXqcgzFjT0mRzTYdTUcbb4eVchV8r/TH7F49bo9LgQBzcnyOj+FNFfCsxiR+D6XTbrGZx12WVpYzOYLeoWs1tYjWk/Qwq2UHx8BlsYoEbUdsnC3almWsN6ej1IY4ldsRZpmZEomZObHud8dagMb6O6MTbD0SKw5StkVJnQbbvBlFmdrt/YH9Gq7zKdYl4tS57MZXe+9YbGvPj1HwfSiI7ty03et2q05geSQ4OseAwHgPvwmYwZg3fUECqa+xdk3pPwPWJNG5C24wtb+N4HHKj6k5JEPCTCs7yEdvZ8KO5fQ/3VvcapSGUlhkrpS96FsSlOHp8oZ8cdqzVxP3Ii4/k0I4efX98krrmfy2pAkqTGR4FtbZRGG5LnFQFIiKPX6ZD8N6u8VVI0H3ZhOnFQ3KLSxnTZ/jB/I8Ed6sqR1sEZeWu4qaG6tBSiHM4jab/cstrAteJUs/Ag/uviXPY09m9cfpF7EEOrYbYtACywVXI0UvRrFKDtxAbl3iDNLGxj9nmVsDC7Ok4xKDaepKDk4VP+2Mb04cnia86iOEjYOFfDR+hSuvtlS+5pg5dFFVGrSseMjRXv2Dif1ESVMSjAlPVGUd71dEsg4hPMwP02s/ossMJ67ADgujI90gNwQ5sYurOZbb8Im6GJNjSV9sDW35e+MjjSaS8PzMj8= - - secure: D/6j7NTKNnQl0sZBnSPF4fdJG/SbQPtUPbSDbzWvFI4l6xrs5tKSi59SBcqrSiTujDUn0feMiy+o+bQcU0LdVYZh+RtJoWivGajkuzIfsdS67uTBKZI9A9T8bI/fHaaGusi/RlrZ9FKqb9qhEHjICy6+WKFY839oC6x/mYcqO9j/+TqSUev5zfV5rWhxD1Beae9PfMTykmuaLWEeIfTBbZm3gCLU3iwTb/1u1LMIT/BTuU07KyddOYYRrYdcNRL26S+vbJqPFUbCYIxqB8yDwBZM2XYTwhtmCfVkdS9Vjmlsrm6o+EVAHo1I0lBQiD1zR9EJWcZx1rxzvqcejjq6bgW3/TORzZkShQhYEEHAwGvZltsBM1Khmt8z55v8g7xomPWC04kqqaSUfIu9XAy2m8uzt2IYOLNhT6yxU1f4PGECeX9nbCsWqHMIM1n7B9lH+PHtTWF0F1HNttDstXGoQtExHPYWWK+abv4oNBfBdt5oakN6yhNmthMa+X72SySMBc651mu31wT9M8961iO1irxWtit3dxSE0WwOm1sAuqRgn5x0tZJZlUFq2MQrb1jrn5SaBwaQLk3ZoAFKRfrDgIqYVIOfHyPt2dYhgvkaLXPdmJzzNARaRQWB4OFZGt5VPWPFtKp5EHYQg/EK2zg/SOWqWhjxQom5+omUxW2pF6I= - - secure: OFWMeD6q08mFt4kWoXmuSFay58lDc4oqQ5L32HfzFX0KubCcEeQ1/k1KM55CYqa/yY0gD1E/1kgo+Znt7nKjAoJRhaSHI2UOPO49MHLWzhFA0loG6IMiAgbNRiN+6ETkRgBfg4hRc2rcwWMcZgYcHVOA5kRn+8nqF1RCPjbVejZENQoofVLgxRlNOx5wGqfTblq6/yUwOt9zGPjl3ZwOidtBqEKrOvnBH92TGS+Y+iOTwvJMbHKwhQ4HrMqY32FAQAEaQbhIu2vSlrD+s+Q6yzKYo2GJOrscFsijBflhSAFqxkw2hTHSYGOP72BsDWAwsJW58C9nPP0ESQt/WMXbHMO+lpeDW0tSSENtWsuLw3Yyk3yd+tPrPaFJNDBcAIRvXK0KgvNv11lwq4Bs9/10X7G78BYPBzc3Lc/TakfIWtLDMQRWxPV38ZA+J5AtkR0QN/XuMR/wqDBnGjSX2dK9WSHrhgUu9mSr2Hn70gzBHpPLNHNJ4ly2kNZiaw3h7xd5nbMwQBdGfnBD4aSjqGZkhfEtkUsioNw0g+S0XHhclULZQuD0pioIDIRTtjtGJNkj4ZyN86dToLQocuQ1KkQv2kttQ4dqtZMuXpmKnxOQ+b2hsQjfs0nK1IAUupx+SMKpVYVctiTbPJWJdgvwF7ZYdNKQH6oFC3FvmBWbrQYl+Ao= - - secure: JqEwNrJg2+T6SK1CU0RiI8otGJanIo5LTcFh6RHXB4VXMex99x8XNR+CP0zDDS7R0P2C4MSyrxo2LXhOYG1QMPglPyxQp8HkzthiUs7PqBQiPwdJU4V78zw/8K3o120Yi+W9hj6f1JPJkE+EHEcRWFzmNNO/5+i1UaUBR3MFjGGo2YTyFfswPdslZYomeoLFM4uCGcrBf1YSmW8QFLlHcvN4VIenkOUWgim5+rzMu9YWil62J/fe5Ys99XIDglu3vKrL3YvmR6ulObGhYAgU96Amt3yf4nZYRfk6iiICyZOR5ztkP0TbMCuzxMsLMMP7sHxWseu31caJyyrG87u/6ycFDM13GTKeJwf+n5HHPZvP1TcyIO4BWcOdu8Y2J5M563Ueh1VkENdjcOZuWYZE4d81JkujQK2RXEh3oZbiQP74aVEP3In4GevJNALGNcEPXBsNHWakagAisEQo+2wtc9PodKxmtHUUMTh3UzrVVEITyL8lOuAglX5BzSfWAG+lgbdqfnxrCVk1qL4I6r0Lj3a8slnIjQA/v1CcJOqm/DvqLP3AbFyTXcVny60ACZOmvQ6n5kDCMtFqzUpXLahTqRpt/i30eg6cKJfpDtiRzZ/0uaIMuRzTzH20lcXPC7aWlsuYWoUSr/HFz//Dp3LmYqZhbk36UjFNV5mPWwFyD6o= - - secure: Ewv2e92YVVCVkYjLXcyxwPBnbRTirDqB4Mac8s3dAFgWFGZ0my9lJJ7ToynQCPbBhvuDsSfg5eP29rp6HDqBhso5KxyqoSKJ4JGRAGs9oHvh5UMRkKx9T6dR3DLB0LGc1ie1M57prZBdSStYoKFkDaZc5kk6kyRK2QX8pAVqyR5IG6Q2R+8+tH95abdiKQ78Si3hoVbsR5voUGhHK7CDn4Yc+OUHrjD3B8voUwbDSR1jDSAcsrY9fI4sCj4JfeuVPwQ/H4BrhX2nKQWUwh2F4FQ/nDxNbk4pSeBkyLx5yhIwCljQ7yDUvarJiLTnsyj7/cvMBKi9YtBUzzSziI/Z5HGNAvuqClM4vUPFiZk9qvRIIwyaH1r7Q8cV6WhZ8IZZCqaNSNVDIo/rurJVTRF1Jrn4F6Jpuxz9E2bhFt4chVAGsWMjdlcYMzao4TEV1Eg0d3pYh0Cct3dGrc0KYKtlphumy1JDBkBIt3A2JlK4sbm8gAA2vpxYNhTg7998LO0czyA6LqS+xZ2C7NxHbX59sq+7CgmBl9Lquf46b/d99BN9q+G18wrSmYtJueS4bLqjfkS9hhj3wPlBA25gBXI4J6b1U0ge6OciapmsCj4NZKCaMXcSGqhsKNFHZOe3PgeA35NBeXLeD9hwNXPqQHIY7Hniajp9Uuab3wgJ1MVKulE= -install: true -script: "./travis-build.sh" -before_cache: -- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock -- rm -fr $HOME/.gradle/caches/*/plugin-resolution/ -cache: - directories: - - "$HOME/.gradle/caches/" - - "$HOME/.gradle/wrapper/" diff --git a/build.gradle b/build.gradle index 531f2d1..6894ea3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,61 +1,136 @@ buildscript { repositories { - mavenLocal() + mavenCentral() maven { url "https://repo.grails.org/grails/core" } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } dependencies { - classpath "org.grails:grails-gradle-plugin:$grailsVersion" - classpath "org.grails:grails-docs:$grailsVersion" + classpath "io.github.gradle-nexus:publish-plugin:1.3.0" + classpath "org.graceframework:grace-gradle-plugin:$graceVersion" + classpath "org.gradle:test-retry-gradle-plugin:1.4.0" + classpath "io.spring.gradle:dependency-management-plugin:$springDependencyManagementPluginVersion" } } -repositories { - mavenLocal() - maven { url "https://repo.grails.org/grails/core" } -} -version project.projectVersion - ext { - commonBuild = 'https://raw.githubusercontent.com/rainboyan/grails-common-build/22.0.x' + isReleaseVersion = !project.projectVersion.endsWith('-SNAPSHOT') + graceVersion = project.graceVersion + userOrg = "graceframework" } -subprojects { - version project.projectVersion +version project.projectVersion + +apply plugin:'idea' - ext { - userOrg = "grails" - isGrailsPlugin = name.startsWith('grails-plugin') - isBuildSnapshot = version.toString().endsWith("-SNAPSHOT") +apply plugin: 'maven-publish' +apply plugin: "io.github.gradle-nexus.publish-plugin" + +nexusPublishing { + repositories { + sonatype { + def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : '' + def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : '' + def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : '' + nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") + snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + username = ossUser + password = ossPass + stagingProfileId = ossStagingProfileId + } } +} - if(isGrailsPlugin) { - group "org.grails.plugins" +subprojects { project-> + if (project.name.startsWith('grace-plugin')) { + group "org.graceframework.plugins" } else { - group "org.grails" + group "org.graceframework" } + version project.projectVersion - repositories { - mavenLocal() - maven { url "https://repo.grails.org/grails/core" } + if (project.name.startsWith('examples') || project.name.endsWith('docs')) { + return } - if (it.projectDir.path.endsWith("examples/${it.name}".toString())) { - apply plugin:"org.grails.grails-web" + apply plugin: 'eclipse' + apply plugin: 'idea' + apply plugin: 'java-library' + apply plugin: 'groovy' + apply plugin: 'maven-publish' + apply plugin: 'signing' + apply plugin: "org.gradle.test-retry" + apply plugin: "io.spring.dependency-management" + + if (project.name.startsWith('grace-plugin')) { + apply plugin: 'org.graceframework.grace-plugin' } - else if (isGrailsPlugin) { - apply from: resources.text.fromInsecureUri("${commonBuild}/common-plugin.gradle") + + sourceCompatibility = 11 + targetCompatibility = 11 + + repositories { + mavenCentral() + maven { url 'https://repo.gradle.org/gradle/libs-releases' } } - else { - apply from: resources.text.fromInsecureUri("${commonBuild}/common-project.gradle") + + dependencyManagement { + imports { + mavenBom "org.graceframework:grace-bom:$graceVersion" + } + applyMavenExclusions false } - dependencies { - compileOnly 'javax.annotation:javax.annotation-api:1.3.2' + apply from: '../publishing/mavenCentral.gradle' + + + if (project.name.startsWith('grace-')) { + + configurations { + documentation + } + + dependencies { + api "org.codehaus.groovy:groovy:$groovyVersion" + api "org.slf4j:slf4j-api:$slf4jVersion" + api "javax.inject:javax.inject:1" + api "javax.annotation:javax.annotation-api:1.3.2" + documentation "org.fusesource.jansi:jansi:$jansiVersion" + documentation "org.codehaus.groovy:groovy-dateutil:$groovyVersion" + documentation "info.picocli:picocli:4.6.3" + documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion" + + testImplementation "org.spockframework:spock-core:$spockVersion" + testImplementation "net.bytebuddy:byte-buddy:1.14.5" + testImplementation "org.objenesis:objenesis:3.2" + testImplementation "org.codehaus.groovy:groovy-test-junit5:${groovyVersion}" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2" + testImplementation "org.junit.platform:junit-platform-runner:1.8.2" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2" + } + + java { + withJavadocJar() + withSourcesJar() + } + + tasks.withType(Test) { + useJUnitPlatform() + testLogging { + showStandardStreams = true + exceptionFormat = 'full' + } + configure { + retry { + maxRetries = 2 + maxFailures = 20 + failOnPassedAfterRetry = true + } + } + } + + groovydoc.classpath = configurations.documentation } -} -apply from:"${commonBuild}/common-publishing.gradle" -apply from:"${commonBuild}/common-docs.gradle" +} diff --git a/examples/pubsub-demo/build.gradle b/examples/pubsub-demo/build.gradle index cff9f32..7c28f60 100644 --- a/examples/pubsub-demo/build.gradle +++ b/examples/pubsub-demo/build.gradle @@ -18,23 +18,23 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-web" implementation "org.springframework.boot:spring-boot-starter-tomcat" - implementation "org.grails:grails-boot" - implementation "org.grails:grails-core" - implementation "org.grails:grails-plugin-codecs" - implementation "org.grails:grails-plugin-controllers" - implementation "org.grails:grails-plugin-datasource" - implementation "org.grails:grails-plugin-databinding" - implementation "org.grails:grails-plugin-domain-class" - implementation "org.grails:grails-plugin-i18n" - implementation "org.grails:grails-plugin-interceptors" - implementation "org.grails:grails-plugin-rest" - implementation "org.grails:grails-plugin-services" - implementation "org.grails:grails-plugin-url-mappings" - implementation project(":grails-plugin-async") - runtimeOnly project(":grails-events-rxjava") -// runtimeOnly project(":grails-async-rxjava") - implementation "org.grails:grails-web-boot" - implementation "org.grails:grails-logging" + implementation "org.graceframework:grace-boot" + implementation "org.graceframework:grace-core" + implementation "org.graceframework:grace-plugin-codecs" + implementation "org.graceframework:grace-plugin-controllers" + implementation "org.graceframework:grace-plugin-datasource" + implementation "org.graceframework:grace-plugin-databinding" + implementation "org.graceframework:grace-plugin-domain-class" + implementation "org.graceframework:grace-plugin-i18n" + implementation "org.graceframework:grace-plugin-interceptors" + implementation "org.graceframework:grace-plugin-rest" + implementation "org.graceframework:grace-plugin-services" + implementation "org.graceframework:grace-plugin-url-mappings" + implementation project(":grace-plugin-async") + runtimeOnly project(":grace-events-rxjava") +// runtimeOnly project(":grace-async-rxjava") + implementation "org.graceframework:grace-web-boot" + implementation "org.graceframework:grace-logging" implementation "org.grails.plugins:cache", { exclude module:'asset-pipeline-grails' } @@ -43,14 +43,14 @@ dependencies { implementation "org.hibernate:hibernate-ehcache:$hibernateCoreVersion" implementation "org.grails.plugins:views-json" implementation "org.grails.plugins:views-json-templates" - console "org.grails:grails-console" + console "org.graceframework:grace-console" profile "org.grails.profiles:rest-api" runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" - testImplementation "org.grails:grails-plugin-testing" - testImplementation "org.grails:grails-gorm-testing-support" - testImplementation "org.grails:grails-web-testing-support" + testImplementation "org.graceframework:grace-plugin-testing" + testImplementation "org.graceframework:grace-gorm-testing-support" + testImplementation "org.graceframework:grace-web-testing-support" testImplementation "io.micronaut:micronaut-http-client:$micronautVersion" } diff --git a/grails-async-gpars/build.gradle b/grace-async-gpars/build.gradle similarity index 86% rename from grails-async-gpars/build.gradle rename to grace-async-gpars/build.gradle index be25f24..cd36736 100644 --- a/grails-async-gpars/build.gradle +++ b/grace-async-gpars/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(":grails-async") + api project(":grace-async") implementation 'org.codehaus.gpars:gpars:1.2.1', { exclude group:'org.multiverse', module:'multiverse-core' exclude group:'org.codehaus.groovy', module: 'groovy-all' diff --git a/grails-async-gpars/src/main/groovy/org/grails/async/factory/gpars/GparsPromise.groovy b/grace-async-gpars/src/main/groovy/org/grails/async/factory/gpars/GparsPromise.groovy similarity index 100% rename from grails-async-gpars/src/main/groovy/org/grails/async/factory/gpars/GparsPromise.groovy rename to grace-async-gpars/src/main/groovy/org/grails/async/factory/gpars/GparsPromise.groovy diff --git a/grails-async-gpars/src/main/groovy/org/grails/async/factory/gpars/GparsPromiseFactory.groovy b/grace-async-gpars/src/main/groovy/org/grails/async/factory/gpars/GparsPromiseFactory.groovy similarity index 100% rename from grails-async-gpars/src/main/groovy/org/grails/async/factory/gpars/GparsPromiseFactory.groovy rename to grace-async-gpars/src/main/groovy/org/grails/async/factory/gpars/GparsPromiseFactory.groovy diff --git a/grails-async-gpars/src/main/groovy/org/grails/async/factory/gpars/LoggingPoolFactory.groovy b/grace-async-gpars/src/main/groovy/org/grails/async/factory/gpars/LoggingPoolFactory.groovy similarity index 100% rename from grails-async-gpars/src/main/groovy/org/grails/async/factory/gpars/LoggingPoolFactory.groovy rename to grace-async-gpars/src/main/groovy/org/grails/async/factory/gpars/LoggingPoolFactory.groovy diff --git a/grails-async-gpars/src/main/resources/META-INF/services/grails.async.PromiseFactory b/grace-async-gpars/src/main/resources/META-INF/services/grails.async.PromiseFactory similarity index 100% rename from grails-async-gpars/src/main/resources/META-INF/services/grails.async.PromiseFactory rename to grace-async-gpars/src/main/resources/META-INF/services/grails.async.PromiseFactory diff --git a/grails-async-gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy b/grace-async-gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy similarity index 100% rename from grails-async-gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy rename to grace-async-gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy diff --git a/grails-async-rxjava/build.gradle b/grace-async-rxjava/build.gradle similarity index 69% rename from grails-async-rxjava/build.gradle rename to grace-async-rxjava/build.gradle index e96a6ba..f93673d 100644 --- a/grails-async-rxjava/build.gradle +++ b/grace-async-rxjava/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(":grails-async") + api project(":grace-async") implementation "io.reactivex:rxjava:$rxJavaVersion" } diff --git a/grails-async-rxjava/src/main/groovy/org/grails/async/factory/rxjava/RxPromise.groovy b/grace-async-rxjava/src/main/groovy/org/grails/async/factory/rxjava/RxPromise.groovy similarity index 100% rename from grails-async-rxjava/src/main/groovy/org/grails/async/factory/rxjava/RxPromise.groovy rename to grace-async-rxjava/src/main/groovy/org/grails/async/factory/rxjava/RxPromise.groovy diff --git a/grails-async-rxjava/src/main/groovy/org/grails/async/factory/rxjava/RxPromiseFactory.groovy b/grace-async-rxjava/src/main/groovy/org/grails/async/factory/rxjava/RxPromiseFactory.groovy similarity index 100% rename from grails-async-rxjava/src/main/groovy/org/grails/async/factory/rxjava/RxPromiseFactory.groovy rename to grace-async-rxjava/src/main/groovy/org/grails/async/factory/rxjava/RxPromiseFactory.groovy diff --git a/grails-async-rxjava/src/main/resources/META-INF/services/grails.async.PromiseFactory b/grace-async-rxjava/src/main/resources/META-INF/services/grails.async.PromiseFactory similarity index 100% rename from grails-async-rxjava/src/main/resources/META-INF/services/grails.async.PromiseFactory rename to grace-async-rxjava/src/main/resources/META-INF/services/grails.async.PromiseFactory diff --git a/grails-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseListSpec.groovy b/grace-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseListSpec.groovy similarity index 100% rename from grails-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseListSpec.groovy rename to grace-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseListSpec.groovy diff --git a/grails-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseMapSpec.groovy b/grace-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseMapSpec.groovy similarity index 100% rename from grails-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseMapSpec.groovy rename to grace-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseMapSpec.groovy diff --git a/grails-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy b/grace-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy similarity index 100% rename from grails-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy rename to grace-async-rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy diff --git a/grails-async-rxjava2/build.gradle b/grace-async-rxjava2/build.gradle similarity index 71% rename from grails-async-rxjava2/build.gradle rename to grace-async-rxjava2/build.gradle index 07bffb5..e4dd4fb 100644 --- a/grails-async-rxjava2/build.gradle +++ b/grace-async-rxjava2/build.gradle @@ -1,4 +1,4 @@ dependencies { - api project(":grails-async") + api project(":grace-async") implementation "io.reactivex.rxjava2:rxjava:$rxJava2Version" } \ No newline at end of file diff --git a/grails-async-rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromise.groovy b/grace-async-rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromise.groovy similarity index 100% rename from grails-async-rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromise.groovy rename to grace-async-rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromise.groovy diff --git a/grails-async-rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromiseFactory.groovy b/grace-async-rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromiseFactory.groovy similarity index 100% rename from grails-async-rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromiseFactory.groovy rename to grace-async-rxjava2/src/main/groovy/org/grails/async/factory/rxjava2/RxPromiseFactory.groovy diff --git a/grails-async-rxjava2/src/main/resources/META-INF/services/grails.async.PromiseFactory b/grace-async-rxjava2/src/main/resources/META-INF/services/grails.async.PromiseFactory similarity index 100% rename from grails-async-rxjava2/src/main/resources/META-INF/services/grails.async.PromiseFactory rename to grace-async-rxjava2/src/main/resources/META-INF/services/grails.async.PromiseFactory diff --git a/grails-async-rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseListSpec.groovy b/grace-async-rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseListSpec.groovy similarity index 100% rename from grails-async-rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseListSpec.groovy rename to grace-async-rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseListSpec.groovy diff --git a/grails-async-rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy b/grace-async-rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy similarity index 100% rename from grails-async-rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy rename to grace-async-rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy diff --git a/grails-async-rxjava3/build.gradle b/grace-async-rxjava3/build.gradle similarity index 71% rename from grails-async-rxjava3/build.gradle rename to grace-async-rxjava3/build.gradle index 2e5519c..7ea41ba 100644 --- a/grails-async-rxjava3/build.gradle +++ b/grace-async-rxjava3/build.gradle @@ -1,4 +1,4 @@ dependencies { - api project(":grails-async") + api project(":grace-async") implementation "io.reactivex.rxjava3:rxjava:$rxJava3Version" } \ No newline at end of file diff --git a/grails-async-rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromise.groovy b/grace-async-rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromise.groovy similarity index 100% rename from grails-async-rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromise.groovy rename to grace-async-rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromise.groovy diff --git a/grails-async-rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromiseFactory.groovy b/grace-async-rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromiseFactory.groovy similarity index 100% rename from grails-async-rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromiseFactory.groovy rename to grace-async-rxjava3/src/main/groovy/org/grails/async/factory/rxjava3/RxPromiseFactory.groovy diff --git a/grails-async-rxjava3/src/main/resources/META-INF/services/grails.async.PromiseFactory b/grace-async-rxjava3/src/main/resources/META-INF/services/grails.async.PromiseFactory similarity index 100% rename from grails-async-rxjava3/src/main/resources/META-INF/services/grails.async.PromiseFactory rename to grace-async-rxjava3/src/main/resources/META-INF/services/grails.async.PromiseFactory diff --git a/grails-async-rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseListSpec.groovy b/grace-async-rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseListSpec.groovy similarity index 100% rename from grails-async-rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseListSpec.groovy rename to grace-async-rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseListSpec.groovy diff --git a/grails-async-rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy b/grace-async-rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy similarity index 100% rename from grails-async-rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy rename to grace-async-rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy diff --git a/grails-async/README.md b/grace-async/README.md similarity index 100% rename from grails-async/README.md rename to grace-async/README.md diff --git a/grails-async/src/main/groovy/grails/async/DelegateAsync.groovy b/grace-async/src/main/groovy/grails/async/DelegateAsync.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/DelegateAsync.groovy rename to grace-async/src/main/groovy/grails/async/DelegateAsync.groovy diff --git a/grails-async/src/main/groovy/grails/async/Promise.groovy b/grace-async/src/main/groovy/grails/async/Promise.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/Promise.groovy rename to grace-async/src/main/groovy/grails/async/Promise.groovy diff --git a/grails-async/src/main/groovy/grails/async/PromiseFactory.groovy b/grace-async/src/main/groovy/grails/async/PromiseFactory.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/PromiseFactory.groovy rename to grace-async/src/main/groovy/grails/async/PromiseFactory.groovy diff --git a/grails-async/src/main/groovy/grails/async/PromiseList.groovy b/grace-async/src/main/groovy/grails/async/PromiseList.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/PromiseList.groovy rename to grace-async/src/main/groovy/grails/async/PromiseList.groovy diff --git a/grails-async/src/main/groovy/grails/async/PromiseMap.groovy b/grace-async/src/main/groovy/grails/async/PromiseMap.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/PromiseMap.groovy rename to grace-async/src/main/groovy/grails/async/PromiseMap.groovy diff --git a/grails-async/src/main/groovy/grails/async/Promises.groovy b/grace-async/src/main/groovy/grails/async/Promises.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/Promises.groovy rename to grace-async/src/main/groovy/grails/async/Promises.groovy diff --git a/grails-async/src/main/groovy/grails/async/decorator/PromiseDecorator.groovy b/grace-async/src/main/groovy/grails/async/decorator/PromiseDecorator.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/decorator/PromiseDecorator.groovy rename to grace-async/src/main/groovy/grails/async/decorator/PromiseDecorator.groovy diff --git a/grails-async/src/main/groovy/grails/async/decorator/PromiseDecoratorLookupStrategy.groovy b/grace-async/src/main/groovy/grails/async/decorator/PromiseDecoratorLookupStrategy.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/decorator/PromiseDecoratorLookupStrategy.groovy rename to grace-async/src/main/groovy/grails/async/decorator/PromiseDecoratorLookupStrategy.groovy diff --git a/grails-async/src/main/groovy/grails/async/decorator/PromiseDecoratorProvider.groovy b/grace-async/src/main/groovy/grails/async/decorator/PromiseDecoratorProvider.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/decorator/PromiseDecoratorProvider.groovy rename to grace-async/src/main/groovy/grails/async/decorator/PromiseDecoratorProvider.groovy diff --git a/grails-async/src/main/groovy/grails/async/factory/AbstractPromiseFactory.groovy b/grace-async/src/main/groovy/grails/async/factory/AbstractPromiseFactory.groovy similarity index 100% rename from grails-async/src/main/groovy/grails/async/factory/AbstractPromiseFactory.groovy rename to grace-async/src/main/groovy/grails/async/factory/AbstractPromiseFactory.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/factory/BoundPromise.groovy b/grace-async/src/main/groovy/org/grails/async/factory/BoundPromise.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/factory/BoundPromise.groovy rename to grace-async/src/main/groovy/org/grails/async/factory/BoundPromise.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/factory/PromiseFactoryBuilder.groovy b/grace-async/src/main/groovy/org/grails/async/factory/PromiseFactoryBuilder.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/factory/PromiseFactoryBuilder.groovy rename to grace-async/src/main/groovy/org/grails/async/factory/PromiseFactoryBuilder.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/factory/SynchronousPromise.groovy b/grace-async/src/main/groovy/org/grails/async/factory/SynchronousPromise.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/factory/SynchronousPromise.groovy rename to grace-async/src/main/groovy/org/grails/async/factory/SynchronousPromise.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/factory/SynchronousPromiseFactory.groovy b/grace-async/src/main/groovy/org/grails/async/factory/SynchronousPromiseFactory.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/factory/SynchronousPromiseFactory.groovy rename to grace-async/src/main/groovy/org/grails/async/factory/SynchronousPromiseFactory.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/factory/future/CachedThreadPoolPromiseFactory.groovy b/grace-async/src/main/groovy/org/grails/async/factory/future/CachedThreadPoolPromiseFactory.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/factory/future/CachedThreadPoolPromiseFactory.groovy rename to grace-async/src/main/groovy/org/grails/async/factory/future/CachedThreadPoolPromiseFactory.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/factory/future/ExecutorPromiseFactory.groovy b/grace-async/src/main/groovy/org/grails/async/factory/future/ExecutorPromiseFactory.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/factory/future/ExecutorPromiseFactory.groovy rename to grace-async/src/main/groovy/org/grails/async/factory/future/ExecutorPromiseFactory.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/factory/future/FutureTaskChildPromise.groovy b/grace-async/src/main/groovy/org/grails/async/factory/future/FutureTaskChildPromise.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/factory/future/FutureTaskChildPromise.groovy rename to grace-async/src/main/groovy/org/grails/async/factory/future/FutureTaskChildPromise.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/factory/future/FutureTaskPromise.groovy b/grace-async/src/main/groovy/org/grails/async/factory/future/FutureTaskPromise.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/factory/future/FutureTaskPromise.groovy rename to grace-async/src/main/groovy/org/grails/async/factory/future/FutureTaskPromise.groovy diff --git a/grails-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncTransactionalMethodTransformer.java b/grace-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncTransactionalMethodTransformer.java similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncTransactionalMethodTransformer.java rename to grace-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncTransactionalMethodTransformer.java diff --git a/grails-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncTransformation.java b/grace-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncTransformation.java similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncTransformation.java rename to grace-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncTransformation.java diff --git a/grails-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncUtils.groovy b/grace-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncUtils.groovy similarity index 100% rename from grails-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncUtils.groovy rename to grace-async/src/main/groovy/org/grails/async/transform/internal/DelegateAsyncUtils.groovy diff --git a/grails-async/src/test/groovy/grails/async/DelegateAsyncSpec.groovy b/grace-async/src/test/groovy/grails/async/DelegateAsyncSpec.groovy similarity index 100% rename from grails-async/src/test/groovy/grails/async/DelegateAsyncSpec.groovy rename to grace-async/src/test/groovy/grails/async/DelegateAsyncSpec.groovy diff --git a/grails-async/src/test/groovy/grails/async/FutureTaskPromiseFactorySpec.groovy b/grace-async/src/test/groovy/grails/async/FutureTaskPromiseFactorySpec.groovy similarity index 100% rename from grails-async/src/test/groovy/grails/async/FutureTaskPromiseFactorySpec.groovy rename to grace-async/src/test/groovy/grails/async/FutureTaskPromiseFactorySpec.groovy diff --git a/grails-async/src/test/groovy/grails/async/PromiseListSpec.groovy b/grace-async/src/test/groovy/grails/async/PromiseListSpec.groovy similarity index 100% rename from grails-async/src/test/groovy/grails/async/PromiseListSpec.groovy rename to grace-async/src/test/groovy/grails/async/PromiseListSpec.groovy diff --git a/grails-async/src/test/groovy/grails/async/PromiseMapSpec.groovy b/grace-async/src/test/groovy/grails/async/PromiseMapSpec.groovy similarity index 100% rename from grails-async/src/test/groovy/grails/async/PromiseMapSpec.groovy rename to grace-async/src/test/groovy/grails/async/PromiseMapSpec.groovy diff --git a/grails-async/src/test/groovy/grails/async/PromiseSpec.groovy b/grace-async/src/test/groovy/grails/async/PromiseSpec.groovy similarity index 100% rename from grails-async/src/test/groovy/grails/async/PromiseSpec.groovy rename to grace-async/src/test/groovy/grails/async/PromiseSpec.groovy diff --git a/grails-async/src/test/groovy/grails/async/SynchronousPromiseFactorySpec.groovy b/grace-async/src/test/groovy/grails/async/SynchronousPromiseFactorySpec.groovy similarity index 100% rename from grails-async/src/test/groovy/grails/async/SynchronousPromiseFactorySpec.groovy rename to grace-async/src/test/groovy/grails/async/SynchronousPromiseFactorySpec.groovy diff --git a/grails-events-compat/README.md b/grace-events-compat/README.md similarity index 100% rename from grails-events-compat/README.md rename to grace-events-compat/README.md diff --git a/grace-events-compat/build.gradle b/grace-events-compat/build.gradle new file mode 100644 index 0000000..dcda08b --- /dev/null +++ b/grace-events-compat/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(":grace-events"), project(":grace-events-transform") +} \ No newline at end of file diff --git a/grails-events-compat/src/main/groovy/grails/artefact/Service.groovy b/grace-events-compat/src/main/groovy/grails/artefact/Service.groovy similarity index 100% rename from grails-events-compat/src/main/groovy/grails/artefact/Service.groovy rename to grace-events-compat/src/main/groovy/grails/artefact/Service.groovy diff --git a/grails-events-compat/src/main/groovy/grails/events/Events.groovy b/grace-events-compat/src/main/groovy/grails/events/Events.groovy similarity index 100% rename from grails-events-compat/src/main/groovy/grails/events/Events.groovy rename to grace-events-compat/src/main/groovy/grails/events/Events.groovy diff --git a/grails-events-compat/src/main/groovy/reactor/bus/Bus.java b/grace-events-compat/src/main/groovy/reactor/bus/Bus.java similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/bus/Bus.java rename to grace-events-compat/src/main/groovy/reactor/bus/Bus.java diff --git a/grails-events-compat/src/main/groovy/reactor/bus/Event.java b/grace-events-compat/src/main/groovy/reactor/bus/Event.java similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/bus/Event.java rename to grace-events-compat/src/main/groovy/reactor/bus/Event.java diff --git a/grails-events-compat/src/main/groovy/reactor/bus/EventBus.groovy b/grace-events-compat/src/main/groovy/reactor/bus/EventBus.groovy similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/bus/EventBus.groovy rename to grace-events-compat/src/main/groovy/reactor/bus/EventBus.groovy diff --git a/grails-events-compat/src/main/groovy/reactor/bus/registry/Registration.groovy b/grace-events-compat/src/main/groovy/reactor/bus/registry/Registration.groovy similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/bus/registry/Registration.groovy rename to grace-events-compat/src/main/groovy/reactor/bus/registry/Registration.groovy diff --git a/grails-events-compat/src/main/groovy/reactor/bus/registry/Subscription.groovy b/grace-events-compat/src/main/groovy/reactor/bus/registry/Subscription.groovy similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/bus/registry/Subscription.groovy rename to grace-events-compat/src/main/groovy/reactor/bus/registry/Subscription.groovy diff --git a/grails-events-compat/src/main/groovy/reactor/bus/selector/Selector.java b/grace-events-compat/src/main/groovy/reactor/bus/selector/Selector.java similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/bus/selector/Selector.java rename to grace-events-compat/src/main/groovy/reactor/bus/selector/Selector.java diff --git a/grails-events-compat/src/main/groovy/reactor/fn/Consumer.java b/grace-events-compat/src/main/groovy/reactor/fn/Consumer.java similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/fn/Consumer.java rename to grace-events-compat/src/main/groovy/reactor/fn/Consumer.java diff --git a/grails-events-compat/src/main/groovy/reactor/spring/context/annotation/Consumer.groovy b/grace-events-compat/src/main/groovy/reactor/spring/context/annotation/Consumer.groovy similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/spring/context/annotation/Consumer.groovy rename to grace-events-compat/src/main/groovy/reactor/spring/context/annotation/Consumer.groovy diff --git a/grails-events-compat/src/main/groovy/reactor/spring/context/annotation/Selector.groovy b/grace-events-compat/src/main/groovy/reactor/spring/context/annotation/Selector.groovy similarity index 100% rename from grails-events-compat/src/main/groovy/reactor/spring/context/annotation/Selector.groovy rename to grace-events-compat/src/main/groovy/reactor/spring/context/annotation/Selector.groovy diff --git a/grails-events-gpars/build.gradle b/grace-events-gpars/build.gradle similarity index 85% rename from grails-events-gpars/build.gradle rename to grace-events-gpars/build.gradle index a2aeb35..3ecced4 100644 --- a/grails-events-gpars/build.gradle +++ b/grace-events-gpars/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(":grails-events") + api project(":grace-events") implementation 'org.codehaus.gpars:gpars:1.2.1', { exclude group:'org.multiverse', module:'multiverse-core' exclude group:'org.codehaus.groovy', module: 'groovy-all' diff --git a/grails-events-gpars/src/main/groovy/org/grails/events/gpars/ActorEventBus.groovy b/grace-events-gpars/src/main/groovy/org/grails/events/gpars/ActorEventBus.groovy similarity index 100% rename from grails-events-gpars/src/main/groovy/org/grails/events/gpars/ActorEventBus.groovy rename to grace-events-gpars/src/main/groovy/org/grails/events/gpars/ActorEventBus.groovy diff --git a/grails-events-gpars/src/main/resources/META-INF/services/grails.events.bus.EventBus b/grace-events-gpars/src/main/resources/META-INF/services/grails.events.bus.EventBus similarity index 100% rename from grails-events-gpars/src/main/resources/META-INF/services/grails.events.bus.EventBus rename to grace-events-gpars/src/main/resources/META-INF/services/grails.events.bus.EventBus diff --git a/grails-events-gpars/src/test/groovy/org/grails/events/gpars/ActorEventBusSpec.groovy b/grace-events-gpars/src/test/groovy/org/grails/events/gpars/ActorEventBusSpec.groovy similarity index 100% rename from grails-events-gpars/src/test/groovy/org/grails/events/gpars/ActorEventBusSpec.groovy rename to grace-events-gpars/src/test/groovy/org/grails/events/gpars/ActorEventBusSpec.groovy diff --git a/grace-events-rxjava/build.gradle b/grace-events-rxjava/build.gradle new file mode 100644 index 0000000..9957deb --- /dev/null +++ b/grace-events-rxjava/build.gradle @@ -0,0 +1,9 @@ +dependencies { + api project(":grace-events") + implementation "io.reactivex:rxjava:$rxJavaVersion" + + testImplementation project(":grace-events-transform") + testImplementation "org.graceframework:grace-datastore-gorm-test:$gormVersion", { + exclude group:'org.graceframework', module:'grace-datastore-gorm-validation' + } +} \ No newline at end of file diff --git a/grails-events-rxjava/src/main/groovy/org/grails/events/rxjava/EventWithReply.groovy b/grace-events-rxjava/src/main/groovy/org/grails/events/rxjava/EventWithReply.groovy similarity index 100% rename from grails-events-rxjava/src/main/groovy/org/grails/events/rxjava/EventWithReply.groovy rename to grace-events-rxjava/src/main/groovy/org/grails/events/rxjava/EventWithReply.groovy diff --git a/grails-events-rxjava/src/main/groovy/org/grails/events/rxjava/RxEventBus.groovy b/grace-events-rxjava/src/main/groovy/org/grails/events/rxjava/RxEventBus.groovy similarity index 100% rename from grails-events-rxjava/src/main/groovy/org/grails/events/rxjava/RxEventBus.groovy rename to grace-events-rxjava/src/main/groovy/org/grails/events/rxjava/RxEventBus.groovy diff --git a/grails-events-rxjava/src/main/resources/META-INF/services/grails.events.bus.EventBus b/grace-events-rxjava/src/main/resources/META-INF/services/grails.events.bus.EventBus similarity index 100% rename from grails-events-rxjava/src/main/resources/META-INF/services/grails.events.bus.EventBus rename to grace-events-rxjava/src/main/resources/META-INF/services/grails.events.bus.EventBus diff --git a/grails-events-rxjava/src/test/groovy/org/grails/events/rxjava/PublishSubscribeSpringSpec.groovy b/grace-events-rxjava/src/test/groovy/org/grails/events/rxjava/PublishSubscribeSpringSpec.groovy similarity index 100% rename from grails-events-rxjava/src/test/groovy/org/grails/events/rxjava/PublishSubscribeSpringSpec.groovy rename to grace-events-rxjava/src/test/groovy/org/grails/events/rxjava/PublishSubscribeSpringSpec.groovy diff --git a/grails-events-rxjava/src/test/groovy/org/grails/events/rxjava/RxEventBusSpec.groovy b/grace-events-rxjava/src/test/groovy/org/grails/events/rxjava/RxEventBusSpec.groovy similarity index 100% rename from grails-events-rxjava/src/test/groovy/org/grails/events/rxjava/RxEventBusSpec.groovy rename to grace-events-rxjava/src/test/groovy/org/grails/events/rxjava/RxEventBusSpec.groovy diff --git a/grails-events-rxjava2/build.gradle b/grace-events-rxjava2/build.gradle similarity index 70% rename from grails-events-rxjava2/build.gradle rename to grace-events-rxjava2/build.gradle index 788d7e3..29a7f6a 100644 --- a/grails-events-rxjava2/build.gradle +++ b/grace-events-rxjava2/build.gradle @@ -1,4 +1,4 @@ dependencies { - api project(":grails-events") + api project(":grace-events") implementation "io.reactivex.rxjava2:rxjava:$rxJava2Version" } \ No newline at end of file diff --git a/grails-events-rxjava2/src/main/groovy/org/grails/events/rxjava2/EventWithReply.groovy b/grace-events-rxjava2/src/main/groovy/org/grails/events/rxjava2/EventWithReply.groovy similarity index 100% rename from grails-events-rxjava2/src/main/groovy/org/grails/events/rxjava2/EventWithReply.groovy rename to grace-events-rxjava2/src/main/groovy/org/grails/events/rxjava2/EventWithReply.groovy diff --git a/grails-events-rxjava2/src/main/groovy/org/grails/events/rxjava2/RxEventBus.groovy b/grace-events-rxjava2/src/main/groovy/org/grails/events/rxjava2/RxEventBus.groovy similarity index 100% rename from grails-events-rxjava2/src/main/groovy/org/grails/events/rxjava2/RxEventBus.groovy rename to grace-events-rxjava2/src/main/groovy/org/grails/events/rxjava2/RxEventBus.groovy diff --git a/grails-events-rxjava2/src/main/resources/META-INF/services/grails.events.bus.EventBus b/grace-events-rxjava2/src/main/resources/META-INF/services/grails.events.bus.EventBus similarity index 100% rename from grails-events-rxjava2/src/main/resources/META-INF/services/grails.events.bus.EventBus rename to grace-events-rxjava2/src/main/resources/META-INF/services/grails.events.bus.EventBus diff --git a/grails-events-rxjava2/src/test/groovy/org/grails/events/rxjava2/RxEventBusSpec.groovy b/grace-events-rxjava2/src/test/groovy/org/grails/events/rxjava2/RxEventBusSpec.groovy similarity index 100% rename from grails-events-rxjava2/src/test/groovy/org/grails/events/rxjava2/RxEventBusSpec.groovy rename to grace-events-rxjava2/src/test/groovy/org/grails/events/rxjava2/RxEventBusSpec.groovy diff --git a/grails-events-rxjava3/build.gradle b/grace-events-rxjava3/build.gradle similarity index 70% rename from grails-events-rxjava3/build.gradle rename to grace-events-rxjava3/build.gradle index 68fceb4..abc4041 100644 --- a/grails-events-rxjava3/build.gradle +++ b/grace-events-rxjava3/build.gradle @@ -1,4 +1,4 @@ dependencies { - api project(":grails-events") + api project(":grace-events") implementation "io.reactivex.rxjava3:rxjava:$rxJava3Version" } \ No newline at end of file diff --git a/grails-events-rxjava3/src/main/groovy/org/grails/events/rxjava3/EventWithReply.groovy b/grace-events-rxjava3/src/main/groovy/org/grails/events/rxjava3/EventWithReply.groovy similarity index 100% rename from grails-events-rxjava3/src/main/groovy/org/grails/events/rxjava3/EventWithReply.groovy rename to grace-events-rxjava3/src/main/groovy/org/grails/events/rxjava3/EventWithReply.groovy diff --git a/grails-events-rxjava3/src/main/groovy/org/grails/events/rxjava3/RxEventBus.groovy b/grace-events-rxjava3/src/main/groovy/org/grails/events/rxjava3/RxEventBus.groovy similarity index 100% rename from grails-events-rxjava3/src/main/groovy/org/grails/events/rxjava3/RxEventBus.groovy rename to grace-events-rxjava3/src/main/groovy/org/grails/events/rxjava3/RxEventBus.groovy diff --git a/grails-events-rxjava3/src/main/resources/META-INF/services/grails.events.bus.EventBus b/grace-events-rxjava3/src/main/resources/META-INF/services/grails.events.bus.EventBus similarity index 100% rename from grails-events-rxjava3/src/main/resources/META-INF/services/grails.events.bus.EventBus rename to grace-events-rxjava3/src/main/resources/META-INF/services/grails.events.bus.EventBus diff --git a/grails-events-rxjava3/src/test/groovy/org/grails/events/rxjava3/RxEventBusSpec.groovy b/grace-events-rxjava3/src/test/groovy/org/grails/events/rxjava3/RxEventBusSpec.groovy similarity index 100% rename from grails-events-rxjava3/src/test/groovy/org/grails/events/rxjava3/RxEventBusSpec.groovy rename to grace-events-rxjava3/src/test/groovy/org/grails/events/rxjava3/RxEventBusSpec.groovy diff --git a/grails-events-spring/build.gradle b/grace-events-spring/build.gradle similarity index 71% rename from grails-events-spring/build.gradle rename to grace-events-spring/build.gradle index c8be77e..ad9dbd2 100644 --- a/grails-events-spring/build.gradle +++ b/grace-events-spring/build.gradle @@ -1,4 +1,4 @@ dependencies { - api project(":grails-events") + api project(":grace-events") implementation "org.springframework:spring-context:$springVersion" } \ No newline at end of file diff --git a/grails-events-spring/src/main/groovy/org/grails/events/spring/SpringEventBus.groovy b/grace-events-spring/src/main/groovy/org/grails/events/spring/SpringEventBus.groovy similarity index 100% rename from grails-events-spring/src/main/groovy/org/grails/events/spring/SpringEventBus.groovy rename to grace-events-spring/src/main/groovy/org/grails/events/spring/SpringEventBus.groovy diff --git a/grails-events-spring/src/main/groovy/org/grails/events/spring/SpringEventBusEvent.groovy b/grace-events-spring/src/main/groovy/org/grails/events/spring/SpringEventBusEvent.groovy similarity index 100% rename from grails-events-spring/src/main/groovy/org/grails/events/spring/SpringEventBusEvent.groovy rename to grace-events-spring/src/main/groovy/org/grails/events/spring/SpringEventBusEvent.groovy diff --git a/grails-events-spring/src/test/groovy/org/grails/events/spring/EventPublisherSpec.groovy b/grace-events-spring/src/test/groovy/org/grails/events/spring/EventPublisherSpec.groovy similarity index 100% rename from grails-events-spring/src/test/groovy/org/grails/events/spring/EventPublisherSpec.groovy rename to grace-events-spring/src/test/groovy/org/grails/events/spring/EventPublisherSpec.groovy diff --git a/grails-events-spring/src/test/groovy/org/grails/events/spring/SpringEventBusSpec.groovy b/grace-events-spring/src/test/groovy/org/grails/events/spring/SpringEventBusSpec.groovy similarity index 100% rename from grails-events-spring/src/test/groovy/org/grails/events/spring/SpringEventBusSpec.groovy rename to grace-events-spring/src/test/groovy/org/grails/events/spring/SpringEventBusSpec.groovy diff --git a/grace-events-transform/build.gradle b/grace-events-transform/build.gradle new file mode 100644 index 0000000..d761775 --- /dev/null +++ b/grace-events-transform/build.gradle @@ -0,0 +1,12 @@ +dependencies { + api project(":grace-events") + compileOnly "org.graceframework:grace-datastore-gorm:$gormVersion", { + exclude group:'org.graceframework', module:'grace-datastore-gorm-validation' + } + + testRuntimeOnly "org.springframework:spring-aop:$springVersion" + testRuntimeOnly "org.springframework:spring-expression:$springVersion" + testImplementation "org.graceframework:grace-datastore-gorm-test:$gormVersion", { + exclude group:'org.graceframework', module:'grace-datastore-gorm-validation' + } +} \ No newline at end of file diff --git a/grails-events-transform/src/main/groovy/grails/events/annotation/Events.groovy b/grace-events-transform/src/main/groovy/grails/events/annotation/Events.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/grails/events/annotation/Events.groovy rename to grace-events-transform/src/main/groovy/grails/events/annotation/Events.groovy diff --git a/grails-events-transform/src/main/groovy/grails/events/annotation/Publisher.groovy b/grace-events-transform/src/main/groovy/grails/events/annotation/Publisher.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/grails/events/annotation/Publisher.groovy rename to grace-events-transform/src/main/groovy/grails/events/annotation/Publisher.groovy diff --git a/grails-events-transform/src/main/groovy/grails/events/annotation/Subscriber.groovy b/grace-events-transform/src/main/groovy/grails/events/annotation/Subscriber.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/grails/events/annotation/Subscriber.groovy rename to grace-events-transform/src/main/groovy/grails/events/annotation/Subscriber.groovy diff --git a/grails-events-transform/src/main/groovy/grails/events/annotation/gorm/Listener.groovy b/grace-events-transform/src/main/groovy/grails/events/annotation/gorm/Listener.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/grails/events/annotation/gorm/Listener.groovy rename to grace-events-transform/src/main/groovy/grails/events/annotation/gorm/Listener.groovy diff --git a/grails-events-transform/src/main/groovy/org/grails/events/EventIdUtils.groovy b/grace-events-transform/src/main/groovy/org/grails/events/EventIdUtils.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/org/grails/events/EventIdUtils.groovy rename to grace-events-transform/src/main/groovy/org/grails/events/EventIdUtils.groovy diff --git a/grails-events-transform/src/main/groovy/org/grails/events/gorm/GormAnnotatedListener.groovy b/grace-events-transform/src/main/groovy/org/grails/events/gorm/GormAnnotatedListener.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/org/grails/events/gorm/GormAnnotatedListener.groovy rename to grace-events-transform/src/main/groovy/org/grails/events/gorm/GormAnnotatedListener.groovy diff --git a/grails-events-transform/src/main/groovy/org/grails/events/gorm/GormAnnotatedSubscriber.groovy b/grace-events-transform/src/main/groovy/org/grails/events/gorm/GormAnnotatedSubscriber.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/org/grails/events/gorm/GormAnnotatedSubscriber.groovy rename to grace-events-transform/src/main/groovy/org/grails/events/gorm/GormAnnotatedSubscriber.groovy diff --git a/grails-events-transform/src/main/groovy/org/grails/events/gorm/GormDispatcherRegistrar.groovy b/grace-events-transform/src/main/groovy/org/grails/events/gorm/GormDispatcherRegistrar.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/org/grails/events/gorm/GormDispatcherRegistrar.groovy rename to grace-events-transform/src/main/groovy/org/grails/events/gorm/GormDispatcherRegistrar.groovy diff --git a/grails-events-transform/src/main/groovy/org/grails/events/gorm/GormEventDispatcher.groovy b/grace-events-transform/src/main/groovy/org/grails/events/gorm/GormEventDispatcher.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/org/grails/events/gorm/GormEventDispatcher.groovy rename to grace-events-transform/src/main/groovy/org/grails/events/gorm/GormEventDispatcher.groovy diff --git a/grails-events-transform/src/main/groovy/org/grails/events/transform/AnnotatedSubscriber.groovy b/grace-events-transform/src/main/groovy/org/grails/events/transform/AnnotatedSubscriber.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/org/grails/events/transform/AnnotatedSubscriber.groovy rename to grace-events-transform/src/main/groovy/org/grails/events/transform/AnnotatedSubscriber.groovy diff --git a/grails-events-transform/src/main/groovy/org/grails/events/transform/PublisherTransform.groovy b/grace-events-transform/src/main/groovy/org/grails/events/transform/PublisherTransform.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/org/grails/events/transform/PublisherTransform.groovy rename to grace-events-transform/src/main/groovy/org/grails/events/transform/PublisherTransform.groovy diff --git a/grails-events-transform/src/main/groovy/org/grails/events/transform/SubscriberTransform.groovy b/grace-events-transform/src/main/groovy/org/grails/events/transform/SubscriberTransform.groovy similarity index 100% rename from grails-events-transform/src/main/groovy/org/grails/events/transform/SubscriberTransform.groovy rename to grace-events-transform/src/main/groovy/org/grails/events/transform/SubscriberTransform.groovy diff --git a/grails-events-transform/src/test/groovy/grails/events/EventIdUtilsSpec.groovy b/grace-events-transform/src/test/groovy/grails/events/EventIdUtilsSpec.groovy similarity index 100% rename from grails-events-transform/src/test/groovy/grails/events/EventIdUtilsSpec.groovy rename to grace-events-transform/src/test/groovy/grails/events/EventIdUtilsSpec.groovy diff --git a/grails-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy b/grace-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy similarity index 100% rename from grails-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy rename to grace-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy diff --git a/grails-events-transform/src/test/groovy/grails/events/annotation/PubSubSpec.groovy b/grace-events-transform/src/test/groovy/grails/events/annotation/PubSubSpec.groovy similarity index 100% rename from grails-events-transform/src/test/groovy/grails/events/annotation/PubSubSpec.groovy rename to grace-events-transform/src/test/groovy/grails/events/annotation/PubSubSpec.groovy diff --git a/grails-events-transform/src/test/groovy/grails/events/annotation/PublishSubscribeSpringSpec.groovy b/grace-events-transform/src/test/groovy/grails/events/annotation/PublishSubscribeSpringSpec.groovy similarity index 100% rename from grails-events-transform/src/test/groovy/grails/events/annotation/PublishSubscribeSpringSpec.groovy rename to grace-events-transform/src/test/groovy/grails/events/annotation/PublishSubscribeSpringSpec.groovy diff --git a/grails-events-transform/src/test/groovy/grails/events/annotation/PublisherSpec.groovy b/grace-events-transform/src/test/groovy/grails/events/annotation/PublisherSpec.groovy similarity index 100% rename from grails-events-transform/src/test/groovy/grails/events/annotation/PublisherSpec.groovy rename to grace-events-transform/src/test/groovy/grails/events/annotation/PublisherSpec.groovy diff --git a/grails-events-transform/src/test/groovy/grails/events/annotation/PublisherTransformSpec.groovy b/grace-events-transform/src/test/groovy/grails/events/annotation/PublisherTransformSpec.groovy similarity index 100% rename from grails-events-transform/src/test/groovy/grails/events/annotation/PublisherTransformSpec.groovy rename to grace-events-transform/src/test/groovy/grails/events/annotation/PublisherTransformSpec.groovy diff --git a/grails-events-transform/src/test/groovy/grails/events/annotation/SubscriberSpec.groovy b/grace-events-transform/src/test/groovy/grails/events/annotation/SubscriberSpec.groovy similarity index 100% rename from grails-events-transform/src/test/groovy/grails/events/annotation/SubscriberSpec.groovy rename to grace-events-transform/src/test/groovy/grails/events/annotation/SubscriberSpec.groovy diff --git a/grails-events-transform/src/test/groovy/grails/events/annotation/namespace/NamespaceSpec.groovy b/grace-events-transform/src/test/groovy/grails/events/annotation/namespace/NamespaceSpec.groovy similarity index 100% rename from grails-events-transform/src/test/groovy/grails/events/annotation/namespace/NamespaceSpec.groovy rename to grace-events-transform/src/test/groovy/grails/events/annotation/namespace/NamespaceSpec.groovy diff --git a/grails-events/README.md b/grace-events/README.md similarity index 100% rename from grails-events/README.md rename to grace-events/README.md diff --git a/grails-events/build.gradle b/grace-events/build.gradle similarity index 100% rename from grails-events/build.gradle rename to grace-events/build.gradle diff --git a/grails-events/src/main/groovy/grails/events/Event.groovy b/grace-events/src/main/groovy/grails/events/Event.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/Event.groovy rename to grace-events/src/main/groovy/grails/events/Event.groovy diff --git a/grails-events/src/main/groovy/grails/events/EventPublisher.groovy b/grace-events/src/main/groovy/grails/events/EventPublisher.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/EventPublisher.groovy rename to grace-events/src/main/groovy/grails/events/EventPublisher.groovy diff --git a/grails-events/src/main/groovy/grails/events/bus/EventBus.groovy b/grace-events/src/main/groovy/grails/events/bus/EventBus.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/bus/EventBus.groovy rename to grace-events/src/main/groovy/grails/events/bus/EventBus.groovy diff --git a/grails-events/src/main/groovy/grails/events/bus/EventBusAware.groovy b/grace-events/src/main/groovy/grails/events/bus/EventBusAware.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/bus/EventBusAware.groovy rename to grace-events/src/main/groovy/grails/events/bus/EventBusAware.groovy diff --git a/grails-events/src/main/groovy/grails/events/bus/EventBusBuilder.groovy b/grace-events/src/main/groovy/grails/events/bus/EventBusBuilder.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/bus/EventBusBuilder.groovy rename to grace-events/src/main/groovy/grails/events/bus/EventBusBuilder.groovy diff --git a/grails-events/src/main/groovy/grails/events/emitter/EventEmitter.groovy b/grace-events/src/main/groovy/grails/events/emitter/EventEmitter.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/emitter/EventEmitter.groovy rename to grace-events/src/main/groovy/grails/events/emitter/EventEmitter.groovy diff --git a/grails-events/src/main/groovy/grails/events/subscriber/EventSubscriber.groovy b/grace-events/src/main/groovy/grails/events/subscriber/EventSubscriber.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/subscriber/EventSubscriber.groovy rename to grace-events/src/main/groovy/grails/events/subscriber/EventSubscriber.groovy diff --git a/grails-events/src/main/groovy/grails/events/subscriber/MethodEventSubscriber.groovy b/grace-events/src/main/groovy/grails/events/subscriber/MethodEventSubscriber.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/subscriber/MethodEventSubscriber.groovy rename to grace-events/src/main/groovy/grails/events/subscriber/MethodEventSubscriber.groovy diff --git a/grails-events/src/main/groovy/grails/events/subscriber/MethodSubscriber.groovy b/grace-events/src/main/groovy/grails/events/subscriber/MethodSubscriber.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/subscriber/MethodSubscriber.groovy rename to grace-events/src/main/groovy/grails/events/subscriber/MethodSubscriber.groovy diff --git a/grails-events/src/main/groovy/grails/events/subscriber/Subjects.groovy b/grace-events/src/main/groovy/grails/events/subscriber/Subjects.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/subscriber/Subjects.groovy rename to grace-events/src/main/groovy/grails/events/subscriber/Subjects.groovy diff --git a/grails-events/src/main/groovy/grails/events/subscriber/Subscriber.groovy b/grace-events/src/main/groovy/grails/events/subscriber/Subscriber.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/subscriber/Subscriber.groovy rename to grace-events/src/main/groovy/grails/events/subscriber/Subscriber.groovy diff --git a/grails-events/src/main/groovy/grails/events/subscriber/Subscription.groovy b/grace-events/src/main/groovy/grails/events/subscriber/Subscription.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/subscriber/Subscription.groovy rename to grace-events/src/main/groovy/grails/events/subscriber/Subscription.groovy diff --git a/grails-events/src/main/groovy/grails/events/trigger/EventTrigger.groovy b/grace-events/src/main/groovy/grails/events/trigger/EventTrigger.groovy similarity index 100% rename from grails-events/src/main/groovy/grails/events/trigger/EventTrigger.groovy rename to grace-events/src/main/groovy/grails/events/trigger/EventTrigger.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/ClosureEventTrigger.groovy b/grace-events/src/main/groovy/org/grails/events/ClosureEventTrigger.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/ClosureEventTrigger.groovy rename to grace-events/src/main/groovy/org/grails/events/ClosureEventTrigger.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/EventSubscriberTrigger.groovy b/grace-events/src/main/groovy/org/grails/events/EventSubscriberTrigger.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/EventSubscriberTrigger.groovy rename to grace-events/src/main/groovy/org/grails/events/EventSubscriberTrigger.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/bus/AbstractEventBus.groovy b/grace-events/src/main/groovy/org/grails/events/bus/AbstractEventBus.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/bus/AbstractEventBus.groovy rename to grace-events/src/main/groovy/org/grails/events/bus/AbstractEventBus.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/bus/ExecutorEventBus.groovy b/grace-events/src/main/groovy/org/grails/events/bus/ExecutorEventBus.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/bus/ExecutorEventBus.groovy rename to grace-events/src/main/groovy/org/grails/events/bus/ExecutorEventBus.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/bus/SynchronousEventBus.groovy b/grace-events/src/main/groovy/org/grails/events/bus/SynchronousEventBus.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/bus/SynchronousEventBus.groovy rename to grace-events/src/main/groovy/org/grails/events/bus/SynchronousEventBus.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/bus/spring/EventBusFactoryBean.groovy b/grace-events/src/main/groovy/org/grails/events/bus/spring/EventBusFactoryBean.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/bus/spring/EventBusFactoryBean.groovy rename to grace-events/src/main/groovy/org/grails/events/bus/spring/EventBusFactoryBean.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/registry/AbstractSubscription.groovy b/grace-events/src/main/groovy/org/grails/events/registry/AbstractSubscription.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/registry/AbstractSubscription.groovy rename to grace-events/src/main/groovy/org/grails/events/registry/AbstractSubscription.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/registry/ClosureSubscription.groovy b/grace-events/src/main/groovy/org/grails/events/registry/ClosureSubscription.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/registry/ClosureSubscription.groovy rename to grace-events/src/main/groovy/org/grails/events/registry/ClosureSubscription.groovy diff --git a/grails-events/src/main/groovy/org/grails/events/registry/EventSubscriberSubscription.groovy b/grace-events/src/main/groovy/org/grails/events/registry/EventSubscriberSubscription.groovy similarity index 100% rename from grails-events/src/main/groovy/org/grails/events/registry/EventSubscriberSubscription.groovy rename to grace-events/src/main/groovy/org/grails/events/registry/EventSubscriberSubscription.groovy diff --git a/grails-events/src/test/groovy/org/grails/events/SynchronousEventBusSpec.groovy b/grace-events/src/test/groovy/org/grails/events/SynchronousEventBusSpec.groovy similarity index 100% rename from grails-events/src/test/groovy/org/grails/events/SynchronousEventBusSpec.groovy rename to grace-events/src/test/groovy/org/grails/events/SynchronousEventBusSpec.groovy diff --git a/grails-events/src/test/groovy/org/grails/events/TaskExecuterEventBusSpec.groovy b/grace-events/src/test/groovy/org/grails/events/TaskExecuterEventBusSpec.groovy similarity index 100% rename from grails-events/src/test/groovy/org/grails/events/TaskExecuterEventBusSpec.groovy rename to grace-events/src/test/groovy/org/grails/events/TaskExecuterEventBusSpec.groovy diff --git a/grails-events/src/test/groovy/org/grails/events/TransactionAwareEventSpec.groovy b/grace-events/src/test/groovy/org/grails/events/TransactionAwareEventSpec.groovy similarity index 100% rename from grails-events/src/test/groovy/org/grails/events/TransactionAwareEventSpec.groovy rename to grace-events/src/test/groovy/org/grails/events/TransactionAwareEventSpec.groovy diff --git a/grails-events/src/test/groovy/org/grails/events/subscriber/MethodEventSubscriberSpec.groovy b/grace-events/src/test/groovy/org/grails/events/subscriber/MethodEventSubscriberSpec.groovy similarity index 100% rename from grails-events/src/test/groovy/org/grails/events/subscriber/MethodEventSubscriberSpec.groovy rename to grace-events/src/test/groovy/org/grails/events/subscriber/MethodEventSubscriberSpec.groovy diff --git a/grails-plugin-async/README.md b/grace-plugin-async/README.md similarity index 100% rename from grails-plugin-async/README.md rename to grace-plugin-async/README.md diff --git a/grails-plugin-async/grails-app/.gitkeep b/grace-plugin-async/app/.gitkeep similarity index 100% rename from grails-plugin-async/grails-app/.gitkeep rename to grace-plugin-async/app/.gitkeep diff --git a/grace-plugin-async/build.gradle b/grace-plugin-async/build.gradle new file mode 100644 index 0000000..dbe9c18 --- /dev/null +++ b/grace-plugin-async/build.gradle @@ -0,0 +1,16 @@ +dependencies { + compileOnly "javax.servlet:javax.servlet-api:$servletApiVersion" + implementation "org.graceframework:grace-plugin-controllers:$graceVersion" + api project(':grace-plugin-events') + api project(':grace-async') + + testImplementation "javax.servlet:javax.servlet-api:$servletApiVersion" + testImplementation "org.graceframework:grace-test:$graceVersion" + testImplementation "org.springframework:spring-test:$springVersion" +} + +jar { + enabled = true + archiveClassifier.set('') + includeEmptyDirs = false +} \ No newline at end of file diff --git a/grails-plugin-async/src/main/groovy/grails/artefact/AsyncController.groovy b/grace-plugin-async/src/main/groovy/grails/artefact/AsyncController.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/grails/artefact/AsyncController.groovy rename to grace-plugin-async/src/main/groovy/grails/artefact/AsyncController.groovy diff --git a/grails-plugin-async/src/main/groovy/grails/async/services/PersistenceContextPromiseDecorator.groovy b/grace-plugin-async/src/main/groovy/grails/async/services/PersistenceContextPromiseDecorator.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/grails/async/services/PersistenceContextPromiseDecorator.groovy rename to grace-plugin-async/src/main/groovy/grails/async/services/PersistenceContextPromiseDecorator.groovy diff --git a/grails-plugin-async/src/main/groovy/grails/async/services/TransactionalPromiseDecorator.groovy b/grace-plugin-async/src/main/groovy/grails/async/services/TransactionalPromiseDecorator.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/grails/async/services/TransactionalPromiseDecorator.groovy rename to grace-plugin-async/src/main/groovy/grails/async/services/TransactionalPromiseDecorator.groovy diff --git a/grails-plugin-async/src/main/groovy/grails/async/web/AsyncController.groovy b/grace-plugin-async/src/main/groovy/grails/async/web/AsyncController.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/grails/async/web/AsyncController.groovy rename to grace-plugin-async/src/main/groovy/grails/async/web/AsyncController.groovy diff --git a/grails-plugin-async/src/main/groovy/grails/async/web/AsyncGrailsWebRequest.groovy b/grace-plugin-async/src/main/groovy/grails/async/web/AsyncGrailsWebRequest.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/grails/async/web/AsyncGrailsWebRequest.groovy rename to grace-plugin-async/src/main/groovy/grails/async/web/AsyncGrailsWebRequest.groovy diff --git a/grails-plugin-async/src/main/groovy/grails/async/web/WebPromises.groovy b/grace-plugin-async/src/main/groovy/grails/async/web/WebPromises.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/grails/async/web/WebPromises.groovy rename to grace-plugin-async/src/main/groovy/grails/async/web/WebPromises.groovy diff --git a/grails-plugin-async/src/main/groovy/org/grails/async/transform/internal/DefaultDelegateAsyncTransactionalMethodTransformer.groovy b/grace-plugin-async/src/main/groovy/org/grails/async/transform/internal/DefaultDelegateAsyncTransactionalMethodTransformer.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/org/grails/async/transform/internal/DefaultDelegateAsyncTransactionalMethodTransformer.groovy rename to grace-plugin-async/src/main/groovy/org/grails/async/transform/internal/DefaultDelegateAsyncTransactionalMethodTransformer.groovy diff --git a/grails-plugin-async/src/main/groovy/org/grails/compiler/web/async/TransactionalAsyncTransformUtils.groovy b/grace-plugin-async/src/main/groovy/org/grails/compiler/web/async/TransactionalAsyncTransformUtils.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/org/grails/compiler/web/async/TransactionalAsyncTransformUtils.groovy rename to grace-plugin-async/src/main/groovy/org/grails/compiler/web/async/TransactionalAsyncTransformUtils.groovy diff --git a/grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/AsyncWebRequestPromiseDecorator.groovy b/grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/AsyncWebRequestPromiseDecorator.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/AsyncWebRequestPromiseDecorator.groovy rename to grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/AsyncWebRequestPromiseDecorator.groovy diff --git a/grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/AsyncWebRequestPromiseDecoratorLookupStrategy.groovy b/grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/AsyncWebRequestPromiseDecoratorLookupStrategy.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/AsyncWebRequestPromiseDecoratorLookupStrategy.groovy rename to grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/AsyncWebRequestPromiseDecoratorLookupStrategy.groovy diff --git a/grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/ControllersAsyncGrailsPlugin.groovy b/grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/ControllersAsyncGrailsPlugin.groovy similarity index 97% rename from grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/ControllersAsyncGrailsPlugin.groovy rename to grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/ControllersAsyncGrailsPlugin.groovy index 293bc2a..04b7c4f 100644 --- a/grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/ControllersAsyncGrailsPlugin.groovy +++ b/grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/ControllersAsyncGrailsPlugin.groovy @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Role * @since 2.0 */ class ControllersAsyncGrailsPlugin extends Plugin { - def grailsVersion = "3.3.0 > *" + def grailsVersion = "2022.0.0 > *" def loadAfter = ['controllers'] Closure doWithSpring() {{-> asyncPromiseResponseActionResultTransformer(AsyncActionResultTransformer) diff --git a/grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/GrailsAsyncContext.groovy b/grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/GrailsAsyncContext.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/GrailsAsyncContext.groovy rename to grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/GrailsAsyncContext.groovy diff --git a/grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/mvc/AsyncActionResultTransformer.groovy b/grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/mvc/AsyncActionResultTransformer.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/mvc/AsyncActionResultTransformer.groovy rename to grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/mvc/AsyncActionResultTransformer.groovy diff --git a/grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/spring/PromiseFactoryBean.groovy b/grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/spring/PromiseFactoryBean.groovy similarity index 100% rename from grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/spring/PromiseFactoryBean.groovy rename to grace-plugin-async/src/main/groovy/org/grails/plugins/web/async/spring/PromiseFactoryBean.groovy diff --git a/grails-plugin-async/src/test/groovy/grails/async/services/AsyncTransactionalServiceSpec.groovy b/grace-plugin-async/src/test/groovy/grails/async/services/AsyncTransactionalServiceSpec.groovy similarity index 100% rename from grails-plugin-async/src/test/groovy/grails/async/services/AsyncTransactionalServiceSpec.groovy rename to grace-plugin-async/src/test/groovy/grails/async/services/AsyncTransactionalServiceSpec.groovy diff --git a/grails-plugin-async/src/test/groovy/grails/async/services/WebPromisesSpec.groovy b/grace-plugin-async/src/test/groovy/grails/async/services/WebPromisesSpec.groovy similarity index 100% rename from grails-plugin-async/src/test/groovy/grails/async/services/WebPromisesSpec.groovy rename to grace-plugin-async/src/test/groovy/grails/async/services/WebPromisesSpec.groovy diff --git a/grails-plugin-events/README.md b/grace-plugin-events/README.md similarity index 100% rename from grails-plugin-events/README.md rename to grace-plugin-events/README.md diff --git a/grails-plugin-events/grails-app/.gitkeep b/grace-plugin-events/app/.gitkeep similarity index 100% rename from grails-plugin-events/grails-app/.gitkeep rename to grace-plugin-events/app/.gitkeep diff --git a/grace-plugin-events/build.gradle b/grace-plugin-events/build.gradle new file mode 100644 index 0000000..cb42fad --- /dev/null +++ b/grace-plugin-events/build.gradle @@ -0,0 +1,11 @@ +dependencies { + api "org.graceframework:grace-core:$graceVersion" + api project(":grace-events"), project(":grace-events-transform") + api project(":grace-events-compat") +} + +jar { + enabled = true + archiveClassifier.set('') + includeEmptyDirs = false +} diff --git a/grails-plugin-events/src/main/groovy/org/grails/events/spring/SpringEventTranslator.groovy b/grace-plugin-events/src/main/groovy/org/grails/events/spring/SpringEventTranslator.groovy similarity index 100% rename from grails-plugin-events/src/main/groovy/org/grails/events/spring/SpringEventTranslator.groovy rename to grace-plugin-events/src/main/groovy/org/grails/events/spring/SpringEventTranslator.groovy diff --git a/grails-plugin-events/src/main/groovy/org/grails/plugins/events/EventBusGrailsPlugin.groovy b/grace-plugin-events/src/main/groovy/org/grails/plugins/events/EventBusGrailsPlugin.groovy similarity index 98% rename from grails-plugin-events/src/main/groovy/org/grails/plugins/events/EventBusGrailsPlugin.groovy rename to grace-plugin-events/src/main/groovy/org/grails/plugins/events/EventBusGrailsPlugin.groovy index b11eeee..727b10d 100644 --- a/grails-plugin-events/src/main/groovy/org/grails/plugins/events/EventBusGrailsPlugin.groovy +++ b/grace-plugin-events/src/main/groovy/org/grails/plugins/events/EventBusGrailsPlugin.groovy @@ -36,7 +36,7 @@ import reactor.bus.EventBus @Slf4j class EventBusGrailsPlugin extends Plugin { - def grailsVersion = "3.3.0 > *" + def grailsVersion = "2022.0.0 > *" /** * Whether to translate GORM events into reactor events diff --git a/grails-plugin-events/src/test/groovy/grails/events/SpringEventTranslatorSpec.groovy b/grace-plugin-events/src/test/groovy/grails/events/SpringEventTranslatorSpec.groovy similarity index 100% rename from grails-plugin-events/src/test/groovy/grails/events/SpringEventTranslatorSpec.groovy rename to grace-plugin-events/src/test/groovy/grails/events/SpringEventTranslatorSpec.groovy diff --git a/gradle.properties b/gradle.properties index 35cd0e1..e96d778 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,19 @@ -title=Grails Async Framework -authors=Graeme Rocher -projectVersion=5.2.5 -projectDesc=Grails Async Libraries -projectUrl=https://github.com/grails/grails-async -githubSlug=grails/grails-async +title=Grace Async Framework +authors=Michael Yan +projectVersion=5.2.5-SNAPSHOT +projectDesc=Grace Async Libraries +projectUrl=https://github.com/graceframework/grace-async +githubSlug=graceframework/grace-async githubBranch=master -developers=Graeme Rocher -grailsVersion=2022.1.8 +developers=Michael Yan +graceVersion=2022.2.3 groovyVersion=3.0.18 -gormVersion=2022.2.5 +gormVersion=2022.2.4 +jansiVersion=1.18 +javaParserCoreVersion=3.15.14 servletApiVersion=4.0.1 spockVersion=2.3-groovy-3.0 +springDependencyManagementPluginVersion=1.0.15.RELEASE springVersion=5.3.28 slf4jVersion=1.7.36 rxJavaVersion=1.3.8 diff --git a/grails-events-compat/build.gradle b/grails-events-compat/build.gradle deleted file mode 100644 index 7b5a5e2..0000000 --- a/grails-events-compat/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(":grails-events"), project(":grails-events-transform") -} \ No newline at end of file diff --git a/grails-events-rxjava/build.gradle b/grails-events-rxjava/build.gradle deleted file mode 100644 index aa08206..0000000 --- a/grails-events-rxjava/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -dependencies { - api project(":grails-events") - implementation "io.reactivex:rxjava:$rxJavaVersion" - - testImplementation project(":grails-events-transform") - testImplementation "org.grails:grails-datastore-gorm-test:$gormVersion", { - exclude group:'org.grails', module:'grails-datastore-gorm-validation' - } -} \ No newline at end of file diff --git a/grails-events-transform/build.gradle b/grails-events-transform/build.gradle deleted file mode 100644 index 728007c..0000000 --- a/grails-events-transform/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -dependencies { - api project(":grails-events") - compileOnly "org.grails:grails-datastore-gorm:$gormVersion", { - exclude group:'org.grails', module:'grails-datastore-gorm-validation' - } - - testRuntimeOnly "org.springframework:spring-aop:$springVersion" - testRuntimeOnly "org.springframework:spring-expression:$springVersion" - testImplementation "org.grails:grails-datastore-gorm-test:$gormVersion", { - exclude group:'org.grails', module:'grails-datastore-gorm-validation' - } -} \ No newline at end of file diff --git a/grails-plugin-async/build.gradle b/grails-plugin-async/build.gradle deleted file mode 100644 index 9406243..0000000 --- a/grails-plugin-async/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -dependencies { - compileOnly "javax.servlet:javax.servlet-api:$servletApiVersion" - implementation "org.grails:grails-plugin-controllers:$grailsVersion" - api project(':grails-plugin-events') - api project(':grails-async') - - testImplementation "javax.servlet:javax.servlet-api:$servletApiVersion" - testImplementation "org.grails:grails-test:$grailsVersion" - testImplementation "org.springframework:spring-test:$springVersion" -} diff --git a/grails-plugin-events/build.gradle b/grails-plugin-events/build.gradle deleted file mode 100644 index f3e8004..0000000 --- a/grails-plugin-events/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - api "org.grails:grails-core:$grailsVersion" - api project(":grails-events"), project(":grails-events-transform") - api project(":grails-events-compat") -} diff --git a/publishing/mavenCentral.gradle b/publishing/mavenCentral.gradle new file mode 100644 index 0000000..38bdcbd --- /dev/null +++ b/publishing/mavenCentral.gradle @@ -0,0 +1,90 @@ +ext."signing.keyId" = rootProject.hasProperty("signing.keyId") ? rootProject.getProperty('signing.keyId') : System.getenv('SIGNING_KEY') +ext."signing.password" = rootProject.hasProperty("signing.password") ? rootProject.getProperty('signing.password') : System.getenv('SIGNING_PASSPHRASE') +ext."signing.secretKeyRingFile" = rootProject.hasProperty("signing.secretKeyRingFile") ? rootProject.getProperty('signing.secretKeyRingFile') : "${System.properties['user.home']}${File.separator}.gnupg${File.separator}secring.gpg" + +ext.pomInfo = { + delegate.url 'https://github.com/graceframework/grace-async' + delegate.licenses { + delegate.license { + delegate.name 'The Apache Software License, Version 2.0' + delegate.url 'https://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + delegate.scm { + delegate.url 'https://github.com/graceframework/grace-async' + delegate.connection 'scm:git:git://github.com/graceframework/grace-async' + delegate.developerConnection 'scm:git:ssh://github.com:graceframework/grace-async' + } + delegate.developers { + developer { + delegate.id 'rainboyan' + delegate.name 'Michael Yan' + delegate.email 'rain@rainboyan.com' + } + } +} + +publishing { + publications { + maven(MavenPublication) { + def projectName = project.name.split('-')*.capitalize().join(' ') + if (project.name.startsWith('grace-plugin')) { + artifactId(project.name - 'grace-plugin-') + } + else { + artifactId project.name + } + from components.java + + pom { + name = projectName + description = "Grace Async Framework : $projectName" + } + + pom.withXml { + def pomNode = asNode() + pomNode.children().last() + pomInfo + try { + pomNode.dependencyManagement.replaceNode {} + } catch (Throwable e) { + // ignore + } + + // simply remove dependencies without a version + // version-less dependencies are handled with dependencyManagement + // see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/8 for more complete solutions + pomNode.dependencies.dependency.findAll { + it.version.text().isEmpty() + }.each { + try { + it.replaceNode {} + } catch (Throwable e) { + // ignore + } + } + } + } + } +} + +jar { + manifest.mainAttributes( + "Built-By": System.properties['user.name'], + "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")", + "Implementation-Title": "Grace Async", + "Implementation-Version": projectVersion, + "Implementation-Vendor": 'graceframework.org') +} + +afterEvaluate { + signing { + required { isReleaseVersion && gradle.taskGraph.hasTask("publish") } + sign publishing.publications.maven + } + + tasks.withType(Sign) { + onlyIf { isReleaseVersion } + } +} + +task install(dependsOn: project.tasks.withType(PublishToMavenLocal)) diff --git a/settings.gradle b/settings.gradle index 1cd9f03..ec9af8f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,21 +1,21 @@ -rootProject.name = 'grails-async' +rootProject.name = 'Grace.Async' -include 'grails-async' -include 'grails-async-gpars' -include 'grails-async-rxjava' -include 'grails-async-rxjava2' -include 'grails-async-rxjava3' -include 'grails-events' -include 'grails-events-compat' -include 'grails-events-transform' -include 'grails-events-gpars' -include 'grails-events-spring' -include 'grails-events-rxjava' -include 'grails-events-rxjava2' -include 'grails-events-rxjava3' -include 'grails-plugin-async' -include 'grails-plugin-events' +include 'grace-async' +include 'grace-async-gpars' +include 'grace-async-rxjava' +include 'grace-async-rxjava2' +include 'grace-async-rxjava3' +include 'grace-events' +include 'grace-events-compat' +include 'grace-events-transform' +include 'grace-events-gpars' +include 'grace-events-spring' +include 'grace-events-rxjava' +include 'grace-events-rxjava2' +include 'grace-events-rxjava3' +include 'grace-plugin-async' +include 'grace-plugin-events' // examples -include 'pubsub-demo' -project(":pubsub-demo").projectDir = new File(settingsDir, "examples/pubsub-demo") \ No newline at end of file +// include 'pubsub-demo' +// project(":pubsub-demo").projectDir = new File(settingsDir, "examples/pubsub-demo") \ No newline at end of file diff --git a/travis-build.sh b/travis-build.sh deleted file mode 100755 index ed43923..0000000 --- a/travis-build.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -set -e - -EXIT_STATUS=0 - -echo "Check for branch $TRAVIS_BRANCH JDK: $TRAVIS_JDK_VERSION" - -./gradlew clean check || EXIT_STATUS=$? - -if [ $EXIT_STATUS -ne 0 ]; then - exit $EXIT_STATUS -fi - -if [ "${TRAVIS_JDK_VERSION}" == "openjdk11" ] ; then - exit $EXIT_STATUS -fi - -echo "Publishing archives for branch $TRAVIS_BRANCH JDK: $TRAVIS_JDK_VERSION" -if [[ -n $TRAVIS_TAG ]] || [[ $TRAVIS_BRANCH =~ ^master$ && $TRAVIS_PULL_REQUEST == 'false' ]]; then - - echo "Publishing archives" - if [[ -n $TRAVIS_TAG ]]; then - ./gradlew bintrayUpload --no-daemon --stacktrace || EXIT_STATUS=$? - else - ./gradlew publish --no-daemon --stacktrace || EXIT_STATUS=$? - fi - - ./gradlew --no-daemon docs || EXIT_STATUS=$? - - git config --global user.name "$GIT_NAME" - git config --global user.email "$GIT_EMAIL" - git config --global credential.helper "store --file=~/.git-credentials" - echo "https://$GH_TOKEN:@github.com" > ~/.git-credentials - - git clone https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git -b gh-pages gh-pages --single-branch > /dev/null - cd gh-pages - - # If this is the master branch then update the snapshot - if [[ $TRAVIS_BRANCH =~ ^master|[12]\..\.x$ ]]; then - mkdir -p snapshot - cp -r ../build/docs/. ./snapshot/ - - git add snapshot/* - fi - - # If there is a tag present then this becomes the latest - if [[ -n $TRAVIS_TAG ]]; then - mkdir -p latest - cp -r ../build/docs/. ./latest/ - git add latest/* - - version="$TRAVIS_TAG" - version=${version:1} - majorVersion=${version:0:4} - majorVersion="${majorVersion}x" - - mkdir -p "$version" - cp -r ../build/docs/. "./$version/" - git add "$version/*" - - mkdir -p "$majorVersion" - cp -r ../build/docs/. "./$majorVersion/" - git add "$majorVersion/*" - - fi - - git commit -a -m "Updating docs for Travis build: https://travis-ci.org/$TRAVIS_REPO_SLUG/builds/$TRAVIS_BUILD_ID" && { - git push origin HEAD || true - } - cd .. - rm -rf gh-pages -fi - -exit $EXIT_STATUS