Skip to content

Commit 6e1bae1

Browse files
timward60timward60
authored
Merge branch 'master' into timward/unused-types
2 parents 0029b6e + 9a61df2 commit 6e1bae1

24 files changed

+530
-319
lines changed

‎.github/workflows/pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
java: [ '11', '15', '17' ]
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
- name: Setup java
15-
uses: actions/setup-java@v3
15+
uses: actions/setup-java@v4
1616
with:
1717
java-version: ${{ matrix.java }}
1818
distribution: 'adopt'
1919
- name: Cache Maven packages
20-
uses: actions/cache@v3
20+
uses: actions/cache@v4
2121
with:
2222
path: ~/.m2
2323
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Checkout
8-
uses: actions/checkout@v3
8+
uses: actions/checkout@v4
99
- name: Setup java
10-
uses: actions/setup-java@v3
10+
uses: actions/setup-java@v4
1111
with:
1212
java-version: '11'
1313
distribution: 'adopt'
@@ -19,9 +19,9 @@ jobs:
1919
needs: build
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
- name: Setup Maven Central
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: '11'
2727
distribution: 'adopt'
@@ -38,7 +38,7 @@ jobs:
3838
GPG_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSWORD }}
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040
- name: Create Release PR
41-
uses: peter-evans/create-pull-request@v5
41+
uses: peter-evans/create-pull-request@v7
4242
with:
4343
branch: version-release
4444
title: Version Release

‎.github/workflows/snapshot.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
- name: Setup java
13-
uses: actions/setup-java@v3
13+
uses: actions/setup-java@v4
1414
with:
1515
java-version: '11'
1616
distribution: 'adopt'
@@ -22,9 +22,9 @@ jobs:
2222
needs: build
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
- name: Setup Maven Central
27-
uses: actions/setup-java@v3
27+
uses: actions/setup-java@v4
2828
with:
2929
java-version: '11'
3030
distribution: 'adopt'

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ Are you interested in improving our documentation, working on the codebase, revi
2121
### Using Gradle
2222
Set the Kotlin version in your `gradle.properties`:
2323
```
24-
kotlin.version=1.8.10
24+
kotlin.version=2.0.20
2525
```
2626

2727
Add the dependency:
2828
```groovy
29-
compile 'com.graphql-java-kickstart:graphql-java-tools:13.0.3'
29+
compile 'com.graphql-java-kickstart:graphql-java-tools:14.0.0'
3030
```
3131

3232
### Using Maven
3333
Set the Kotlin version in your `<properties>` section:
3434
```xml
3535

3636
<properties>
37-
<kotlin.version>1.8.10</kotlin.version>
37+
<kotlin.version>2.0.20</kotlin.version>
3838
</properties>
3939
```
4040

