File tree Expand file tree Collapse file tree 1 file changed +1
-11
lines changed Expand file tree Collapse file tree 1 file changed +1
-11
lines changed Original file line number Diff line number Diff line change 99
99
<maven-surefire-plugin .version>3.0.0-M4</maven-surefire-plugin .version>
100
100
<maven .compiler.release>${java.version} </maven .compiler.release>
101
101
<mockito >${mockito.version}</mockito >
102
- <<<<<<< HEAD
103
- <mockito .version>3.10.0</mockito .version>
102
+ <mockito .version>4.0.0</mockito .version>
104
103
<neo4j-java-driver .version>4.4.2</neo4j-java-driver .version>
105
104
<neo4j .version>4.3.6</neo4j .version>
106
- =======
107
- <mockito .version>4.0.0</mockito .version>
108
- <neo4j-java-driver .version>4.3.5</neo4j-java-driver .version>
109
- <neo4j .version>4.3.2</neo4j .version>
110
- >>>>>>> 4ebd4a7d1 (Update to Spring Data Commons 3.0.0 and JDK 17.)
111
105
<objenesis .version>3.0.1</objenesis .version>
112
106
<project .build.docs>${project.build.directory} /docs</project .build.docs>
113
107
<project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
118
112
<checkstyle .skip>${skipTests} </checkstyle .skip>
119
113
120
114
<skipUnitTests >${skipTests}</skipUnitTests >
121
- <<<<<<< HEAD
122
- <springdata .commons>2.7.0-SNAPSHOT</springdata .commons>
123
- =======
124
115
<springdata .commons>3.0.0-SNAPSHOT</springdata .commons>
125
- >>>>>>> 4ebd4a7d1 (Update to Spring Data Commons 3.0.0 and JDK 17.)
126
116
127
117
<spring-data-commons-docs .dir>../../../../spring-data-commons/src/main/asciidoc</spring-data-commons-docs .dir>
128
118
</properties >
You can’t perform that action at this time.
0 commit comments