Skip to content
This repository has been archived by the owner on Jan 20, 2025. It is now read-only.

Commit

Permalink
Change OSGi manifest entries to import guava 15.0 or greater
Browse files Browse the repository at this point in the history
  • Loading branch information
sprynter committed Jun 25, 2015
1 parent 1613b14 commit 9320b2d
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-parent</artifactId>
Expand All @@ -17,7 +17,7 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
<scm>
<connection>scm:git:[email protected]:FasterXML/jackson-datatype-guava.git</connection>
<developerConnection>scm:git:[email protected]:FasterXML/jackson-datatype-guava.git</developerConnection>
<url>http://github.com/FasterXML/jackson-datatype-guava</url>
<url>http://github.com/FasterXML/jackson-datatype-guava</url>
<tag>HEAD</tag>
</scm>

Expand All @@ -31,18 +31,21 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
<properties>
<version.jackson>2.6.0-rc2</version.jackson>

<version.guava>15.0</version.guava>
<version.guava.osgi>${version.guava}.0</version.guava.osgi>

<!-- Generate PackageVersion.java into this directory. -->
<packageVersion.dir>com/fasterxml/jackson/datatype/guava</packageVersion.dir>
<packageVersion.package>${project.groupId}.guava</packageVersion.package>
<osgi.export>${project.groupId}.guava;version=${project.version},
${project.groupId}.guava.*;version=${project.version}
</osgi.export>
<osgi.import>
com.google.common.collect,
com.google.common.base,
com.google.common.cache,
com.google.common.hash,
com.google.common.net,
com.google.common.collect;version="${version.guava.osgi}",
com.google.common.base;version="${version.guava.osgi}",
com.google.common.cache;version="${version.guava.osgi}",
com.google.common.hash;version="${version.guava.osgi}",
com.google.common.net;version="${version.guava.osgi}",
com.fasterxml.jackson.core,
com.fasterxml.jackson.core.util,
com.fasterxml.jackson.databind,
Expand Down Expand Up @@ -73,7 +76,7 @@ com.fasterxml.jackson.databind.util
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>15.0</version>
<version>${version.guava}</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit 9320b2d

Please sign in to comment.