Skip to content

Commit e93bb80

Browse files
igdianovigdianov
authored
Upgrade dependencies to Spring Boot 2.1.0.RELEASE (#61)
* fix: (version) Update to Spring Boot 2.1.0.RELEASE
1 parent c8d30fb commit e93bb80

File tree

5 files changed

+40
-35
lines changed

5 files changed

+40
-35
lines changed

‎graphql-jpa-query-boot-starter/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependency>
3535

3636
<dependency>
37-
<groupId>org.hibernate</groupId>
37+
<groupId>org.hibernate.validator</groupId>
3838
<artifactId>hibernate-validator</artifactId>
3939
</dependency>
4040

‎graphql-jpa-query-build/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<dependencies>
1414

1515
<dependency>
16-
<groupId>io.spring.platform</groupId>
17-
<artifactId>platform-bom</artifactId>
18-
<version>Brussels-SR6</version>
16+
<groupId>org.springframework.boot</groupId>
17+
<artifactId>spring-boot-dependencies</artifactId>
18+
<version>2.1.0.RELEASE</version>
1919
<type>pom</type>
2020
<scope>import</scope>
2121
</dependency>

‎graphql-jpa-query-dependencies/pom.xml‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,49 @@
1212
<properties>
1313
<graphql-java.version>11.0</graphql-java.version>
1414
<hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version>
15+
<evo-inflector.version>1.2.2</evo-inflector.version>
16+
<javax.interceptor-api.version>1.2.2</javax.interceptor-api.version>
17+
<javax.persistence-api.version>2.2</javax.persistence-api.version>
1518
</properties>
1619

1720
<dependencyManagement>
1821
<dependencies>
19-
2022
<dependency>
2123
<groupId>com.graphql-java</groupId>
2224
<artifactId>graphql-java</artifactId>
2325
<version>${graphql-java.version}</version>
2426
</dependency>
25-
2627
<dependency>
27-
<groupId>org.hibernate.javax.persistence</groupId>
28-
<artifactId>hibernate-jpa-2.1-api</artifactId>
29-
<version>${hibernate-jpa-2.1-api.version}</version>
28+
<groupId>javax.persistence</groupId>
29+
<artifactId>javax.persistence-api</artifactId>
30+
<version>${javax.persistence-api.version}</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.atteo</groupId>
34+
<artifactId>evo-inflector</artifactId>
35+
<version>${evo-inflector.version}</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>javax.interceptor</groupId>
39+
<artifactId>javax.interceptor-api</artifactId>
40+
<version>${javax.interceptor-api.version}</version>
3041
</dependency>
31-
3242
<dependency>
3343
<groupId>com.introproventures</groupId>
3444
<artifactId>graphql-jpa-query-annotations</artifactId>
3545
<version>${project.version}</version>
3646
</dependency>
37-
3847
<dependency>
3948
<groupId>com.introproventures</groupId>
4049
<artifactId>graphql-jpa-query-schema</artifactId>
4150
<version>${project.version}</version>
4251
</dependency>
43-
4452
<dependency>
4553
<groupId>com.introproventures</groupId>
4654
<artifactId>graphql-jpa-query-boot-starter</artifactId>
4755
<version>${project.version}</version>
4856
</dependency>
49-
5057
</dependencies>
51-
5258
</dependencyManagement>
5359

5460
</project>

‎graphql-jpa-query-schema/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
</dependency>
4141

4242
<dependency>
43-
<groupId>org.hibernate.javax.persistence</groupId>
44-
<artifactId>hibernate-jpa-2.1-api</artifactId>
43+
<groupId>javax.persistence</groupId>
44+
<artifactId>javax.persistence-api</artifactId>
4545
</dependency>
4646

4747
<dependency>

‎graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/StarwarsQueryExecutorTests.java‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import javax.persistence.Query;
2727
import javax.transaction.Transactional;
2828

29+
import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
30+
import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
2931
import org.junit.Test;
3032
import org.junit.runner.RunWith;
3133
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,9 +37,6 @@
3537
import org.springframework.test.context.TestPropertySource;
3638
import org.springframework.test.context.junit4.SpringRunner;
3739

38-
import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
39-
import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
40-
4140
@RunWith(SpringRunner.class)
4241
@SpringBootTest
4342
@TestPropertySource({"classpath:hibernate.properties"})
@@ -153,7 +152,7 @@ public void queryOneToManyJoinByID() {
153152

154153

155154
String expected = "{Humans={select=["
156-
+ "{name=Luke Skywalker, homePlanet=Tatooine, friends=[{name=C-3PO}, {name=Leia Organa}, {name=R2-D2}, {name=Han Solo}]}"
155+
+ "{name=Luke Skywalker, homePlanet=Tatooine, friends=[{name=R2-D2}, {name=C-3PO}, {name=Han Solo}, {name=Leia Organa}]}"
157156
+ "]}}";
158157

159158

@@ -233,13 +232,12 @@ public void queryDeepNesting() {
233232
//given:
234233
String query = "query { Droid(id: \"2001\") { name, friends { name, appearsIn, friends { name } } } }";
235234

236-
237235
String expected = "{Droid={name=R2-D2, friends=["
238-
+ "{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=R2-D2}, {name=Han Solo}, {name=Luke Skywalker}]}, "
239-
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2}, {name=Leia Organa}, {name=Luke Skywalker}]}, "
240-
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=R2-D2}, {name=Leia Organa}, {name=Han Solo}]}"
241-
+ "]}}";
242-
236+
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2}, {name=Leia Organa}, {name=Luke Skywalker}]}, "
237+
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2}, {name=C-3PO}, {name=Han Solo}, {name=Leia Organa}]}, "
238+
+ "{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2}, {name=C-3PO}, {name=Han Solo}, {name=Luke Skywalker}]}"
239+
+ "]}}";
240+
243241
//when:
244242
Object result = executor.execute(query).getData();
245243