@@ -43,13 +43,13 @@ Add the dependency:
4343
<dependency>
4444
<groupId>com.graphql-java-kickstart</groupId>
4545
<artifactId>graphql-java-tools</artifactId>
46-
<version>13.0.3</version>
46+
<version>14.0.0</version>
4747
</dependency>
4848
```
4949

5050
## Documentation
5151

52-
Take a look at our [documentation](https://www.graphql-java-kickstart.com/tools/) for more details.
52+
Take a look at our [documentation](https://graphql-java-kickstart.github.io/tools/) for more details.
5353

5454
## Why GraphQL Java Tools?
5555

‎pom.xml

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.graphql-java-kickstart</groupId>
66
<artifactId>graphql-java-tools</artifactId>
7-
<version>13.0.4-SNAPSHOT</version>
7+
<version>14.0.1-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<name>GraphQL Java Tools</name>
@@ -14,10 +14,10 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<java.version>11</java.version>
17-
<kotlin.version>1.8.21</kotlin.version>
18-
<kotlin-coroutines.version>1.6.4</kotlin-coroutines.version>
19-
<jackson.version>2.14.2</jackson.version>
20-
<graphql-java.version>21.0</graphql-java.version>
17+
<kotlin.version>2.0.20</kotlin.version>
18+
<kotlin-coroutines.version>1.9.0</kotlin-coroutines.version>
19+
<jackson.version>2.18.0</jackson.version>
20+
<graphql-java.version>22.3</graphql-java.version>
2121
<reactive-streams.version>1.0.4</reactive-streams.version>
2222

2323
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>org.antlr</groupId>
5252
<artifactId>antlr4-runtime</artifactId>
53-
<version>4.9.3</version>
53+
<version>4.11.1</version>
5454
<scope>compile</scope>
5555
</dependency>
5656
<dependency>
@@ -63,35 +63,35 @@
6363
<dependency>
6464
<groupId>com.fasterxml</groupId>
6565
<artifactId>classmate</artifactId>
66-
<version>1.5.1</version>
66+
<version>1.7.0</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.slf4j</groupId>
7070
<artifactId>slf4j-api</artifactId>
71-
<version>2.0.6</version>
71+
<version>2.0.16</version>
7272
</dependency>
7373
<dependency>
7474
<groupId>org.apache.commons</groupId>
7575
<artifactId>commons-lang3</artifactId>
76-
<version>3.12.0</version>
76+
<version>3.17.0</version>
7777
</dependency>
7878

7979
<!-- Optional for supporting Javassist proxies -->
8080
<dependency>
8181
<groupId>org.javassist</groupId>
8282
<artifactId>javassist</artifactId>
83-
<version>3.29.2-GA</version>
83+
<version>3.30.2-GA</version>
8484
<scope>provided</scope>
8585
</dependency>
86-
<!-- Optional for supporting spring proxies -->
86+
<!-- Optional for supporting Spring proxies -->
8787
<dependency>
8888
<groupId>org.springframework</groupId>
8989
<artifactId>spring-aop</artifactId>
90-
<version>5.3.25</version>
90+
<version>5.3.39</version>
9191
<scope>provided</scope>
9292
</dependency>
9393

94-
<!-- Test -->
94+
<!-- Test -->
9595
<dependency>
9696
<groupId>cglib</groupId>
9797
<artifactId>cglib-nodep</artifactId>
@@ -100,7 +100,7 @@
100100
<dependency>
101101
<groupId>ch.qos.logback</groupId>
102102
<artifactId>logback-classic</artifactId>
103-
<version>1.3.6</version>
103+
<version>1.5.9</version>
104104
</dependency>
105105
<dependency>
106106
<groupId>javax.servlet</groupId>
@@ -115,7 +115,7 @@
115115
<dependency>
116116
<groupId>org.objenesis</groupId>
117117
<artifactId>objenesis</artifactId>
118-
<version>3.3</version>
118+
<version>3.4</version>
119119
</dependency>
120120
<dependency>
121121
<groupId>org.reactivestreams</groupId>
@@ -134,18 +134,25 @@
134134
<dependency>
135135
<groupId>org.jetbrains.kotlin</groupId>
136136
<artifactId>kotlin-stdlib</artifactId>
137+
<exclusions>
138+
<!-- kotlinx-coroutines-core-jvm brings more recent version -->
139+
<exclusion>
140+
<groupId>org.jetbrains</groupId>
141+
<artifactId>annotations</artifactId>
142+
</exclusion>
143+
</exclusions>
137144
</dependency>
138145
<dependency>
139146
<groupId>org.jetbrains.kotlin</groupId>
140147
<artifactId>kotlin-reflect</artifactId>
141148
</dependency>
142149
<dependency>
150+
<!--
151+
Depending on kotlinx-coroutines-core causes an ambiguous module reference warning.
152+
See https://github.com/Kotlin/kotlinx.coroutines/issues/3842
153+
-->
143154
<groupId>org.jetbrains.kotlinx</groupId>
144-
<artifactId>kotlinx-coroutines-jdk8</artifactId>
145-
</dependency>
146-
<dependency>
147-
<groupId>org.jetbrains.kotlinx</groupId>
148-
<artifactId>kotlinx-coroutines-core</artifactId>
155+
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
149156
</dependency>
150157
<dependency>
151158
<groupId>org.jetbrains.kotlinx</groupId>
@@ -233,7 +240,7 @@
233240
<plugin>
234241
<groupId>org.codehaus.mojo</groupId>
235242
<artifactId>build-helper-maven-plugin</artifactId>
236-
<version>3.3.0</version>
243+
<version>3.6.0</version>
237244
<executions>
238245
<execution>
239246
<id>add-test-source</id>
@@ -277,7 +284,7 @@
277284
<plugin>
278285
<groupId>org.apache.maven.plugins</groupId>
279286
<artifactId>maven-compiler-plugin</artifactId>
280-
<version>3.11.0</version>
287+
<version>3.13.0</version>
281288
<configuration>
282289
<source>11</source>
283290
<target>11</target>
@@ -287,12 +294,12 @@
287294
<plugin>
288295
<groupId>org.apache.maven.plugins</groupId>
289296
<artifactId>maven-surefire-plugin</artifactId>
290-
<version>3.0.0</version>
297+
<version>3.5.1</version>
291298
<dependencies>
292299
<dependency>
293300
<groupId>org.apache.maven.surefire</groupId>
294301
<artifactId>surefire-junit4</artifactId>
295-
<version>3.0.0</version>
302+
<version>3.5.1</version>
296303
</dependency>
297304
</dependencies>
298305
<configuration>
@@ -304,7 +311,7 @@
304311
<plugin>
305312
<groupId>org.apache.maven.plugins</groupId>
306313
<artifactId>maven-jar-plugin</artifactId>
307-
<version>3.3.0</version>
314+
<version>3.4.2</version>
308315
<executions>
309316
<execution>
310317
<id>test-jar</id>
@@ -319,7 +326,7 @@
319326
<plugin>
320327
<groupId>org.apache.maven.plugins</groupId>
321328
<artifactId>maven-enforcer-plugin</artifactId>
322-
<version>3.2.1</version>
329+
<version>3.5.0</version>
323330
<executions>
324331
<execution>
325332
<id>enforce</id>
@@ -337,7 +344,7 @@
337344
<plugin>
338345
<groupId>org.sonatype.plugins</groupId>
339346
<artifactId>nexus-staging-maven-plugin</artifactId>
340-
<version>1.6.13</version>
347+
<version>1.7.0</version>
341348
<extensions>true</extensions>
342349
<configuration>
343350
<serverId>ossrh</serverId>
@@ -356,7 +363,7 @@
356363
<plugin>
357364
<groupId>org.apache.maven.plugins</groupId>
358365
<artifactId>maven-source-plugin</artifactId>
359-
<version>3.2.1</version>
366+
<version>3.3.1</version>
360367
<executions>
361368
<execution>
362369
<id>attach-sources</id>
@@ -370,7 +377,7 @@
370377
<plugin>
371378
<groupId>org.apache.maven.plugins</groupId>
372379
<artifactId>maven-javadoc-plugin</artifactId>
373-
<version>3.5.0</version>
380+
<version>3.10.1</version>
374381
<executions>
375382
<execution>
376383
<id>attach-javadocs</id>
@@ -383,7 +390,7 @@
383390
<plugin>
384391
<groupId>org.apache.maven.plugins</groupId>
385392
<artifactId>maven-gpg-plugin</artifactId>
386-
<version>3.0.1</version>
393+
<version>3.2.7</version>
387394
<executions>
388395
<execution>
389396
<id>sign-artifacts</id>

‎renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"matchPackagePrefixes": [
1616
"org.antlr"
1717
],
18-
"allowedVersions": "<=4.9.3"
18+
"allowedVersions": "<=4.11.1"
1919
},
2020
{
2121
"description": "Logback 1.4 requires Java 11",

0 commit comments

Comments
 (0)