Skip to content

Commit a2e0a50

Browse files
Andy2003Andy2003
authored
update dependencies to the latest versions (#323)
1 parent 4f01a5e commit a2e0a50

File tree

18 files changed

+393
-578
lines changed

18 files changed

+393
-578
lines changed

‎.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.jar

-49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

‎core/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>org.neo4j.driver</groupId>
2020
<artifactId>neo4j-java-driver</artifactId>
21-
<version>5.11.0</version>
21+
<version>5.23.0</version>
2222
<scope>test</scope>
2323
</dependency>
2424
<dependency>
@@ -48,12 +48,12 @@
4848
<dependency>
4949
<groupId>org.neo4j</groupId>
5050
<artifactId>neo4j-cypher-dsl</artifactId>
51-
<version>2023.9.5</version>
51+
<version>2024.0.3</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>com.graphql-java</groupId>
5555
<artifactId>graphql-java</artifactId>
56-
<version>21.5</version>
56+
<version>22.2</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.atteo</groupId>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>ch.qos.logback</groupId>
8080
<artifactId>logback-classic</artifactId>
81-
<version>1.4.12</version>
81+
<version>1.5.7</version>
8282
<scope>test</scope>
8383
</dependency>
8484
<dependency>
@@ -111,12 +111,12 @@
111111
<dependency>
112112
<groupId>org.assertj</groupId>
113113
<artifactId>assertj-core</artifactId>
114-
<version>3.24.2</version>
114+
<version>3.26.3</version>
115115
</dependency>
116116
<dependency>
117117
<groupId>org.slf4j</groupId>
118118
<artifactId>slf4j-api</artifactId>
119-
<version>2.0.7</version>
119+
<version>2.0.16</version>
120120
</dependency>
121121
</dependencies>
122122
</dependencyManagement>

‎core/src/main/kotlin/org/neo4j/graphql/Predicates.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.neo4j.cypherdsl.core.*
88
import org.neo4j.cypherdsl.core.Cypher
99
import org.slf4j.LoggerFactory
1010

11-
private fun createArrayPredicate(factory: (SymbolicName) -> Predicates.OngoingListBasedPredicateFunction) =
11+
private fun createArrayPredicate(factory: (SymbolicName) -> OngoingListBasedPredicateFunction) =
1212
{ lhs: Expression, rhs: Expression ->
1313
val x: SymbolicName = Cypher.name("x")
1414
factory(x).`in`(lhs).where(x.`in`(rhs))

‎core/src/test/kotlin/DataFetcherInterceptorDemo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fun initBoundSchema(schema: String): GraphQLSchema {
1717

1818
val dataFetchingInterceptor = object : DataFetchingInterceptor {
1919
override fun fetchData(env: DataFetchingEnvironment, delegate: DataFetcher<Cypher>): Any {
20-
env.graphQlContext.setQueryContext(QueryContext(neo4jDialect = Dialect.DEFAULT))
20+
env.graphQlContext.setQueryContext(QueryContext(neo4jDialect = Dialect.NEO4J_5))
2121
val (cypher, params, type, variable) = delegate.get(env)
2222
return driver.session().use { session ->
2323
val result = session.run(cypher, params.mapValues { toBoltValue(it.value) })

‎core/src/test/kotlin/org/neo4j/graphql/utils/GraphQLSchemaTestSuite.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import graphql.language.InterfaceTypeDefinition
44
import graphql.schema.GraphQLScalarType
55
import graphql.schema.GraphQLSchema
66
import graphql.schema.GraphQLType
7-
import graphql.schema.diff.DiffSet
87
import graphql.schema.diff.SchemaDiff
8+
import graphql.schema.diff.SchemaDiffSet
99
import graphql.schema.diff.reporting.CapturingReporter
1010
import graphql.schema.idl.*
1111
import org.assertj.core.api.Assertions.assertThat
@@ -106,17 +106,16 @@ class GraphQLSchemaTestSuite(fileName: String) : AsciiDocTestSuite(
106106
fun GraphQLType.splitName(): Pair<String?, String> {
107107
val m = METHOD_PATTERN.matcher(this.requiredName())
108108
return if (m.find()) {
109-
m.group(1) to m.group(2).toLowerCase()
109+
m.group(1) to m.group(2).lowercase()
110110
} else {
111-
null to this.requiredName().toLowerCase()
111+
null to this.requiredName().lowercase()
112112
}
113113
}
114114

115115
fun diff(augmentedSchema: GraphQLSchema, expected: GraphQLSchema) {
116-
val diffSet = DiffSet.diffSet(augmentedSchema, expected)
116+
val diffSet = SchemaDiffSet.diffSetFromIntrospection(augmentedSchema, expected)
117117
val capture = CapturingReporter()
118-
SchemaDiff(SchemaDiff.Options.defaultOptions().enforceDirectives())
119-
.diffSchema(diffSet, capture)
118+
SchemaDiff().diffSchema(diffSet, capture)
120119
assertThat(capture.dangers).isEmpty()
121120
assertThat(capture.breakages).isEmpty()
122121
}

‎examples/dgs-spring-boot/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</description>
1717

1818
<properties>
19-
<testcontainers.version>1.19.7</testcontainers.version>
20-
<spring-boot.version>3.2.4</spring-boot.version>
19+
<testcontainers.version>1.20.1</testcontainers.version>
20+
<spring-boot.version>3.3.3</spring-boot.version>
2121
</properties>
2222

2323
<dependencies>
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.neo4j.driver</groupId>
4343
<artifactId>neo4j-java-driver</artifactId>
44-
<version>5.18.0</version>
44+
<version>5.23.0</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.neo4j</groupId>
@@ -52,12 +52,12 @@
5252
<dependency>
5353
<groupId>com.netflix.graphql.dgs</groupId>
5454
<artifactId>graphql-dgs-spring-boot-starter</artifactId>
55-
<version>8.5.5</version>
55+
<version>9.1.0</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>com.netflix.graphql.dgs.codegen</groupId>
5959
<artifactId>graphql-dgs-codegen-shared-core</artifactId>
60-
<version>6.1.5</version>
60+
<version>6.3.0</version>
6161
</dependency>
6262

6363
<!-- Kotlin dependencies -->
@@ -153,7 +153,7 @@
153153
<plugin>
154154
<groupId>io.github.deweyjose</groupId>
155155
<artifactId>graphqlcodegen-maven-plugin</artifactId>
156-
<version>1.60.1</version>
156+
<version>1.61.5</version>
157157
<executions>
158158
<execution>
159159
<goals>

‎examples/dgs-spring-boot/src/main/kotlin/org/neo4j/graphql/examples/dgsspringboot/datafetcher/AdditionalDataFetcher.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AdditionalDataFetcher {
1717

1818
@DgsData(parentType = DgsConstants.MOVIE.TYPE_NAME, field = DgsConstants.MOVIE.JavaData)
1919
fun javaData(env: DataFetchingEnvironment): List<JavaData> {
20-
val title = env.getSource<Map<String, *>>()["title"]
20+
val title = env.getSource<Map<String, *>>()?.get("title")
2121
return Collections.singletonList(JavaData("test $title"))
2222
}
2323

‎examples/dgs-spring-boot/src/test/kotlin/org/neo4j/graphql/examples/dgsspringboot/datafetcher/AdditionalDataFetcherTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,6 @@ internal class AdditionalDataFetcherTest(
146146

147147
companion object {
148148
@Container
149-
private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.18.0")
149+
private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.23.0")
150150
}
151151
}

0 commit comments

Comments
 (0)