diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 821ccec6..1ab93696 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,8 +4,8 @@ updates: target-branch: "develop" directory: "/" schedule: - interval: daily - time: "04:00" + interval: "weekly" + day: "saturday" open-pull-requests-limit: 10 - package-ecosystem: "github-actions" target-branch: "develop" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6ba164f3..6b3e6d20 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -35,7 +35,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 19d285ec..245aead3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 @@ -56,7 +56,7 @@ jobs: steps: - name: Checkout pages - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: 'gh-pages' diff --git a/.github/workflows/java-ea-maven.yml b/.github/workflows/java-ea-maven.yml index 3d86d3ae..7906c032 100644 --- a/.github/workflows/java-ea-maven.yml +++ b/.github/workflows/java-ea-maven.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '-ea' ] + java: [ 20 ] os: [ ubuntu-latest ] name: JDK${{ matrix.java }} on ${{ matrix.os }} @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 @@ -32,6 +32,6 @@ jobs: cache: 'maven' - name: Build and (headless) test with Maven - uses: GabrielBB/xvfb-action@v1 + uses: smithki/xvfb-action@v1.1.2 with: run: mvn -U -B -ntp package diff --git a/.github/workflows/java8-maven.yml b/.github/workflows/java8-maven.yml index d7cb190d..02f85f5a 100644 --- a/.github/workflows/java8-maven.yml +++ b/.github/workflows/java8-maven.yml @@ -4,7 +4,7 @@ on: [ push, pull_request ] jobs: build-and-test-job: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name + if: github.event_name == 'pull_request' || startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/tags/v') strategy: fail-fast: false matrix: @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 @@ -35,6 +35,21 @@ jobs: with: run: mvn -U -B -ntp package + auto-merge-job: + needs: build-and-test-job + if: startsWith(github.repository, 'nbbrd/') && github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' + permissions: + contents: write + pull-requests: write + name: Auto-merge on dependabot PR + runs-on: ubuntu-latest + steps: + - name: Merge PR + run: gh pr merge --auto --rebase "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + snapshot-job: needs: build-and-test-job if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop') @@ -48,7 +63,7 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 @@ -98,7 +113,7 @@ jobs: steps: - name: Checkout source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index bf507758..92ffd0a1 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -11,11 +11,11 @@ jobs: qodana: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: 'Qodana Scan' - uses: JetBrains/qodana-action@v2023.1.0 + uses: JetBrains/qodana-action@v2023.2.6 - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 with: diff --git a/README.md b/README.md index 911a0e01..ca9ea457 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # sandbox -...1234... +...123456... Documentation at https://nbbrd.github.io/sandbox/docs/develop/ diff --git a/pom.xml b/pom.xml index bceadc54..db0159d7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.nbbrd.sandbox sandbox-parent - 2.3.1 + 2.3.2 pom sandbox @@ -90,6 +90,11 @@ heylogs-maven-plugin 0.6.0 + + de.thetaphi + forbiddenapis + 3.5.1 + @@ -102,6 +107,32 @@ check + false + + true + + + + + + de.thetaphi + forbiddenapis + + false + + jdk-unsafe + jdk-deprecated + jdk-internal + jdk-non-portable + jdk-reflection + + + + + + check + testCheck + @@ -272,7 +303,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 org.kordamp.maven @@ -357,7 +388,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.17.2 + 0.17.3 true @@ -405,7 +436,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-javadocs diff --git a/sandbox-api/pom.xml b/sandbox-api/pom.xml index 95144dd3..d466e8ab 100644 --- a/sandbox-api/pom.xml +++ b/sandbox-api/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 2.3.1 + 2.3.2 4.0.0 diff --git a/sandbox-bom/pom.xml b/sandbox-bom/pom.xml index 41f54195..143ba169 100644 --- a/sandbox-bom/pom.xml +++ b/sandbox-bom/pom.xml @@ -7,7 +7,7 @@ sandbox-parent com.github.nbbrd.sandbox - 2.3.1 + 2.3.2 sandbox-bom @@ -147,7 +147,7 @@ org.jreleaser jreleaser-maven-plugin - 1.7.0 + 1.8.0 release-assets diff --git a/sandbox-cli/pom.xml b/sandbox-cli/pom.xml index 329940f3..32391598 100644 --- a/sandbox-cli/pom.xml +++ b/sandbox-cli/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 2.3.1 + 2.3.2 4.0.0 @@ -19,17 +19,17 @@ com.github.nbbrd.sandbox sandbox-api - 2.3.1 + 2.3.2 com.github.nbbrd.sandbox sandbox-impl - 2.3.1 + 2.3.2 info.picocli picocli - 4.7.4 + 4.7.5 diff --git a/sandbox-desktop/pom.xml b/sandbox-desktop/pom.xml index 6087a51c..d14fcd06 100644 --- a/sandbox-desktop/pom.xml +++ b/sandbox-desktop/pom.xml @@ -7,7 +7,7 @@ sandbox-parent com.github.nbbrd.sandbox - 2.3.1 + 2.3.2 sandbox-desktop @@ -20,12 +20,12 @@ com.github.nbbrd.sandbox sandbox-api - 2.3.1 + 2.3.2 com.github.nbbrd.sandbox sandbox-impl - 2.3.1 + 2.3.2 com.github.nbbrd.java-desktop-util diff --git a/sandbox-impl/pom.xml b/sandbox-impl/pom.xml index 08da7387..08c8b904 100644 --- a/sandbox-impl/pom.xml +++ b/sandbox-impl/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 2.3.1 + 2.3.2 4.0.0 @@ -19,7 +19,7 @@ com.github.nbbrd.sandbox sandbox-api - 2.3.1 + 2.3.2 com.github.lalyos