[jackson-jaxrs-providers] 69/162: Fixed #12

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository jackson-jaxrs-providers.

commit 1f2046903b7d42f47d8586c6efcfe91e17f5922a
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date:   Mon May 20 09:51:04 2013 -0700

    Fixed #12
---
 base/pom.xml          | 22 ++++++----------------
 json/pom.xml          |  2 ++
 release-notes/CREDITS | 18 ++++++++++++++++++
 release-notes/VERSION |  2 ++
 smile/pom.xml         |  2 ++
 xml/pom.xml           |  2 ++
 6 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/base/pom.xml b/base/pom.xml
index 005fbee..037f45b 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- |  Copyright 2012 FasterXML.com
- |
- |  Licensed under the Apache License, Version 2.0 (the "License");
- |  you may not use this file except in compliance with the License.
- |  You may obtain a copy of the License at
- |
- |  http://www.apache.org/licenses/LICENSE-2.0
- |
- |  Unless required by applicable law or agreed to in writing, software
- |  distributed under the License is distributed on an "AS IS" BASIS,
- |  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- |  See the License for the specific language governing permissions and
- |  limitations under the License.
--->
 <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> 
@@ -30,7 +15,12 @@ providers.
   </description>
 
   <properties>
-    <osgi.export>${project.groupId}.base.*;version=${project.version}</osgi.export>
+    <osgi.export>
+${project.groupId}.annotation.*;version=${project.version}
+${project.groupId}.base.*;version=${project.version}
+${project.groupId}.cfg.*;version=${project.version}
+${project.groupId}.util.*;version=${project.version}
+</osgi.export>
     <osgi.import>com.fasterxml.jackson.annotation
 ,com.fasterxml.jackson.core
 ,com.fasterxml.jackson.core.type
diff --git a/json/pom.xml b/json/pom.xml
index e571122..aeb6d25 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -47,6 +47,8 @@
 ,com.fasterxml.jackson.databind.introspect
 ,com.fasterxml.jackson.databind.type
 ,com.fasterxml.jackson.databind.util
+,com.fasterxml.jackson.jaxrs.base
+,com.fasterxml.jackson.jaxrs.cfg
 ,com.fasterxml.jackson.module.jaxb;resolution:=optional
 </osgi.import>
   </properties>
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
new file mode 100644
index 0000000..fee6923
--- /dev/null
+++ b/release-notes/CREDITS
@@ -0,0 +1,18 @@
+Here are people who have contributed to development Jackson JSON process 
+core component, version 2.x
+(version numbers in brackets indicate release in which the problem was fixed)
+
+(note: for older credits, check out release notes for 1.x versions)
+
+Tatu Saloranta, tatu.saloranta at iki.fi: author
+
+Bill Burke:
+
+* Reported #11: ContextResolvers don't work for ObjectMapper due over-aggressive caching
+ (and provided samples that show how to fix it)
+ (2.2.2)
+
+Matt Bishop:
+
+* Reported #12: Missing OSGi imports
+ (2.2.2)
diff --git a/release-notes/VERSION b/release-notes/VERSION
index e7586de..ac6f818 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -9,6 +9,8 @@ Changes:
 
 #11: ContextResolvers don't work for ObjectMapper due over-aggressive caching
  (reported by Bill Burke (from Resteasy))
+#12: OSGi imports missing dependency from json/smile/xml to base package
+ (reported by Matt Bishop)
 
 ------------------------------------------------------------------------
 === History: ===
diff --git a/smile/pom.xml b/smile/pom.xml
index c145f56..da04be4 100644
--- a/smile/pom.xml
+++ b/smile/pom.xml
@@ -47,6 +47,8 @@
 ,com.fasterxml.jackson.databind.introspect
 ,com.fasterxml.jackson.databind.type
 ,com.fasterxml.jackson.databind.util
+,com.fasterxml.jackson.jaxrs.base
+,com.fasterxml.jackson.jaxrs.cfg
 ,com.fasterxml.jackson.module.jaxb;resolution:=optional
 </osgi.import>
   </properties>
diff --git a/xml/pom.xml b/xml/pom.xml
index 81a3377..23018bb 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -47,6 +47,8 @@
 ,com.fasterxml.jackson.databind.introspect
 ,com.fasterxml.jackson.databind.type
 ,com.fasterxml.jackson.databind.util
+,com.fasterxml.jackson.jaxrs.base
+,com.fasterxml.jackson.jaxrs.cfg
 ,com.fasterxml.jackson.module.jaxb;resolution:=optional
 </osgi.import>
   </properties>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git