Skip to content

Commit 68f7b72

Browse files
igdianovigdianov
authored
Merge branch 'master' into superclass
2 parents 5f1055d + fc3c919 commit 68f7b72

File tree

75 files changed

+1614
-42414
lines changed

Some content is hidden

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

75 files changed

+1614
-42414
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ target/
2121
.project
2222
.springBeans
2323
.classpath
24+
25+
.externalToolBuilders
26+

‎CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Change Log
22

3-
## 0.3.20-SNAPSHOT
3+
## 0.3.21-SNAPSHOT
4+
* fix: change droid_function entity name to DroidFunction (#117) [ee39a1d](https://github.com/introproventures/graphql-jpa-query/commit/ee39a1d3cf42440ac2c054944c98bbac1ed3c4c4)
5+
* feat: extract GraphiQL into separate reusable module (#116) [123b471](https://github.com/introproventures/graphql-jpa-query/commit/123b4719593f21ef5af93e49a77292596ab5d129)
6+
* feat: extract example JPA models into separate resusable modules (#104) [9698743](https://github.com/introproventures/graphql-jpa-query/commit/9698743f3e9059ae1d2846e5e77ffae0a0a8b1f7)
7+
* feat: support nested relationships in where criteria expressions (#108) [b05c246](https://github.com/introproventures/graphql-jpa-query/commit/b05c246d06fc5aca05a096ce8214975de986546b)
8+
* feat: add LOCATE predicate for JPA entity attributes annotated with @Convert (#115) [3f9704b](https://github.com/introproventures/graphql-jpa-query/commit/3f9704b48c768d1d64ba82e41bbd1efebab864d6)
49
* feat: support enum variable bindings in queries (#109) [5dd999a](https://github.com/introproventures/graphql-jpa-query/commit/5dd999a1107899ce6bfe08aceb37ed2fb057aac6)
510
* Update README to add PWD shortcut in the title [8e9d409](https://github.com/introproventures/graphql-jpa-query/commit/8e9d409b4a193dde823991a9945d29f0163234a8)
611
* #102 fix NullPointerException when searching for Transient annotation (#106) [fb45d23](https://github.com/introproventures/graphql-jpa-query/commit/fb45d2329d8d02abc687e3db3cb2faafa4d91659)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GraphQL Query Api for JPA Entity Models [![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com/?stack=https://raw.githubusercontent.com/introproventures/graphql-jpa-query/master/graphql-jpa-query-example/docker-compose.yml&stack_name=graphhql)
1+
GraphQL Query Api for JPA Entity Models [![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com/?stack=https://raw.githubusercontent.com/introproventures/graphql-jpa-query/master/graphql-jpa-query-example-simple/docker-compose.yml&stack_name=graphhql)
22
===============
33

44
[![Build Status](https://travis-ci.org/introproventures/graphql-jpa-query.svg?branch=master)](https://travis-ci.org/introproventures/graphql-jpa-query)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.introproventures</groupId>
88
<artifactId>graphql-jpa-query-dependencies</artifactId>
9-
<version>0.3.20-SNAPSHOT</version>
9+
<version>0.3.21-SNAPSHOT</version>
1010
<relativePath>../graphql-jpa-query-dependencies</relativePath>
1111
</parent>
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.introproventures</groupId>
55
<artifactId>graphql-jpa-query-build</artifactId>
6-
<version>0.3.20-SNAPSHOT</version>
6+
<version>0.3.21-SNAPSHOT</version>
77
<relativePath>../graphql-jpa-query-build</relativePath>
88
</parent>
99
<artifactId>graphql-jpa-query-autoconfigure</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.introproventures</groupId>
99
<artifactId>graphql-jpa-query-build</artifactId>
10-
<version>0.3.20-SNAPSHOT</version>
10+
<version>0.3.21-SNAPSHOT</version>
1111
<relativePath>../graphql-jpa-query-build</relativePath>
1212
</parent>
1313

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.introproventures</groupId>
55
<artifactId>graphql-jpa-query-dependencies</artifactId>
6-
<version>0.3.20-SNAPSHOT</version>
6+
<version>0.3.21-SNAPSHOT</version>
77
<relativePath>../graphql-jpa-query-dependencies</relativePath>
88
</parent>
99
<artifactId>graphql-jpa-query-build</artifactId>
@@ -19,9 +19,26 @@
1919
<type>pom</type>
2020
<scope>import</scope>
2121
</dependency>
22+
23+
<dependency>
24+
<groupId>com.introproventures</groupId>
25+
<artifactId>graphql-jpa-query-example-model-starwars</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
2228

23-
</dependencies>
29+
<dependency>
30+
<groupId>com.introproventures</groupId>
31+
<artifactId>graphql-jpa-query-example-model-books</artifactId>
32+
<version>${project.version}</version>
33+
</dependency>
2434

35+
<dependency>
36+
<groupId>com.introproventures</groupId>
37+
<artifactId>graphql-jpa-query-graphiql</artifactId>
38+
<version>${project.version}</version>
39+
</dependency>
40+
41+
</dependencies>
2542
</dependencyManagement>
2643

2744
<dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.introproventures</groupId>
55
<artifactId>graphql-jpa-query</artifactId>
6-
<version>0.3.20-SNAPSHOT</version>
6+
<version>0.3.21-SNAPSHOT</version>
77
<relativePath>..</relativePath>
88
</parent>
99
<artifactId>graphql-jpa-query-dependencies</artifactId>

‎graphql-jpa-query-example-merge/pom.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.introproventures</groupId>
99
<artifactId>graphql-jpa-query-build</artifactId>
10-
<version>0.3.20-SNAPSHOT</version>
10+
<version>0.3.21-SNAPSHOT</version>
1111
<relativePath>../graphql-jpa-query-build</relativePath>
1212
</parent>
1313

@@ -18,6 +18,21 @@
1818

1919
<dependencies>
2020

21+
<dependency>
22+
<groupId>com.introproventures</groupId>
23+
<artifactId>graphql-jpa-query-example-model-books</artifactId>
24+
</dependency>
25+
26+
<dependency>
27+
<groupId>com.introproventures</groupId>
28+
<artifactId>graphql-jpa-query-graphiql</artifactId>
29+
</dependency>
30+
31+
<dependency>
32+
<groupId>com.introproventures</groupId>
33+
<artifactId>graphql-jpa-query-example-model-starwars</artifactId>
34+
</dependency>
35+
2136
<dependency>
2237
<groupId>com.introproventures</groupId>
2338
<artifactId>graphql-jpa-query-web</artifactId>

‎graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/books/Author.java

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

0 commit comments

Comments
 (0)