Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-430 - Using Jackson version property from build parent.

Browse Source 
Removed custom dependency from Spring 4 profile as it's already included in the parent pom.
This commit is contained in:
Oliver Gierke
2014-01-22 15:03:51 +01:00
parent 6822f39e3b
commit 26c4f2dd87
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pom.xml
View File

@@ -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>

4
template.mf
View File

@@ -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)}",