Skip to content

Commit 02d9737

Browse files
kdavisk6kdavisk6
authored
Restoring removed modules and adding examples (OpenFeign#794)
Jaxb, Jackson Jaxb and the example projects were removed from the parent pom file. Adding them back in so the are managed again.
1 parent 2ef9058 commit 02d9737

3 files changed

Lines changed: 25 additions & 2 deletions

File tree

‎example-github/pom.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,21 @@
1818
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
2020

21+
<parent>
22+
<groupId>io.github.openfeign</groupId>
23+
<artifactId>parent</artifactId>
24+
<version>10.0.2-SNAPSHOT</version>
25+
</parent>
26+
2127
<groupId>io.github.openfeign</groupId>
2228
<artifactId>feign-example-github</artifactId>
2329
<packaging>jar</packaging>
24-
<version>10.0.0-SNAPSHOT</version>
2530
<name>GitHub Example</name>
2631

32+
<properties>
33+
<main.basedir>${project.basedir}/..</main.basedir>
34+
</properties>
35+
2736
<dependencies>
2837
<dependency>
2938
<groupId>io.github.openfeign</groupId>

‎example-wikipedia/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,22 @@
1818
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1919
<modelVersion>4.0.0</modelVersion>
2020

21+
22+
<parent>
23+
<groupId>io.github.openfeign</groupId>
24+
<artifactId>parent</artifactId>
25+
<version>10.0.2-SNAPSHOT</version>
26+
</parent>
27+
2128
<groupId>io.github.openfeign</groupId>
2229
<artifactId>feign-example-wikipedia</artifactId>
2330
<packaging>jar</packaging>
24-
<version>10.0.0-SNAPSHOT</version>
2531
<name>Wikipedia Example</name>
2632

33+
<properties>
34+
<main.basedir>${project.basedir}/..</main.basedir>
35+
</properties>
36+
2737
<dependencies>
2838
<dependency>
2939
<groupId>io.github.openfeign</groupId>

‎pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@
2828
<module>httpclient</module>
2929
<module>hystrix</module>
3030
<module>jackson</module>
31+
<module>jackson-jaxb</module>
32+
<module>jaxb</module>
3133
<module>jaxrs</module>
3234
<module>jaxrs2</module>
3335
<module>okhttp</module>
3436
<module>ribbon</module>
3537
<module>sax</module>
3638
<module>slf4j</module>
39+
<module>example-github</module>
40+
<module>example-wikipedia</module>
3741
<!-- remove after feign 10.0 release -->
3842
<module>java8</module>
3943
<module>mock</module>

0 commit comments

Comments
 (0)