Skip to content

Commit 58f200f

Browse files
committed
DATAMONGO-335 - Set up hybrid Spring 3.1/3.0.6 build.
Also see DATACMNS-103.
1 parent 8718700 commit 58f200f

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

spring-data-mongodb-cross-store/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.springframework</groupId>
2525
<artifactId>spring-aspects</artifactId>
26-
<version>${org.springframework.version}</version>
26+
<version>${org.springframework.version.range}</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.springframework</groupId>

spring-data-mongodb-parent/pom.xml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
<org.mockito.version>1.8.4</org.mockito.version>
1717
<org.slf4j.version>1.5.10</org.slf4j.version>
1818
<org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
19-
<org.springframework.version>3.0.6.RELEASE</org.springframework.version>
19+
<org.springframework.version.30>3.0.6.RELEASE</org.springframework.version.30>
20+
<org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
21+
<org.springframework.version.range>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version.range>
2022
<data.commons.version>1.2.0.BUILD-SNAPSHOT</data.commons.version>
2123
<aspectj.version>1.6.11.RELEASE</aspectj.version>
2224
</properties>
@@ -92,42 +94,42 @@
9294
<dependency>
9395
<groupId>org.springframework</groupId>
9496
<artifactId>spring-aop</artifactId>
95-
<version>${org.springframework.version}</version>
97+
<version>${org.springframework.version.range}</version>
9698
</dependency>
9799
<dependency>
98100
<groupId>org.springframework</groupId>
99101
<artifactId>spring-beans</artifactId>
100-
<version>${org.springframework.version}</version>
102+
<version>${org.springframework.version.range}</version>
101103
</dependency>
102104
<dependency>
103105
<groupId>org.springframework</groupId>
104106
<artifactId>spring-core</artifactId>
105-
<version>${org.springframework.version}</version>
107+
<version>${org.springframework.version.range}</version>
106108
</dependency>
107109
<dependency>
108110
<groupId>org.springframework</groupId>
109111
<artifactId>spring-tx</artifactId>
110-
<version>${org.springframework.version}</version>
112+
<version>${org.springframework.version.range}</version>
111113
</dependency>
112114
<dependency>
113115
<groupId>org.springframework</groupId>
114116
<artifactId>spring-orm</artifactId>
115-
<version>${org.springframework.version}</version>
117+
<version>${org.springframework.version.range}</version>
116118
</dependency>
117119
<dependency>
118120
<groupId>org.springframework</groupId>
119121
<artifactId>spring-web</artifactId>
120-
<version>${org.springframework.version}</version>
122+
<version>${org.springframework.version.range}</version>
121123
</dependency>
122124
<dependency>
123125
<groupId>org.springframework</groupId>
124126
<artifactId>spring-expression</artifactId>
125-
<version>${org.springframework.version}</version>
127+
<version>${org.springframework.version.range}</version>
126128
</dependency>
127129
<dependency>
128130
<groupId>org.springframework</groupId>
129131
<artifactId>spring-test</artifactId>
130-
<version>${org.springframework.version}</version>
132+
<version>${org.springframework.version.range}</version>
131133
<scope>test</scope>
132134
</dependency>
133135

spring-data-mongodb/template.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Import-Package:
77
Export-Template:
88
org.springframework.data.mongodb.*;version="${project.version}"
99
Import-Template:
10-
org.springframework.*;version="${org.springframework.version:[=.=.=.=,+1.0.0)}",
10+
org.springframework.*;version="${org.springframework.version.30:[=.=.=.=,+1.0.0)}",
1111
org.springframework.data.*;version="${data.commons.version:[=.=.=.=,+1.0.0)}",
1212
org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
1313
com.mongodb.*;version="${mongo.version:[=.=,+1.0.0)}",

0 commit comments

Comments
 (0)