Skip to content

Commit 6ecf4f2

Browse files
authored
JAVA-26778: Changes made for Upgrade jaxb2-maven-plugin to latest version (#15220)
1 parent 564de40 commit 6ecf4f2

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

feign/pom.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@
7474
<version>${wire.mock.version}</version>
7575
<scope>test</scope>
7676
</dependency>
77+
<dependency>
78+
<groupId>jakarta.xml.bind</groupId>
79+
<artifactId>jakarta.xml.bind-api</artifactId>
80+
<version>4.0.0</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>com.sun.xml.bind</groupId>
84+
<artifactId>jaxb-impl</artifactId>
85+
<version>4.0.0</version>
86+
<scope>runtime</scope>
87+
</dependency>
7788
</dependencies>
7889

7990
<build>
@@ -85,7 +96,7 @@
8596
<plugin>
8697
<groupId>org.codehaus.mojo</groupId>
8798
<artifactId>jaxb2-maven-plugin</artifactId>
88-
<version>2.5.0</version>
99+
<version>3.1.0</version>
89100
<executions>
90101
<execution>
91102
<id>xjc</id>
@@ -131,6 +142,7 @@
131142
<feign.form.spring.version>3.8.0</feign.form.spring.version>
132143
<spring.cloud.openfeign.version>3.1.2</spring.cloud.openfeign.version>
133144
<wire.mock.version>2.33.2</wire.mock.version>
145+
<jakarta.xml.bind.version>4.0.0</jakarta.xml.bind.version>
134146
</properties>
135147

136148
</project>

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@
726726
<module>dozer</module>
727727
<module>drools</module>
728728
<module>dubbo</module>
729-
<!-- <module>feign</module> --> <!-- JAVA-20337 -->
729+
<module>feign</module>
730730
<module>gcp-firebase</module>
731731
<module>geotools</module>
732732
<module>google-auto-project</module>
@@ -970,7 +970,7 @@
970970
<module>dozer</module>
971971
<module>drools</module>
972972
<module>dubbo</module>
973-
<!-- <module>feign</module> --> <!-- JAVA-20337 -->
973+
<module>feign</module>
974974
<module>gcp-firebase</module>
975975
<module>geotools</module>
976976
<module>google-auto-project</module>

0 commit comments

Comments
 (0)