Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow jackson-module-jaxb-annotations to tolerate 2.2,3 in Import-Package #235

Merged
merged 8 commits into from
May 20, 2024
Merged

Allow jackson-module-jaxb-annotations to tolerate 2.2,3 in Import-Package #235

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3550948
Allow jaxb module to tolerate 2.2
JDUNNIN Jan 11, 2024
6363a59
Tolerate 2.2,3 for jaxb
JDUNNIN Jan 12, 2024
c04376b
Tolerate 2.2,3 for jaxb
JDUNNIN May 20, 2024
5d26748
Merge branch '2.16' of github.com:JDUNNIN/jackson-modules-base into 2.16
JDUNNIN May 20, 2024
31c24f5
Merge branch '2.18' of https://github.com/FasterXML/jackson-modules-b…
JDUNNIN May 20, 2024
ab91c7e
Allow jaxb module to tolerate 2.2
JDUNNIN Jan 11, 2024
01325fd
Tolerate 2.2,3 for jaxb
JDUNNIN May 20, 2024
741b05e
Merge branch '2.16' of github.com:JDUNNIN/jackson-modules-base into 2.16
JDUNNIN May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions jaxb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ for configuring data-binding.
<artifactId>jackson-databind</artifactId>
</dependency>

<!-- and actual JAXB annotations, types -->
<!-- NOTE! Despite groupId, this is "old" JAXB, not Jakarta
(3.x is real Jakarta one)
-->
<!-- Tolerate [2.2,3) for javax.xml.bind Import-Package in the generated MANIFEST.MF -->
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${version.jaxb.impl}</version>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.12</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this instead change version.jaxb.impl property?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No I don't think so as there is only a 2.3.3 or 2.3.2 available.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like version.jaxb.impl is used to get a JAXB impl for tests:

    <!-- may also need JAXB impl for tests -->
    <dependency>
      <groupId>org.glassfish.jaxb</groupId>
      <artifactId>jaxb-runtime</artifactId>
      <version>${version.jaxb.impl}</version>
      <scope>test</scope>
    </dependency>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... but that does not seem to be needed, so I think I'll comment it out.

</dependency>

<!-- 14-Mar-2019, tatu: Looks like this is needed for JDK11 and later
Expand Down