svn commit: r1720761 - in /turbine/fulcrum/trunk/json/jackson2: pom.xml src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java

[gk]

Author: gk
Date: Fri Dec 18 11:48:16 2015
New Revision: 1720761

URL: http://svn.apache.org/viewvc?rev=1720761&view=rev
Log:
- update to jackson 2.6.1, and yaafi 1.0.7 (caveat groupid!), use specifix 
adapter

Modified:
    turbine/fulcrum/trunk/json/jackson2/pom.xml
    
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java

Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1720761&r1=1720760&r2=1720761&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Fri Dec 18 11:48:16 2015
@@ -76,9 +76,10 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.fulcrum</groupId>
+            <!--groupId>org.apache.fulcrum</groupId-->
+            <groupId>org.apache.turbine</groupId>
             <artifactId>fulcrum-yaafi</artifactId>
-            <version>1.0.6</version>
+            <version>1.0.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -98,6 +99,6 @@
         </dependency>
     </dependencies>
     <properties>
-        <jackson2.version>2.4.5</jackson2.version>
+        <jackson2.version>2.6.1</jackson2.version>
     </properties>
 </project>

Modified: 
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java?rev=1720761&r1=1720760&r2=1720761&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
 (original)
+++ 
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
 Fri Dec 18 11:48:16 2015
@@ -201,9 +201,8 @@ public class Jackson2MapperService exten
     @Override
     public JsonService addAdapter(String name, Class target, Class mixin)
             throws Exception {
-        Module mx = new MixinModule(name, target, mixin);
         getLogger().debug("registering unversioned simple mixin module named " 
+ name + " of type " + mixin + "  for: " + target);
-        mapper.registerModule(mx);
+        mapper.addMixIn(target, mixin);
         return this;
     }