Skip to content

Commit 3706257

Browse files
committed
ci: decomission of sortpom-maven-plugin
The following issue won't be fixed: Closes #1174 Part of #1669
1 parent 6af463b commit 3706257

File tree

3 files changed

+0
-51
lines changed

3 files changed

+0
-51
lines changed

.github/workflows/static-analysis.yml

-25
Original file line numberDiff line numberDiff line change
@@ -90,31 +90,6 @@ jobs:
9090
- name: Check license header
9191
run: ./src/main/scripts/execute-command.sh check-license
9292

93-
check-pom:
94-
name: Check pom.xml
95-
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on
96-
runs-on: ubuntu-20.04
97-
steps:
98-
- name: Clone source code
99-
uses: actions/[email protected] # https://github.com/actions/checkout
100-
with:
101-
# Whether to configure the token or SSH key with the local git config. Default: true
102-
persist-credentials: false
103-
- name: Install JDK
104-
uses: actions/[email protected] # https://github.com/actions/setup-java
105-
with:
106-
distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions
107-
java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax
108-
- name: Restore existing cache
109-
uses: actions/[email protected] # https://github.com/actions/cache
110-
with:
111-
# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action
112-
key: maven-repository-${{ hashFiles('pom.xml') }}
113-
path: ~/.m2/repository
114-
restore-keys: maven-repository-
115-
- name: Check pom.xml
116-
run: ./src/main/scripts/execute-command.sh check-pom
117-
11893
run-shellcheck:
11994
name: Run ShellCheck
12095
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on

pom.xml

-19
Original file line numberDiff line numberDiff line change
@@ -683,8 +683,6 @@
683683
<!-- Redefine default value from spring-boot-dependencies -->
684684
<slf4j.version>1.7.36</slf4j.version>
685685

686-
<sortpom.plugin.version>2.5.0</sortpom.plugin.version>
687-
688686
<spock.version>1.0-groovy-2.0</spock.version>
689687
<spotbugs.plugin.version>3.1.11</spotbugs.plugin.version>
690688

@@ -753,23 +751,6 @@
753751

754752
<plugins>
755753

756-
<plugin>
757-
<groupId>com.github.ekryd.sortpom</groupId>
758-
<artifactId>sortpom-maven-plugin</artifactId>
759-
<version>${sortpom.plugin.version}</version>
760-
<configuration>
761-
<lineSeparator>\n</lineSeparator>
762-
<predefinedSortOrder>default_0_4_0</predefinedSortOrder>
763-
<keepBlankLines>true</keepBlankLines>
764-
<indentBlankLines>true</indentBlankLines>
765-
<sortDependencies>scope,groupId,artifactId</sortDependencies>
766-
<sortPlugins>groupId,artifactId</sortPlugins>
767-
<sortProperties>true</sortProperties>
768-
<!-- Use tabs instead of spaces for indentation -->
769-
<nrOfIndentSpace>-1</nrOfIndentSpace>
770-
</configuration>
771-
</plugin>
772-
773754
<!--
774755
Usage:
775756
./mvnw spotbugs:check (checks the sources and produces report to the console)

src/main/scripts/execute-command.sh

-7
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ case ${1:-} in
2727
--batch-mode \
2828
license:check
2929
;;
30-
'check-pom')
31-
exec "$MVN" \
32-
--batch-mode \
33-
sortpom:verify \
34-
-Dsort.verifyFail=stop
35-
;;
3630
'checkstyle')
3731
exec "$MVN" \
3832
--batch-mode \
@@ -104,7 +98,6 @@ case ${1:-} in
10498
echo >&2 "Where <command> is one of:"
10599
echo >&2 '- ansible-lint'
106100
echo >&2 '- check-license'
107-
echo >&2 '- check-pom'
108101
echo >&2 '- checkstyle'
109102
echo >&2 '- codenarc'
110103
echo >&2 '- enforcer'

0 commit comments

Comments
 (0)