8000 Allow Guava 21 to be imported in OSGi bundle · kecmu/java-driver@447e0b9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 447e0b9

Browse files
tolbertamolim7t
tolbertam
authored and
olim7t
committed
Allow Guava 21 to be imported in OSGi bundle
Also consistently use com.google.common.* for Import-Package
1 parent 109c529 commit 447e0b9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

‎driver-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
<_include>-osgi.bnd</_include>
201201
<Import-Package>
202202
<!-- JNR does not provide OSGi bundles, so exclude it; the driver can live without it -->
203-
<![CDATA[com.google.common*;version="[16.0.1,21)",!jnr.*,*]]></Import-Package>
203+
<![CDATA[com.google.common.*;version="[16.0.1,22)",!jnr.*,*]]></Import-Package>
204204
</instructions>
205205
<supportedProjectTypes>
206206
<supportedProjectType>jar</supportedProjectType>
@@ -224,7 +224,7 @@
224224
JNR does not provide OSGi bundles, so exclude it; the driver can live without it
225225
Explicitly import javax.security.cert because it's required by Netty, but Netty has been explicitly excluded
226226
-->
227-
<![CDATA[com.google.common.*;version="[16.0.1,21)",!jnr.*,!io.netty.*,javax.security.cert,*]]></Import-Package>
227+
<![CDATA[com.google.common.*;version="[16.0.1,22)",!jnr.*,!io.netty.*,javax.security.cert,*]]></Import-Package>
228228
<Private-Package>com.datastax.shaded.*</Private-Package>
229229
</instructions>
230230
</configuration>

‎driver-extras/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
<Bundle-SymbolicName>com.datastax.driver.extras</Bundle-SymbolicName>
231231
<Bundle-Version>${project.version}</Bundle-Version>
232232
<_include>-osgi.bnd</_include>
233-
<Import-Package><![CDATA[com.google.common*;version="[16.0.1,21)",*]]></Import-Package>
233+
<Import-Package><![CDATA[com.google.common.*;version="[16.0.1,22)",*]]></Import-Package>
234234
</instructions>
235235
<supportedProjectTypes>
236236
<supportedProjectType>jar</supportedProjectType>

‎driver-mapping/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<Bundle-SymbolicName>com.datastax.driver.mapping</Bundle-SymbolicName>
159159
<Bundle-Version>${project.version}</Bundle-Version>
160160
<_include>-osgi.bnd</_include>
161-
<Import-Package><![CDATA[com.google.common*;version="[16.0.1,21)",*]]></Import-Package>
161+
<Import-Package><![CDATA[com.google.common.*;version="[16.0.1,22)",*]]></Import-Package>
162162
</instructions>
163163
<supportedProjectTypes>
164164
<supportedProjectType>jar</supportedProjectType>

0 commit comments

Comments
 (0)
0