Skip to content

Allow Guava 21 to be imported in OSGi bundle#821

Merged
olim7t merged 2 commits into
3.xfrom
guava-21-osgi
Mar 9, 2017
Merged

Allow Guava 21 to be imported in OSGi bundle#821
olim7t merged 2 commits into
3.xfrom
guava-21-osgi

Conversation

@tolbertam

Copy link
Copy Markdown
Contributor

While implementing JAVA-1328, Guava 21.0 was released. We accounted for it everywhere except in our OSGi bundle definition, this PR addresses this. Also added a test.

@tolbertam tolbertam changed the title Allow Guava 21 to imported in OSGI bundle Allow Guava 21 to imported in OSGi bundle Mar 3, 2017
@tolbertam tolbertam added this to the 3.2.0 milestone Mar 3, 2017
Comment thread driver-core/pom.xml
Explicitly import javax.security.cert because it's required by Netty, but Netty has been explicitly excluded
-->
<![CDATA[com.google.common.*;version="[16.0.1,21)",!jnr.*,!io.netty.*,javax.security.cert,*]]></Import-Package>
<![CDATA[com.google.common.*;version="[16.0.1,22)",!jnr.*,!io.netty.*,javax.security.cert,*]]></Import-Package>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I see that sometimes we use com.google.common.* and sometimes com.google.common*. Both seem to work but for consistency I'd suggest using one or the other. (Disclaimer: I might be the culprit here.)

@tolbertam tolbertam Mar 3, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

👍 on making it consistent, didn't even notice that, which would you prefer? I like com.google.common.* i think.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@tolbertam

Copy link
Copy Markdown
Contributor Author

Rebased on 3.x and squashed commits, should be ready to go.

@tolbertam tolbertam changed the title Allow Guava 21 to imported in OSGi bundle Allow Guava 21 to be imported in OSGi bundle Mar 8, 2017
Also consistently use com.google.common.* for Import-Package
@olim7t olim7t merged commit a079120 into 3.x Mar 9, 2017
@olim7t olim7t deleted the guava-21-osgi branch March 9, 2017 17:21
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.

3 participants