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.

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

Try to fix #160 (OSGi dep problem wrt Guava) #161

Merged
merged 3 commits into from
Sep 10, 2024

Conversation

cowtowncoder
Copy link
Member

@cowtowncoder cowtowncoder commented Sep 9, 2024

Defining OSGi min base version bit differently (as 25.1); hopefully this works.

guava/pom.xml Outdated

<javac.src.version>1.8</javac.src.version>
<javac.target.version>1.8</javac.target.version>

<!-- 31-Jul-2020, tatu: remove upper limit for Jackson 2.12; tested up to 30.x -->
<version.guava.osgi>[${version.guava}.0,99)</version.guava.osgi>
<version.guava.osgi>[${version.guava.osgi-base}, 99)</version.guava.osgi>
Copy link

Choose a reason for hiding this comment

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

A space has been added before 99- I am not sure if this is allowed in an OSGi version range selector. I would recommend to omit the space.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, that was unintentional -- I suspect it should be ok but better safe than sorry so will remove

guava/pom.xml Outdated
@@ -38,12 +38,13 @@ Guava (https://github.com/google/guava) types (currently mostly just collection
<!-- 28-Feb-2023, tatu: 2.15 raises baseline from 21.x to 23.x -->
<!-- 01-May-2023, tatu: 2.16 raises baseline from 23.x to 25.x -->
<version.guava>25.1-jre</version.guava>
<version.guava.osgi-base>25.1</version.guava.osgi-base>
Copy link

Choose a reason for hiding this comment

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

As mentioned in #160 (comment) the exact version that is used for exporting the required package in guava library is 25.1.0. Thus using this exact version string we should be safe.

@cowtowncoder
Copy link
Member Author

@jpstotz Better now? I realize testing this is difficult.

@jpstotz
Copy link

jpstotz commented Sep 10, 2024

@cowtowncoder Thanks. Thank way it should work.

@cowtowncoder
Copy link
Member Author

Ok let's just try it :)

@cowtowncoder cowtowncoder merged commit 5ad9f42 into 2.18 Sep 10, 2024
9 checks passed
@cowtowncoder cowtowncoder deleted the tatu/2.18/160-guava-osgi-version branch September 10, 2024 16:56
cowtowncoder added a commit that referenced this pull request Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants