You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2015/02/02 09:58:52 UTC
svn commit: r1656417 - in /turbine/fulcrum/trunk/json: ./
gson/src/java/org/apache/fulcrum/json/gson/
jackson/src/java/org/apache/fulcrum/json/jackson/
jackson2/src/java/org/apache/fulcrum/json/jackson/
Author: gk
Date: Mon Feb 2 08:58:52 2015
New Revision: 1656417
URL: http://svn.apache.org/r1656417
Log:
- Update invalid maven assembler plugin option in parent pom
- Instantiate with Constructor to get InvocationTargetException
Modified:
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
turbine/fulcrum/trunk/json/pom.xml
Modified: turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java?rev=1656417&r1=1656416&r2=1656417&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java (original)
+++ turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java Mon Feb 2 08:58:52 2015
@@ -138,7 +138,7 @@ public class GSONBuilderService extends
@Override
public JsonService addAdapter(String name, Class target, Class adapter)
throws Exception {
- gson.registerTypeAdapter(target, adapter.newInstance());
+ gson.registerTypeAdapter(target, adapter.getConstructor().newInstance());
return null;
}
Modified: turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java?rev=1656417&r1=1656416&r2=1656417&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java (original)
+++ turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java Mon Feb 2 08:58:52 2015
@@ -385,7 +385,7 @@ public class JacksonMapperService extend
String avClass = annotationInspectors.get(key);
if (key.equals("primary") && avClass != null) {
try {
- primary = (AnnotationIntrospector) Class.forName(avClass)
+ primary = (AnnotationIntrospector) Class.forName(avClass).getConstructor()
.newInstance();
} catch (Exception e) {
throw new Exception(
@@ -394,7 +394,7 @@ public class JacksonMapperService extend
}
} else if (key.equals("secondary") && avClass != null) {
try {
- secondary = (AnnotationIntrospector) Class.forName(avClass)
+ secondary = (AnnotationIntrospector) Class.forName(avClass).getConstructor()
.newInstance();
} catch (Exception e) {
throw new Exception(
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=1656417&r1=1656416&r2=1656417&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 Mon Feb 2 08:58:52 2015
@@ -512,7 +512,7 @@ public class Jackson2MapperService exten
String avClass = annotationInspectors.get(key);
if (key.equals("primary") && avClass != null) {
try {
- primary = (AnnotationIntrospector) Class.forName(avClass)
+ primary = (AnnotationIntrospector) Class.forName(avClass).getConstructor()
.newInstance();
} catch (Exception e) {
throw new Exception(
@@ -521,7 +521,7 @@ public class Jackson2MapperService exten
}
} else if (key.equals("secondary") && avClass != null) {
try {
- secondary = (AnnotationIntrospector) Class.forName(avClass)
+ secondary = (AnnotationIntrospector) Class.forName(avClass).getConstructor()
.newInstance();
} catch (Exception e) {
throw new Exception(
Modified: turbine/fulcrum/trunk/json/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1656417&r1=1656416&r2=1656417&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Mon Feb 2 08:58:52 2015
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
<executions>
<execution>
<id>fulcrum-source-release-assembly</id>
@@ -114,7 +114,7 @@
<descriptors>
<descriptor>src/assembly/project.xml</descriptor>
</descriptors>
- <tarLongFileFormat>gnu</tarLongFileFormat>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>