Merge branch 'master' into bug3345

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java

@@ -145,7 +145,7 @@ public class CompetitorDTOImpl extends NamedDTO implements CompetitorDTO, Serial
 
     @Override
     public String getSailID() {
-        return boat.getSailId();
+        return boat==null?null:boat.getSailId();
     }
     
     @Override

java/com.sap.sailing.targetplatform.base/features/target-jackson/feature.xml

@@ -62,14 +62,14 @@
          unpack="false"/>
 
    <plugin
-         id="jackson-core-lgpl"
+         id="jackson-core-asl"
          download-size="0"
          install-size="0"
          version="1.9.13"
          unpack="false"/>
 
    <plugin
-         id="jackson-mapper-lgpl"
+         id="jackson-mapper-asl"
          download-size="0"
          install-size="0"
          version="1.9.13"

java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target

@@ -82,9 +82,9 @@
 <plugin id="com.sun.jersey.contribs.jersey-multipart"/>
 <plugin id="com.sun.jersey.source"/>
 <plugin id="com.sun.mail.javax.mail"/>
-<plugin id="jackson-core-lgpl"/>
+<plugin id="jackson-core-asl"/>
 <plugin id="jackson-jaxrs"/>
-<plugin id="jackson-mapper-lgpl"/>
+<plugin id="jackson-mapper-asl"/>
 <plugin id="javax.security.auth.message"/>
 <plugin id="javax.security.auth.message.source"/>
 <plugin id="javax.servlet" version="3.1.0.v20140303-1611"/>