Skip to content

Commit b744338

Browse files
igdianovdependabot[bot]
igdianov
and
dependabot[bot]
authored
Upgrade to Spring Boot 3 with Jakarta EE JPA 3.1 Support (#356)
* chore(deps): bump spring-boot-maven-plugin from 1.5.6.RELEASE to 3.0.4 Bumps [spring-boot-maven-plugin](https://github.com/spring-projects/spring-boot) from 1.5.6.RELEASE to 3.0.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v1.5.6.RELEASE...v3.0.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * update dependencies to spring-boot 3 * fix graphql-jpa-query-schema tests * update spring-boot 3 auto configurations * remove Java 8 from build matrix * Remove Java 11 from build matrix * add spring-boot-maven-plugin to build plugin management * improve entity lookup performance with lazy map * clean up GraphQLJpaQueryFactory * update java.version to 17 * update getJPQLQueryString * internal getAttribute polish * fix graphql-jpa-query-example-merge application test * update tests to JUnit 5 api * update EntityWithEmbeddedIdTest to use JUnit 5 * update graphql-jpa-query-scalars test to junit 5 * update graphql-jpa-query-introspection tests to junit 5 * exclude junit-vintage-engine from build dependencies * remove deprecated passDistinctThrough query hint * increase EntityIntrospector test coverage * update EntityIntrospectorTest * set project version to 0.6.0-SNAPSHOT * fix EntityIntrospectorTest * remove legacy dataLoaderRegistry lookup from execution context * remove legacy graphql-jpa-query-graphiql module * update to spring-boot 3.0.6 * refactor Maven project reactor * set project version to 1.0.0-SNAPSHOT * update getting started to 1.0.0-SNAPSHOT * add prettier Maven helper * apply prettier java format * add java 19 build support * remove getting-started module * update build package * resolve build dependency problem * add skipStaging property * add default and release modules per profile --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 97fafa9 commit b744338

File tree

341 files changed

+27289
-66355
lines changed

Some content is hidden

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

341 files changed

+27289
-66355
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@ on:
1313

1414
jobs:
1515
build:
16-
1716
runs-on: ubuntu-latest
1817
strategy:
1918
matrix:
20-
java: [ '8', '11', '17' ]
19+
java: [ '17', '19' ]
2120
steps:
2221
- uses: actions/checkout@v3
2322

24-
- name: Set up JDK 11
23+
- name: Set up JDK ${{ matrix.java }}
2524
uses: actions/setup-java@v3
2625
with:
27-
java-version: ${{ matrix.java }}
28-
distribution: 'adopt'
26+
java-version: ${{ matrix.java }}
27+
distribution: 'temurin'
2928
cache: maven
3029

3130
- name: Build with Maven
32-
run: mvn -B -ntp package
31+
run: mvn -B -ntp install
3332

3433
- name: Upload coverage to Codecov
3534
uses: codecov/codecov-action@v3

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Eclipse
22
.project/
33
.settings/
4-
build/
54
.factorypath
65

76
# Intellij
@@ -29,5 +28,5 @@ target/
2928
.cache-tests
3029

3130
.sts4-cache
32-
33-
*.versionsBackup
31+
32+
*.versionsBackup

‎graphql-jpa-query-annotations/LICENSE‎ renamed to ‎annotations/LICENSE‎

File renamed without changes.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<parent>
77
<groupId>com.introproventures</groupId>
88
<artifactId>graphql-jpa-query-dependencies</artifactId>
9-
<version>0.5.5-SNAPSHOT</version>
10-
<relativePath>../graphql-jpa-query-dependencies</relativePath>
9+
<version>1.0.0-SNAPSHOT</version>
10+
<relativePath>../dependencies</relativePath>
1111
</parent>
1212

1313
<modelVersion>4.0.0</modelVersion>
@@ -16,4 +16,4 @@
1616
Provides Annotation classes for GraphQL JPA Query Schema Builder
1717
</description>
1818

19-
</project>
19+
</project>

‎graphql-jpa-query-annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLDefaultOrderBy.java‎ renamed to ‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLDefaultOrderBy.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
/**
2424
* Mark the default field to be ordered by GraphQL JPA Schema Executor
25-
* If there are no orders specified in the resulting query, the @Id field
25+
* If there are no orders specified in the resulting query, the @Id field
2626
* will be used as a default sorting key
27-
*
27+
*
2828
* @author Igor Dianov
2929
*/
3030
@Retention(RetentionPolicy.RUNTIME)
3131
@Target(ElementType.FIELD)
3232
public @interface GraphQLDefaultOrderBy {
33-
public boolean asc() default true; //Default order ASCENDING
34-
}
33+
public boolean asc() default true; //Default order ASCENDING
34+
}

‎graphql-jpa-query-annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLDescription.java‎ renamed to ‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLDescription.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,21 @@
1616
package com.introproventures.graphql.jpa.query.annotation;
1717

1818
import static java.lang.annotation.ElementType.FIELD;
19-
import static java.lang.annotation.ElementType.TYPE;
2019
import static java.lang.annotation.ElementType.METHOD;
20+
import static java.lang.annotation.ElementType.TYPE;
2121
import static java.lang.annotation.RetentionPolicy.RUNTIME;
2222

2323
import java.lang.annotation.Retention;
2424
import java.lang.annotation.Target;
2525

2626
/**
2727
* Use this annotation on Java types or fields to provide QraphQLSchema descriptions for QraphQLSchemaBuilder
28-
*
28+
*
2929
* @author Igor Dianov
3030
*
3131
*/
32-
@Target( { TYPE, FIELD, METHOD })
32+
@Target({ TYPE, FIELD, METHOD })
3333
@Retention(RUNTIME)
3434
public @interface GraphQLDescription {
35-
3635
String value();
37-
3836
}

‎graphql-jpa-query-annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnore.java‎ renamed to ‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnore.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import java.lang.annotation.Target;
2525

2626
/**
27-
* Use this annotation on Java JPA Entity types or fields to exclude elements from GraphQLSchema
28-
*
27+
* Use this annotation on Java JPA Entity types or fields to exclude elements from GraphQLSchema
28+
*
2929
* @author Igor Dianov
3030
*
3131
*/
32-
@Target( { TYPE, FIELD, METHOD })
32+
@Target({ TYPE, FIELD, METHOD })
3333
@Retention(RUNTIME)
3434
public @interface GraphQLIgnore {
3535
}

‎graphql-jpa-query-annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnoreFilter.java‎ renamed to ‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnoreFilter.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.introproventures.graphql.jpa.query.annotation;
22

3-
import java.lang.annotation.Retention;
4-
import java.lang.annotation.Target;
5-
63
import static java.lang.annotation.ElementType.FIELD;
74
import static java.lang.annotation.ElementType.TYPE;
85
import static java.lang.annotation.RetentionPolicy.RUNTIME;
96

10-
@Target( { TYPE, FIELD })
7+
import java.lang.annotation.Retention;
8+
import java.lang.annotation.Target;
9+
10+
@Target({ TYPE, FIELD })
1111
@Retention(RUNTIME)
1212
public @interface GraphQLIgnoreFilter {
1313
}
14-

‎graphql-jpa-query-annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnoreOrder.java‎ renamed to ‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnoreOrder.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.introproventures.graphql.jpa.query.annotation;
22

3+
import static java.lang.annotation.ElementType.FIELD;
4+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
35

46
import java.lang.annotation.Retention;
57
import java.lang.annotation.Target;
68

7-
import static java.lang.annotation.ElementType.FIELD;
8-
import static java.lang.annotation.RetentionPolicy.RUNTIME;
9-
10-
@Target( { FIELD })
9+
@Target({ FIELD })
1110
@Retention(RUNTIME)
1211
public @interface GraphQLIgnoreOrder {
1312
}
14-

‎graphql-jpa-query-boot-starter-graphql/LICENSE‎ renamed to ‎autoconfigure/LICENSE‎

File renamed without changes.

0 commit comments

Comments
 (0)