Skip to content

Commit 4164bc4

Browse files
odrotbohmodrotbohm
committed
spring-projects#297 - Upgraded to Boot 2.0 and Spring Data Kay.
Bumped version number to 2.0. Upgraded to Spring Boot 2.0. Stuff disabled in the meantime: - Cassandra: needs API adaptions in configuration - JPA > Security: test fails with weird Hibernate error - Redis > Reactive: API updates needed - Solr: configration updates necessary adjust versions Updated elastic search to the new version. Fixed the reactor version to Bismuth-BUILD-SNAPSHOT. This probably should be undone when boot references the proper bom.
1 parent 9054635 commit 4164bc4

98 files changed

Lines changed: 314 additions & 363 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cassandra/example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.data.examples</groupId>
99
<artifactId>spring-data-cassandra-examples</artifactId>
10-
<version>1.0.0.BUILD-SNAPSHOT</version>
10+
<version>2.0.0.BUILD-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

‎cassandra/example/src/main/java/example/springdata/cassandra/convert/ConverterConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.springframework.core.convert.converter.Converter;
2424
import org.springframework.data.cassandra.config.SchemaAction;
2525
import org.springframework.data.cassandra.config.java.AbstractCassandraConfiguration;
26-
import org.springframework.data.cassandra.convert.CustomConversions;
26+
import org.springframework.data.cassandra.convert.CassandraCustomConversions;
2727
import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories;
2828
import org.springframework.util.StringUtils;
2929

@@ -55,14 +55,14 @@ public SchemaAction getSchemaAction() {
5555
}
5656

5757
@Override
58-
public CustomConversions customConversions() {
58+
public CassandraCustomConversions customConversions() {
5959

6060
List<Converter<?, ?>> converters = new ArrayList<>();
6161
converters.add(new PersonWriteConverter());
6262
converters.add(new PersonReadConverter());
6363
converters.add(new CustomAddressbookReadConverter());
6464

65-
return new CustomConversions(converters);
65+
return new CassandraCustomConversions(converters);
6666
}
6767

6868
/**

‎cassandra/example/src/test/java/example/springdata/cassandra/basic/BasicUserRepositoryTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void findSavedUserById() {
7171

7272
user = repository.save(user);
7373

74-
assertThat(repository.findOne(user.getId()), is(user));
74+
assertThat(repository.findById(user.getId()), is(user));
7575
}
7676

7777
/**

‎cassandra/java8/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.data.examples</groupId>
77
<artifactId>spring-data-cassandra-examples</artifactId>
8-
<version>1.0.0.BUILD-SNAPSHOT</version>
8+
<version>2.0.0.BUILD-SNAPSHOT</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎cassandra/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.springframework.data.examples</groupId>
1010
<artifactId>spring-data-examples</artifactId>
11-
<version>1.0.0.BUILD-SNAPSHOT</version>
11+
<version>2.0.0.BUILD-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>Spring Data Cassandra - Examples</name>

‎cassandra/reactive/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.data.examples</groupId>
77
<artifactId>spring-data-cassandra-examples</artifactId>
8-
<version>1.0.0.BUILD-SNAPSHOT</version>
8+
<version>2.0.0.BUILD-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>spring-data-cassandra-reactive</artifactId>

‎cassandra/util/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.data.examples</groupId>
77
<artifactId>spring-data-cassandra-examples</artifactId>
8-
<version>1.0.0.BUILD-SNAPSHOT</version>
8+
<version>2.0.0.BUILD-SNAPSHOT</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎elasticsearch/example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.data.examples</groupId>
1515
<artifactId>spring-data-elasticsearch-examples</artifactId>
16-
<version>1.0.0.BUILD-SNAPSHOT</version>
16+
<version>2.0.0.BUILD-SNAPSHOT</version>
1717
</parent>
1818

1919
</project>

‎elasticsearch/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
<parent>
99
<groupId>org.springframework.data.examples</groupId>
1010
<artifactId>spring-data-examples</artifactId>
11-
<version>1.0.0.BUILD-SNAPSHOT</version>
11+
<version>2.0.0.BUILD-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>Spring Data Elasticsearch - Examples</name>
1515
<description>Sample projects for Spring Data Elasticsearch</description>
1616
<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
1717

1818
<properties>
19-
<elasticsearch.version>2.2.0</elasticsearch.version>
19+
<elasticsearch.version>5.4.0</elasticsearch.version>
2020
</properties>
2121

2222
<modules>

‎jpa/eclipselink/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.data.examples</groupId>
99
<artifactId>spring-data-jpa-examples</artifactId>
10-
<version>1.0.0.BUILD-SNAPSHOT</version>
10+
<version>2.0.0.BUILD-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

0 commit comments

Comments
 (0)