@@ -254,10 +252,11 @@ public void queryDeepNestingPlural() {
254252
String query = "query { Droids(where: {id: {EQ: \"2001\"}}) { select { name, friends { name, appearsIn, friends { name } } } }}";
255253

256254
String expected = "{Droids={select=[{name=R2-D2, friends=["
257-
+ "{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=R2-D2}, {name=Han Solo}, {name=Luke Skywalker}]}, "
258-
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2}, {name=Leia Organa}, {name=Luke Skywalker}]}, "
259-
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=R2-D2}, {name=Leia Organa}, {name=Han Solo}]}]}"
260-
+ "]}}";
255+
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2}, {name=Leia Organa}, {name=Luke Skywalker}]}, "
256+
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2}, {name=C-3PO}, {name=Han Solo}, {name=Leia Organa}]}, "
257+
+ "{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2}, {name=C-3PO}, {name=Han Solo}, {name=Luke Skywalker}]}"
258+
+ "]}"
259+
+ "]}}";
261260

262261
//when:
263262
Object result = executor.execute(query).getData();
@@ -513,12 +512,12 @@ public void queryWithTypenameDeepNesting() {
513512
//given:
514513
String query = "query { Droid(id: \"2001\") { name, friends { name, appearsIn, friends { name __typename } __typename } __typename } }";
515514

516-
517515
String expected = "{Droid={name=R2-D2, friends=["
518-
+ "{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO, __typename=Character}, {name=R2-D2, __typename=Character}, {name=Han Solo, __typename=Character}, {name=Luke Skywalker, __typename=Character}], __typename=Character}, "
519-
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2, __typename=Character}, {name=Leia Organa, __typename=Character}, {name=Luke Skywalker, __typename=Character}], __typename=Character}, "
520-
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO, __typename=Character}, {name=R2-D2, __typename=Character}, {name=Leia Organa, __typename=Character}, {name=Han Solo, __typename=Character}], __typename=Character}"
521-
+ "], __typename=Droid}}";
516+
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2, __typename=Character}, "
517+
+ "{name=Leia Organa, __typename=Character}, {name=Luke Skywalker, __typename=Character}], __typename=Character}, "
518+
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2, __typename=Character}, {name=C-3PO, __typename=Character}, {name=Han Solo, __typename=Character}, {name=Leia Organa, __typename=Character}], __typename=Character}, {name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=R2-D2, __typename=Character}, {name=C-3PO, __typename=Character}, {name=Han Solo, __typename=Character}, {name=Luke Skywalker, __typename=Character}], __typename=Character}], "
519+
+ "__typename=Droid}}";
520+
522521

523522
//when:
524523
Object result = executor.execute(query).getData();

0 commit comments

Comments
 (0)