Skip to content

Commit 54294e0

Browse files
GH-2147 - Upgrade test dependencies.
During the test two issues in the docs have been found and fixed and one unused variable was noticed and removed in a test as well. This closes #2147.
1 parent 921b6f7 commit 54294e0

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

pom.xml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@
6969

7070
<properties>
7171
<apiguardian.version>1.1.0</apiguardian.version>
72-
<asciidoctor-maven-plugin.version>1.6.0</asciidoctor-maven-plugin.version>
73-
<asciidoctorj-diagram.version>2.0.5</asciidoctorj-diagram.version>
72+
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
73+
<asciidoctorj-diagram.version>2.1.0</asciidoctorj-diagram.version>
7474

7575
<byte-buddy.version>1.10.9</byte-buddy.version>
76-
<cdi>2.0</cdi>
76+
<cdi>2.0.SP1</cdi>
7777
<changelist>-SNAPSHOT</changelist>
78-
<checkstyle.version>8.29</checkstyle.version>
78+
<checkstyle.version>8.40</checkstyle.version>
7979
<cypher-dsl.version>2021.0.0</cypher-dsl.version>
8080
<dist.id>spring-data-neo4j</dist.id>
8181
<dist.key>SDNEO4J</dist.key>
@@ -84,11 +84,12 @@
8484
<java-module-name>spring.data.neo4j</java-module-name>
8585
<java.version>1.8</java.version>
8686
<jaxb.version>2.3.1</jaxb.version>
87-
<jqassistant-dashboard-plugin.version>1.8.0</jqassistant-dashboard-plugin.version>
88-
<jqassistant.plugin.version>1.8.0</jqassistant.plugin.version>
89-
<jqassistant.version>1.8.0</jqassistant.version>
87+
<jqassistant-dashboard-plugin.version>1.9.0</jqassistant-dashboard-plugin.version>
88+
<jqassistant.plugin.git.version>1.8.0</jqassistant.plugin.git.version>
89+
<jqassistant.plugin.version>1.9.0</jqassistant.plugin.version>
90+
<jqassistant.version>1.9.0</jqassistant.version>
9091
<junit-cc-testcontainer>2020.0.7</junit-cc-testcontainer>
91-
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
92+
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
9293
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
9394
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
9495
<maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
@@ -101,7 +102,7 @@
101102
<maven.compiler.source>${java.version}</maven.compiler.source>
102103
<maven.compiler.target>${java.version}</maven.compiler.target>
103104
<mockito>${mockito.version}</mockito>
104-
<mockito.version>3.2.4</mockito.version>
105+
<mockito.version>3.7.7</mockito.version>
105106
<neo4j-java-driver.version>4.2.1</neo4j-java-driver.version>
106107
<neo4j.version>4.2.3</neo4j.version>
107108
<objenesis.version>3.0.1</objenesis.version>
@@ -417,7 +418,7 @@
417418
<dependency>
418419
<groupId>de.kontext-e.jqassistant.plugin</groupId>
419420
<artifactId>jqassistant.plugin.git</artifactId>
420-
<version>${jqassistant.version}</version>
421+
<version>${jqassistant.plugin.git.version}</version>
421422
</dependency>
422423
<dependency>
423424
<groupId>org.jqassistant.contrib.plugin</groupId>
@@ -487,6 +488,7 @@
487488
<plugin>
488489
<groupId>org.apache.maven.plugins</groupId>
489490
<artifactId>maven-checkstyle-plugin</artifactId>
491+
<version>${maven-checkstyle-plugin.version}</version>
490492
<executions>
491493
<execution>
492494
<id>verify</id>

src/main/asciidoc/object-mapping/mapping.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If you do not use this annotation, your application takes a slight performance h
2424
* `@Id`: Applied at the field level to mark the field used for identity purpose.
2525
* `@GeneratedValue`: Applied at the field level together with `@Id` to specify how unique identifiers should be generated.
2626
* `@Property`: Applied at the field level to modify the mapping from attributes to properties.
27-
* `@CompositeProperty`: Applied at the field level on attributes of type Map that shall be read back as a composite. See <<composite-properties>>.
27+
* `@CompositeProperty`: Applied at the field level on attributes of type Map that shall be read back as a composite. See <<custom.conversions.composite-properties>>.
2828
* `@Relationship`: Applied at the field level to specify the details of a relationship.
2929
* `@DynamicLabels`: Applied at the field level to specify the source of dynamic labels.
3030
* `@RelationshipProperties`: Applied at the class level to indicate this class as the target for properties of a relationship.

src/main/asciidoc/object-mapping/sdc-object-mapping.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ For that we use the following algorithm:
7575
[[mapping.fundamentals.property-population.details]]
7676
.Property population internals
7777
****
78-
Similarly to our <<mapping.object-creation.details,optimizations in object construction>> we also use Spring Data runtime generated accessor classes to interact with the entity instance.
78+
Similarly to our <<mapping.fundamentals.object-creation.details,optimizations in object construction>> we also use Spring Data runtime generated accessor classes to interact with the entity instance.
7979
8080
[source,java]
8181
----

src/test/java/org/springframework/data/neo4j/documentation/repositories/custom_queries/CustomQueriesIT.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919

20-
import java.io.BufferedReader;
2120
import java.io.IOException;
22-
import java.io.InputStreamReader;
2321
import java.util.Collection;
2422
import java.util.Collections;
2523
import java.util.List;
@@ -76,9 +74,7 @@ void customRepositoryFragmentsShouldWork(
7674
@BeforeAll
7775
static void setupData(@Autowired Driver driver) throws IOException {
7876

79-
try (BufferedReader moviesReader = new BufferedReader(
80-
new InputStreamReader(CustomQueriesIT.class.getResourceAsStream("/data/movies.cypher")));
81-
Session session = driver.session()) {
77+
try (Session session = driver.session()) {
8278
session.run("MATCH (n) DETACH DELETE n").consume();
8379
session.run("MATCH (n) DETACH DELETE n").consume();
8480
CypherUtils.loadCypherFromResource("/data/movies.cypher", session);

0 commit comments

Comments
 (0)