From 91d84213c909edeff2258b436eef8131721788b0 Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Mon, 7 Oct 2024 11:59:07 -0300 Subject: [PATCH] Use recommended_2008_06 on sortpom --- apt-test-generator/pom.xml | 6 +- benchmark/pom.xml | 4 +- example-github-with-coroutine/pom.xml | 4 +- example-github/pom.xml | 4 +- example-wikipedia/pom.xml | 4 +- jakarta/pom.xml | 14 +- jaxrs/pom.xml | 2 +- jaxrs2/pom.xml | 2 +- kotlin/pom.xml | 4 +- okhttp/pom.xml | 2 +- pom.xml | 178 ++++---- spring4/pom.xml | 22 +- src/config/pomSortOrder.xml | 562 -------------------------- 13 files changed, 123 insertions(+), 685 deletions(-) delete mode 100644 src/config/pomSortOrder.xml diff --git a/apt-test-generator/pom.xml b/apt-test-generator/pom.xml index 8ca20444d..79e57883b 100644 --- a/apt-test-generator/pom.xml +++ b/apt-test-generator/pom.xml @@ -106,10 +106,10 @@ 3.6.0 - package shade + package @@ -130,10 +130,10 @@ - package really-executable-jar + package @@ -176,10 +176,10 @@ - post-integration-test build + post-integration-test diff --git a/benchmark/pom.xml b/benchmark/pom.xml index b1f0b23de..51e7f74a3 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -140,10 +140,10 @@ 3.6.0 - package shade + package @@ -164,10 +164,10 @@ - package really-executable-jar + package diff --git a/example-github-with-coroutine/pom.xml b/example-github-with-coroutine/pom.xml index da03f3a08..4580fff5a 100644 --- a/example-github-with-coroutine/pom.xml +++ b/example-github-with-coroutine/pom.xml @@ -61,10 +61,10 @@ 3.6.0 - package shade + package @@ -85,10 +85,10 @@ - package really-executable-jar + package diff --git a/example-github/pom.xml b/example-github/pom.xml index 42e1cba70..d2bcb2e33 100644 --- a/example-github/pom.xml +++ b/example-github/pom.xml @@ -57,10 +57,10 @@ 3.6.0 - package shade + package @@ -81,10 +81,10 @@ - package really-executable-jar + package diff --git a/example-wikipedia/pom.xml b/example-wikipedia/pom.xml index 4eabc2c36..ddcdc0ccf 100644 --- a/example-wikipedia/pom.xml +++ b/example-wikipedia/pom.xml @@ -58,10 +58,10 @@ 3.6.0 - package shade + package @@ -82,10 +82,10 @@ - package really-executable-jar + package diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 4c79e4964..cd9e45044 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -27,13 +27,6 @@ Feign Jakarta Feign Jakarta - - 11 - ${project.basedir}/.. - - true - - ${project.groupId} @@ -41,6 +34,13 @@ + + 11 + ${project.basedir}/.. + + true + + ${project.groupId} diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index 4e8133816..c4a3e7475 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml @@ -77,10 +77,10 @@ jakarta-ee - package run + package jakarta diff --git a/jaxrs2/pom.xml b/jaxrs2/pom.xml index 8546942d6..9989801c8 100644 --- a/jaxrs2/pom.xml +++ b/jaxrs2/pom.xml @@ -122,10 +122,10 @@ jakarta-ee - package run + package jakarta diff --git a/kotlin/pom.xml b/kotlin/pom.xml index 326d7abde..11f74c11d 100644 --- a/kotlin/pom.xml +++ b/kotlin/pom.xml @@ -126,17 +126,17 @@ java-compile - compile compile + compile java-test-compile - test-compile testCompile + test-compile diff --git a/okhttp/pom.xml b/okhttp/pom.xml index a5f1ada1c..237a19852 100644 --- a/okhttp/pom.xml +++ b/okhttp/pom.xml @@ -71,10 +71,10 @@ add-module-infos - package add-module-info + package diff --git a/pom.xml b/pom.xml index 8dfad807a..dc2ec79d5 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,57 @@ Feign (Parent) Feign makes writing java http clients easier + https://github.com/openfeign/feign + 2012 + + + OpenFeign + https://github.com/openfeign + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + velo + Marvin Herman Froeder + velo br at gmail dot com + about.me/velo + + + kdavisk6 + Kevin Davis + kdavisk6@gmail.com + + + + + + Adrian Cole + acole@pivotal.io + + + Spencer Gibb + spencer@gibb.us + + + Artem Labazin + xxlabaza@gmail.com + + + Tomasz Juchniewicz + tjuchniewicz@gmail.com + + + Guillaume Simard + + core @@ -71,6 +122,29 @@ feign-form-spring + + scm:git:git@github.com:OpenFeign/feign.git + scm:git:git@github.com:OpenFeign/feign.git + HEAD + https://github.com/openfeign/feign + + + + Github + https://github.com/openfeign/feign/issues + + + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + UTF-8 UTF-8 @@ -122,58 +196,6 @@ 1.2.2 1.2.2.Final - https://github.com/openfeign/feign - 2012 - - - OpenFeign - https://github.com/openfeign - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - https://github.com/openfeign/feign - scm:git:git@github.com:OpenFeign/feign.git - scm:git:git@github.com:OpenFeign/feign.git - HEAD - - - - - velo - Marvin Herman Froeder - velo br at gmail dot com - about.me/velo - - - kdavisk6 - Kevin Davis - kdavisk6@gmail.com - - - - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - - Github - https://github.com/openfeign/feign/issues - @@ -534,10 +556,10 @@ add-module-infos - package add-module-info + package @@ -554,10 +576,10 @@ default-compile - compile compile + compile ${main.java.version} ${main.java.version} @@ -565,10 +587,10 @@ default-testCompile - test-compile testCompile + test-compile true @@ -617,10 +639,10 @@ bundle-manifest - process-classes manifest + process-classes @@ -665,14 +687,6 @@ SLASHSTAR_STYLE - - - validate - - check - - - com.mycila @@ -680,6 +694,14 @@ ${license-maven-plugin.version} + + + + check + + validate + + com.marvinformatics.formatter @@ -695,10 +717,10 @@ - validate format + validate @@ -731,16 +753,16 @@ true \n - src/config/pomSortOrder.xml + recommended_2008_06 false format - verify sort + verify @@ -1075,26 +1097,4 @@ - - - - Adrian Cole - acole@pivotal.io - - - Spencer Gibb - spencer@gibb.us - - - Artem Labazin - xxlabaza@gmail.com - - - Tomasz Juchniewicz - tjuchniewicz@gmail.com - - - Guillaume Simard - - diff --git a/spring4/pom.xml b/spring4/pom.xml index 063b90ffe..a25c8b807 100644 --- a/spring4/pom.xml +++ b/spring4/pom.xml @@ -28,23 +28,23 @@ Feign Spring4 Feign Contracts for Spring4 + + + feign-spring + + + ${project.basedir}/.. 4.3.30.RELEASE - - - feign-spring - - - - - io.github.openfeign - feign-spring - ${project.version} - + + io.github.openfeign + feign-spring + ${project.version} + diff --git a/src/config/pomSortOrder.xml b/src/config/pomSortOrder.xml deleted file mode 100644 index 5494d77cd..000000000 --- a/src/config/pomSortOrder.xml +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -