Skip to content

Commit 9539a7e

Browse files
igdianovigdianov
authored
fix: add support for jdk 17 build (#320)
* fix: update gmavenplus-plugin version to 2.1.0 * fix: update java version to 11 * fix: add jdk 17 to build matrix * fix: revert min java version to 1.8 * fix: update jacoco-maven-plugin.version to 0.8.7 * fix: reformat pom.xml * fix: reformat poms * fix: update README
1 parent c009a9d commit 9539a7e

File tree

7 files changed

+740
-736
lines changed

7 files changed

+740
-736
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
java: [ '8', '11' ]
20+
java: [ '8', '11', '17' ]
2121
steps:
2222
- uses: actions/checkout@v3
2323

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Features
2929
* Merging two or more GraphQL schemas from different JPA entity models
3030
* Support for GraphQL schema auto-configuration, GraphQL Web Rest Controller via Spring Boot Starters
3131
* GraphQL Subscriptions (Experimental)
32-
* [Spring GraphQl 1.0](https://docs.spring.io/spring-graphql/docs/current/reference/html/#overview) Schema Wiring, Stitching, Execution, Testing
32+
* [Spring GraphQl 1.0.x](https://docs.spring.io/spring-graphql/docs/current/reference/html/#overview) Auto configurations for Schema Runtime Wiring, Execution, Protocols, Testing
3333

3434
Supported Apis
3535
----------------------
@@ -44,6 +44,7 @@ Tested using JDK Versions
4444
----------------------
4545
* Jdk 8
4646
* Jdk 11
47+
* Jdk 17
4748

4849
Modules
4950
-------

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

Lines changed: 86 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,99 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>com.introproventures</groupId>
5-
<artifactId>graphql-jpa-query-dependencies</artifactId>
6-
<version>0.5.5-SNAPSHOT</version>
7-
<relativePath>../graphql-jpa-query-dependencies</relativePath>
8-
</parent>
9-
<artifactId>graphql-jpa-query-build</artifactId>
10-
<packaging>pom</packaging>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.introproventures</groupId>
6+
<artifactId>graphql-jpa-query-dependencies</artifactId>
7+
<version>0.5.5-SNAPSHOT</version>
8+
<relativePath>../graphql-jpa-query-dependencies</relativePath>
9+
</parent>
10+
<artifactId>graphql-jpa-query-build</artifactId>
11+
<packaging>pom</packaging>
1112

12-
<repositories>
13-
<!-- Maven2 is just to speed up downloading repositories -->
14-
<repository>
15-
<id>maven2</id>
16-
<name>maven2</name>
17-
<url>https://repo.maven.apache.org/maven2</url>
18-
</repository>
19-
<repository>
20-
<id>spring-milestones</id>
21-
<name>Spring Milestones</name>
22-
<url>http://repo.spring.io/milestone</url>
23-
<releases>
24-
<enabled>true</enabled>
25-
</releases>
26-
<snapshots>
27-
<enabled>true</enabled>
28-
</snapshots>
29-
</repository>
30-
</repositories>
31-
32-
<dependencyManagement>
33-
<dependencies>
13+
<repositories>
14+
<!-- Maven2 is just to speed up downloading repositories -->
15+
<repository>
16+
<id>maven2</id>
17+
<name>maven2</name>
18+
<url>https://repo.maven.apache.org/maven2</url>
19+
</repository>
20+
<repository>
21+
<id>spring-milestones</id>
22+
<name>Spring Milestones</name>
23+
<url>http://repo.spring.io/milestone</url>
24+
<releases>
25+
<enabled>true</enabled>
26+
</releases>
27+
<snapshots>
28+
<enabled>true</enabled>
29+
</snapshots>
30+
</repository>
31+
</repositories>
3432

35-
<dependency>
36-
<groupId>org.springframework.boot</groupId>
37-
<artifactId>spring-boot-dependencies</artifactId>
38-
<version>2.7.6</version>
39-
<type>pom</type>
40-
<scope>import</scope>
41-
</dependency>
42-
43-
<dependency>
44-
<groupId>com.introproventures</groupId>
45-
<artifactId>graphql-jpa-query-example-model-starwars</artifactId>
46-
<version>${project.version}</version>
47-
</dependency>
33+
<dependencyManagement>
34+
<dependencies>
4835

49-
<dependency>
50-
<groupId>com.introproventures</groupId>
51-
<artifactId>graphql-jpa-query-example-model-books</artifactId>
52-
<version>${project.version}</version>
53-
</dependency>
36+
<dependency>
37+
<groupId>org.springframework.boot</groupId>
38+
<artifactId>spring-boot-dependencies</artifactId>
39+
<version>2.7.6</version>
40+
<type>pom</type>
41+
<scope>import</scope>
42+
</dependency>
5443

55-
<dependency>
56-
<groupId>com.introproventures</groupId>
57-
<artifactId>graphql-jpa-query-graphiql</artifactId>
58-
<version>${project.version}</version>
59-
</dependency>
44+
<dependency>
45+
<groupId>com.introproventures</groupId>
46+
<artifactId>graphql-jpa-query-example-model-starwars</artifactId>
47+
<version>${project.version}</version>
48+
</dependency>
6049

61-
</dependencies>
62-
</dependencyManagement>
50+
<dependency>
51+
<groupId>com.introproventures</groupId>
52+
<artifactId>graphql-jpa-query-example-model-books</artifactId>
53+
<version>${project.version}</version>
54+
</dependency>
6355

64-
<dependencies>
56+
<dependency>
57+
<groupId>com.introproventures</groupId>
58+
<artifactId>graphql-jpa-query-graphiql</artifactId>
59+
<version>${project.version}</version>
60+
</dependency>
6561

66-
<dependency>
67-
<groupId>org.springframework.boot</groupId>
68-
<artifactId>spring-boot-starter-test</artifactId>
69-
<scope>test</scope>
70-
</dependency>
62+
</dependencies>
63+
</dependencyManagement>
7164

72-
<dependency>
73-
<groupId>org.junit.vintage</groupId>
74-
<artifactId>junit-vintage-engine</artifactId>
75-
<scope>test</scope>
76-
<exclusions>
77-
<exclusion>
78-
<groupId>org.hamcrest</groupId>
79-
<artifactId>hamcrest-core</artifactId>
80-
</exclusion>
81-
</exclusions>
82-
</dependency>
65+
<dependencies>
8366

84-
<dependency>
85-
<groupId>org.projectlombok</groupId>
86-
<artifactId>lombok</artifactId>
87-
<scope>test</scope>
88-
</dependency>
67+
<dependency>
68+
<groupId>org.springframework.boot</groupId>
69+
<artifactId>spring-boot-starter-test</artifactId>
70+
<scope>test</scope>
71+
</dependency>
8972

90-
<dependency>
91-
<groupId>com.h2database</groupId>
92-
<artifactId>h2</artifactId>
93-
<scope>test</scope>
94-
</dependency>
73+
<dependency>
74+
<groupId>org.junit.vintage</groupId>
75+
<artifactId>junit-vintage-engine</artifactId>
76+
<scope>test</scope>
77+
<exclusions>
78+
<exclusion>
79+
<groupId>org.hamcrest</groupId>
80+
<artifactId>hamcrest-core</artifactId>
81+
</exclusion>
82+
</exclusions>
83+
</dependency>
9584

96-
</dependencies>
85+
<dependency>
86+
<groupId>org.projectlombok</groupId>
87+
<artifactId>lombok</artifactId>
88+
<scope>test</scope>
89+
</dependency>
90+
91+
<dependency>
92+
<groupId>com.h2database</groupId>
93+
<artifactId>h2</artifactId>
94+
<scope>test</scope>
95+
</dependency>
96+
97+
</dependencies>
9798

9899
</project>

0 commit comments

Comments
 (0)