From 26c4f2dd87e1a45297d30cba1e5b611a5a4502e4 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Wed, 22 Jan 2014 15:03:51 +0100
Subject: [PATCH] DATACMNS-430 - Using Jackson version property from build
 parent.

Removed custom dependency from Spring 4 profile as it's already included in the parent pom.
---
 pom.xml     | 21 +++------------------
 template.mf |  4 ++--
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index fc0d9672b..3fd108b31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,26 +17,11 @@
 	</parent>
 	
 	<properties>
-		<jackson>1.9.7</jackson>
-		<jackson2>2.2.2</jackson2>
+		<jackson1>1.9.7</jackson1>
 		<springhateoas>0.9.0.BUILD-SNAPSHOT</springhateoas>
 		<dist.key>DATACMNS</dist.key>
 	</properties>
 	
-	<profiles>
-		<profile>
-			<id>spring4</id>
-			<dependencies>
-				<dependency>
-					<groupId>javax.servlet</groupId>
-					<artifactId>javax.servlet-api</artifactId>
-					<version>3.0.1</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
-	
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -75,13 +60,13 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>${jackson}</version>
+			<version>${jackson1}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>${jackson2}</version>
+			<version>${jackson}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/template.mf b/template.mf
index 683eb989e..ca1b67044 100644
--- a/template.mf
+++ b/template.mf
@@ -5,13 +5,13 @@ Bundle-ManifestVersion: 2
 Import-Package: 
  sun.reflect;version="0";resolution:=optional
 Import-Template:
- com.fasterxml.jackson.databind.*;version="${jackson2:[=.=.=,+1.0.0)}";resolution:=optional,
+ com.fasterxml.jackson.databind.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
  com.mysema.query.*;version="${querydsl:[=.=.=,+1.0.0)}";resolution:=optional,
  javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
  javax.inject.*;version="[1.0.0,2.0.0)";resolution:=optional,
  javax.xml.bind.*;version="0";resolution:=optional,
  javax.xml.transform.*;version="0";resolution:=optional,
- org.codehaus.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
+ org.codehaus.jackson.*;version="${jackson1:[=.=.=,+1.0.0)}";resolution:=optional,
  org.springframework.aop.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
  org.springframework.beans.*;version="${spring:[=.=.=,+1.1.0)}",
  org.springframework.core.*;version="${spring:[=.=.=,+1.1.0)}",