diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89f4172..b36dbfa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,34 @@ on: push: branches: - 'main' + paths-ignore: + - '.gitignore' + - ".mvn" + - "CODEOWNERS" + - "CODE_OF_CONDUCT.md" + - "CONTRIBUTING.adoc" + - "dco.txt" + - "LICENSE" + - "mvnw" + - "mvnw.cmd" + - "README.adoc" + - "security.txt" + - "*/README.adoc" pull_request: types: [ opened, synchronize, reopened, ready_for_review ] + paths-ignore: + - '.gitignore' + - ".mvn" + - "CODEOWNERS" + - "CODE_OF_CONDUCT.md" + - "CONTRIBUTING.adoc" + - "dco.txt" + - "LICENSE" + - "mvnw" + - "mvnw.cmd" + - "README.adoc" + - "security.txt" + - "*/README.adoc" jobs: build: @@ -82,6 +108,7 @@ jobs: name: Check Code Formatting runs-on: ubuntu-latest timeout-minutes: 30 + steps: - uses: actions/checkout@v3 - name: Set up JDK 11 @@ -90,9 +117,7 @@ jobs: java-version: 11 distribution: 'temurin' cache: 'maven' - - name: Format Source - run: "mvn -B formatter:format" - - name: Check for changes - run: | - [ -z "$(git status --porcelain=v1 2>/dev/null)" ] || (echo -e "::error ::Changes have been found\n$(git status --porcelain)" && exit 1) + - name: Validate Formatting + run: | + mvn -B validate -Pformat-check -Denforcer.skip=true diff --git a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/context-propagation/main/module.xml b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/context-propagation/main/module.xml index d1e0e1b..5365b61 100644 --- a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/context-propagation/main/module.xml +++ b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/context-propagation/main/module.xml @@ -22,10 +22,10 @@ - + - + diff --git a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/restclient/main/module.xml b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/restclient/main/module.xml index e67e3d0..619464b 100644 --- a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/restclient/main/module.xml +++ b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/restclient/main/module.xml @@ -22,18 +22,18 @@ - + - + - - - - - + + + + + diff --git a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/microprofile/config/main/module.xml b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/microprofile/config/main/module.xml index e7dc874..b441d9b 100644 --- a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/microprofile/config/main/module.xml +++ b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/microprofile/config/main/module.xml @@ -21,18 +21,18 @@ - + - + - - - - - - + + + + + + diff --git a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml index 7a1d205..b0221ae 100755 --- a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml +++ b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml @@ -22,25 +22,25 @@ - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-context-propagation/main/module.xml b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-context-propagation/main/module.xml index fb665f8..ad92fff 100644 --- a/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-context-propagation/main/module.xml +++ b/galleon-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-context-propagation/main/module.xml @@ -21,18 +21,18 @@ - + - + - - - - - + + + + + diff --git a/pom.xml b/pom.xml index 794a575..c3e9738 100644 --- a/pom.xml +++ b/pom.xml @@ -209,10 +209,36 @@ net.revelc.code.formatter formatter-maven-plugin + + + format-resources + process-resources + + format + + + ${project.basedir}/src/main/resources + ${project.basedir}/src/test/resources + + + net.revelc.code impsort-maven-plugin + + + sort-resource-imports + process-resources + + sort + + + ${project.basedir}/src/main/resources + ${project.basedir}/src/test/resources + + + @@ -261,6 +287,62 @@ -Djdk.io.File.enableADS=true + + format-check + + + + + net.revelc.code.formatter + formatter-maven-plugin + + + validate-format + validate + + validate + + + + validate-format-resources + validate + + validate + + + ${project.basedir}/src/main/resources + ${project.basedir}/src/test/resources + + + + + + net.revelc.code + impsort-maven-plugin + + + check-import-sort + validate + + check + + + + check-import-sort-resources + validate + + check + + + ${project.basedir}/src/main/resources + ${project.basedir}/src/test/resources + + + + + + + diff --git a/testsuite/integration-tests/src/test/resources/filtered/arquillian.xml b/testsuite/integration-tests/src/test/resources/filtered/arquillian.xml index cb79e49..3a9ed1e 100644 --- a/testsuite/integration-tests/src/test/resources/filtered/arquillian.xml +++ b/testsuite/integration-tests/src/test/resources/filtered/arquillian.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_filter.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_filter.xml index f9194df..ebe2e93 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_filter.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_filter.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - + servletContextProperty diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_servlet.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_servlet.xml index 3196dd6..f14cac7 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_servlet.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_servlet.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - + servletContextProperty diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_servlet_context_listener.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_servlet_context_listener.xml index 318e37f..4968914 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_servlet_context_listener.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_default_ordinal_servlet_context_listener.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - + diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_filter.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_filter.xml index 6a19536..23e59c8 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_filter.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_filter.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - + system diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_filter.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_filter.xml index 32b2ad8..a5d525a 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_filter.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_filter.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - + servletContextProperty diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_servlet.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_servlet.xml index f0287b3..2a26f2f 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_servlet.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_servlet.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - + servletContextProperty diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_servlet_context_listener.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_servlet_context_listener.xml index d5804eb..ced2bf2 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_servlet_context_listener.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_override_ordinal_servlet_context_listener.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - + diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_servlet.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_servlet.xml index 01ef6a7..b12aa37 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_servlet.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_servlet.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - + system diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_use_global.xml b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_use_global.xml index 1f7f442..8ed76c7 100644 --- a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_use_global.xml +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/microprofile/test/config/web_use_global.xml @@ -17,9 +17,8 @@ ~ limitations under the License. --> - +