Skip to content

Commit 6b608d0

Browse files
velovelo
authored
Sorted all poms and include sortpom to enforce pom layout (OpenFeign#814)
1 parent cca0cad commit 6b608d0

19 files changed

Lines changed: 697 additions & 108 deletions

File tree

‎example-github/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1918
<modelVersion>4.0.0</modelVersion>
2019

2120
<parent>

‎example-wikipedia/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@
1414
the License.
1515
1616
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1918
<modelVersion>4.0.0</modelVersion>
2019

21-
2220
<parent>
2321
<groupId>io.github.openfeign</groupId>
2422
<artifactId>parent</artifactId>
2523
<version>10.0.2-SNAPSHOT</version>
2624
</parent>
27-
25+
2826
<groupId>io.github.openfeign</groupId>
2927
<artifactId>feign-example-wikipedia</artifactId>
3028
<packaging>jar</packaging>

‎gson/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright 2012-2018 The Feign Authors

‎httpclient/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright 2012-2018 The Feign Authors

‎hystrix/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright 2012-2018 The Feign Authors

‎jackson-jaxb/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright 2012-2018 The Feign Authors

‎jackson/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright 2012-2018 The Feign Authors

‎java11/pom.xml‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -15,73 +15,73 @@
1515
1616
-->
1717
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18-
<parent>
19-
<groupId>io.github.openfeign</groupId>
20-
<artifactId>parent</artifactId>
21-
<version>10.0.2-SNAPSHOT</version>
22-
</parent>
23-
<modelVersion>4.0.0</modelVersion>
18+
<modelVersion>4.0.0</modelVersion>
19+
<parent>
20+
<groupId>io.github.openfeign</groupId>
21+
<artifactId>parent</artifactId>
22+
<version>10.0.2-SNAPSHOT</version>
23+
</parent>
2424

25-
<artifactId>feign-java11</artifactId>
26-
<name>Feign Java 11</name>
27-
<description>Feign Java 11</description>
25+
<artifactId>feign-java11</artifactId>
26+
<name>Feign Java 11</name>
27+
<description>Feign Java 11</description>
2828

29-
<properties>
30-
<!-- override default bytecode version for src/main from parent pom -->
31-
<main.java.version>11</main.java.version>
32-
<main.signature.artifact>java18</main.signature.artifact>
33-
<main.basedir>${project.basedir}/..</main.basedir>
34-
<maven.compiler.source>11</maven.compiler.source>
35-
<maven.compiler.target>11</maven.compiler.target>
36-
</properties>
29+
<properties>
30+
<!-- override default bytecode version for src/main from parent pom -->
31+
<main.java.version>11</main.java.version>
32+
<main.signature.artifact>java18</main.signature.artifact>
33+
<main.basedir>${project.basedir}/..</main.basedir>
34+
<maven.compiler.source>11</maven.compiler.source>
35+
<maven.compiler.target>11</maven.compiler.target>
36+
</properties>
3737

38-
<dependencies>
39-
<dependency>
40-
<groupId>${project.groupId}</groupId>
41-
<artifactId>feign-core</artifactId>
42-
</dependency>
43-
<dependency>
44-
<groupId>${project.groupId}</groupId>
45-
<artifactId>feign-jackson</artifactId>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>com.squareup.okhttp3</groupId>
50-
<artifactId>mockwebserver</artifactId>
51-
<scope>test</scope>
52-
</dependency>
38+
<dependencies>
39+
<dependency>
40+
<groupId>${project.groupId}</groupId>
41+
<artifactId>feign-core</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>${project.groupId}</groupId>
45+
<artifactId>feign-jackson</artifactId>
46+
<scope>test</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>com.squareup.okhttp3</groupId>
50+
<artifactId>mockwebserver</artifactId>
51+
<scope>test</scope>
52+
</dependency>
5353

54-
<dependency>
55-
<groupId>org.assertj</groupId>
56-
<artifactId>assertj-core</artifactId>
57-
<scope>test</scope>
58-
</dependency>
59-
<dependency>
60-
<groupId>junit</groupId>
61-
<artifactId>junit</artifactId>
62-
<scope>test</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>io.github.openfeign</groupId>
66-
<artifactId>feign-core</artifactId>
67-
<version>${project.version}</version>
68-
<classifier>tests</classifier>
69-
<type>jar</type>
70-
<scope>test</scope>
71-
</dependency>
72-
</dependencies>
54+
<dependency>
55+
<groupId>org.assertj</groupId>
56+
<artifactId>assertj-core</artifactId>
57+
<scope>test</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>junit</groupId>
61+
<artifactId>junit</artifactId>
62+
<scope>test</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>io.github.openfeign</groupId>
66+
<artifactId>feign-core</artifactId>
67+
<version>${project.version}</version>
68+
<classifier>tests</classifier>
69+
<type>jar</type>
70+
<scope>test</scope>
71+
</dependency>
72+
</dependencies>
7373

74-
<build>
74+
<build>
7575
<plugins>
7676
<plugin>
7777
<groupId>org.codehaus.mojo</groupId>
7878
<artifactId>animal-sniffer-maven-plugin</artifactId>
7979
<configuration>
80-
<!-- skipping execution, as plugin is not able to handle java 11 -->
81-
<skip>true</skip>
80+
<!-- skipping execution, as plugin is not able to handle java 11 -->
81+
<skip>true</skip>
8282
</configuration>
8383
</plugin>
8484

8585
</plugins>
86-
</build>
86+
</build>
8787
</project>

‎java8/pom.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
1616
-->
1717
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18-
<parent>
19-
<artifactId>parent</artifactId>
20-
<groupId>io.github.openfeign</groupId>
21-
<version>10.0.2-SNAPSHOT</version>
22-
</parent>
23-
<modelVersion>4.0.0</modelVersion>
24-
25-
<!-- remove after feign 10.0 release -->
26-
<artifactId>feign-java8</artifactId>
27-
<name>Feign Java 8</name>
28-
<description>Feign Java 8</description>
29-
30-
<properties>
31-
<main.basedir>${project.basedir}/..</main.basedir>
32-
</properties>
18+
<modelVersion>4.0.0</modelVersion>
19+
<parent>
20+
<groupId>io.github.openfeign</groupId>
21+
<artifactId>parent</artifactId>
22+
<version>10.0.2-SNAPSHOT</version>
23+
</parent>
24+
25+
<!-- remove after feign 10.0 release -->
26+
<artifactId>feign-java8</artifactId>
27+
<name>Feign Java 8</name>
28+
<description>Feign Java 8</description>
29+
30+
<properties>
31+
<main.basedir>${project.basedir}/..</main.basedir>
32+
</properties>
3333

3434
<distributionManagement>
3535
<relocation>

‎jaxb/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
34
Copyright 2012-2018 The Feign Authors

0 commit comments

Comments
 (0)