diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index efb982d..c296d7c 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -12,10 +12,14 @@ jobs: packages: write steps: - uses: actions/checkout@v3 - - name: Set up Zulu 8 + - name: Set up Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.3 + - name: Set up Zulu 17 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '17' distribution: 'zulu' cache: 'maven' - name: Build with Maven diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index aec23c9..12bb3a5 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -6,10 +6,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up Zulu 8 + - name: Set up Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.3 + - name: Set up Zulu 17 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '17' distribution: 'zulu' cache: 'maven' - name: Build with Maven diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 939e677..a5b571b 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -13,10 +13,14 @@ jobs: if: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }} steps: - uses: actions/checkout@v3 - - name: Set up Zulu 8 + - name: Set up Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.3 + - name: Set up Zulu 17 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '17' distribution: 'zulu' - name: Deploy Release with Maven run: > diff --git a/.gitignore b/.gitignore index a8d4892..0737762 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ buildNumber.properties .project # JDT-specific (Eclipse Java Development Tools) .classpath +# IntelliJ +.idea diff --git a/pom.xml b/pom.xml index fc9640a..6043f6a 100644 --- a/pom.xml +++ b/pom.xml @@ -30,10 +30,10 @@ - 1.8 - 1.8 + 17 + 17 UTF-8 - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT HEAD main @@ -167,7 +167,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.51.v20230217 + 11.0.15 diff --git a/renovate.json b/renovate.json index 35d2c97..f45d8f1 100644 --- a/renovate.json +++ b/renovate.json @@ -1,13 +1,5 @@ { "extends": [ "config:base" - ], - "packageRules": [ - { - "matchPackageNames": [ - "org.eclipse.jetty:jetty-maven-plugin" - ], - "allowedVersions": "<10" - } ] -} \ No newline at end of file +}