diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..cbda6d4 --- /dev/null +++ b/.config/checkstyle/checkstyle.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.config/checkstyle/suppressions.xml b/.config/checkstyle/suppressions.xml new file mode 100644 index 0000000..16d385e --- /dev/null +++ b/.config/checkstyle/suppressions.xml @@ -0,0 +1,6 @@ + + + + diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index c7fc6c2..2d5f3e8 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -6,10 +6,16 @@ on: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' + - 'assets/**' pull_request: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' + - 'assets/**' env: PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }} @@ -28,7 +34,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -56,8 +62,29 @@ jobs: fi - name: Upload demo files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: demo-files-java-${{ matrix.java }} path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar if-no-files-found: error + + code-style: + runs-on: ubuntu-latest + + strategy: + matrix: + java: [17] + distribution: [temurin] + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java }} + cache: 'maven' + + - name: Run Checkstyle + run: mvn -B checkstyle:check -P checkstyle -T2C diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2560e3..ae1e113 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -105,10 +105,10 @@ jobs: ${{ env.PRIMARY_MAVEN_MODULE }} ${{ steps.version.outputs.release }} + ``` ### Additional notes * [Spring-Boot] You may have to include ``software/xdev`` inside [``vaadin.whitelisted-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages) - ``` publish_central: # Publish the code to central runs-on: ubuntu-latest @@ -123,7 +123,7 @@ jobs: git pull - name: Set up JDK Apache Maven Central - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' distribution: 'temurin' @@ -155,7 +155,7 @@ jobs: git pull - name: Setup - Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -166,7 +166,7 @@ jobs: working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} - name: Upload licenses - Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dependencies-licenses path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index f7c82af..7600223 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -6,14 +6,16 @@ on: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' - 'assets/**' - - 'config/**' pull_request: types: [opened, synchronize, reopened] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' - 'assets/**' - - 'config/**' env: SONARCLOUD_ORG: ${{ github.event.organization.login }} @@ -31,7 +33,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index d2a8e2f..0bf5779 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK OSSRH - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' java-version: '17' diff --git a/.gitignore b/.gitignore index 3e7a31d..8c3a529 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,8 @@ vite.generated.ts /*/frontend/generated/ /*/frontend/index.html /*/src/main/dev-bundle/ +/*/src/main/bundles/ +*.lock #custom .flattened-pom.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml index f68c212..9a5d4ff 100644 --- a/.idea/checkstyle-idea.xml +++ b/.idea/checkstyle-idea.xml @@ -1,7 +1,7 @@ - 10.1 + 10.12.5 JavaOnlyWithTests true true @@ -13,7 +13,7 @@ (bundled) (bundled) - $PROJECT_DIR$/config/checkstyle/checkstyle.xml + $PROJECT_DIR$/.config/checkstyle/checkstyle.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index ffd40bd..65b8cb4 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -17,6 +17,8 @@ + + diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml deleted file mode 100644 index 710e3e6..0000000 --- a/config/checkstyle/checkstyle.xml +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 3d8e3e2..abd690a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,4 +26,23 @@ repo + + + + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + true + + + + + + diff --git a/vaadin-chip-combobox-demo/pom.xml b/vaadin-chip-combobox-demo/pom.xml index a557e5d..ca5d7ab 100644 --- a/vaadin-chip-combobox-demo/pom.xml +++ b/vaadin-chip-combobox-demo/pom.xml @@ -26,9 +26,9 @@ software.xdev.vaadin.Application - 24.2.2 + 24.3.2 - 3.1.5 + 3.2.1 @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${maven.compiler.release} @@ -172,6 +172,34 @@ + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + ../.config/checkstyle/checkstyle.xml + + + + + check + + + + + + + - diff --git a/vaadin-chip-combobox/pom.xml b/vaadin-chip-combobox/pom.xml index 8eedb26..0ceb310 100644 --- a/vaadin-chip-combobox/pom.xml +++ b/vaadin-chip-combobox/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.2.2 + 24.3.2 @@ -155,7 +155,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${maven.compiler.release} @@ -166,7 +166,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.2 + 3.6.3 attach-javadocs @@ -265,5 +265,34 @@ + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + ../.config/checkstyle/checkstyle.xml + + + + + check + + + + + + +