Skip to content

Commit a8e2261

Browse files
committed
Upgrade to 3.0 build parent and Spring Data Commons.
Remove JodaTime dependency as it's not supported anymore.
1 parent 3966ce8 commit a8e2261

File tree

4 files changed

+2
-12
lines changed

4 files changed

+2
-12
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.data.build</groupId>
1515
<artifactId>spring-data-parent</artifactId>
16-
<version>2.6.0-SNAPSHOT</version>
16+
<version>3.0.0-SNAPSHOT</version>
1717
<relativePath/>
1818
</parent>
1919

@@ -28,7 +28,7 @@
2828
<project.type>multi</project.type>
2929
<dist.id>spring-data-rest</dist.id>
3030

31-
<springdata.commons>2.6.0-SNAPSHOT</springdata.commons>
31+
<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
3232
<springdata.jpa>2.6.0-SNAPSHOT</springdata.jpa>
3333
<springdata.mongodb>3.3.0-SNAPSHOT</springdata.mongodb>
3434
<springdata.geode>2.6.0-SNAPSHOT</springdata.geode>

spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@
5959
<version>${querydsl}</version>
6060
</dependency>
6161

62-
<dependency>
63-
<groupId>joda-time</groupId>
64-
<artifactId>joda-time</artifactId>
65-
<version>${jodatime}</version>
66-
<optional>true</optional>
67-
</dependency>
68-
6962
</dependencies>
7063

7164
<build>

spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/User.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public static enum Gender {
4848
public Gender gender;
4949
public @ReadOnlyProperty EmailAddress email;
5050
public LocalDateTime java8DateTime;
51-
public org.joda.time.LocalDateTime jodaDateTime;
5251
public TypeWithPattern pattern;
5352
public @DBRef(lazy = true) List<User> colleagues;
5453
public @DBRef(lazy = true) User manager;

spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ void fulfillsConstraintsForUser() throws Exception {
128128
new Constraint("$.definitions.address.requiredProperties[0]", is("zipCode"), "Lists nested required property"));
129129
constraints.add(new Constraint("$.properties.gender.type", is("string"), "Enums are strings."));
130130
constraints.add(new Constraint("$.properties.gender.enum", is(notNullValue()), "Exposes enum values."));
131-
constraints
132-
.add(new Constraint("$.properties.jodaDateTime.format", is("date-time"), "Exposes JodaTime dates in format."));
133131
constraints
134132
.add(new Constraint("$.properties.java8DateTime.format", is("date-time"), "Exposes Java 8 dates in format."));
135133
constraints.add(new Constraint("$.properties.nicknames.type", is("array"), "Exposes collection of simple types."));

0 commit comments

Comments
 (0)