Skip to content

Commit 0ef678f

Browse files
committed
fix: build errors after library updates
1 parent fdc6e9e commit 0ef678f

File tree

18 files changed

+47
-52
lines changed

18 files changed

+47
-52
lines changed

.github/workflows/master.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
uses: actions/setup-java@v3
2424
with:
2525
distribution: 'temurin'
26-
java-version: 11
26+
java-version: 17
2727
- name: Cache Gradle
2828
uses: actions/cache@v3
2929
env:
30-
java-version: 11
30+
java-version: 17
3131
with:
3232
path: |
3333
~/.gradle/caches
@@ -48,11 +48,11 @@ jobs:
4848
- uses: actions/checkout@v3
4949
with:
5050
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
51-
- name: Set up JDK 11
51+
- name: Set up JDK 17
5252
uses: actions/setup-java@v3
5353
with:
5454
distribution: 'temurin'
55-
java-version: 11
55+
java-version: 17
5656
- name: Cache SonarCloud packages
5757
uses: actions/cache@v3
5858
with:

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ ubuntu-latest, macos-latest, windows-latest ]
19-
java: [ 11, 17 ]
19+
java: [ 17, 19 ]
2020
needs: validation
2121
runs-on: ${{ matrix.os }}
2222
steps:

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id "jacoco"
55
}
66

7-
sonarqube {
7+
sonar {
88
properties {
99
property "sonar.projectKey", "graphql-java-kickstart_graphql-java-kickstart-samples"
1010
property "sonar.organization", "graphql-java-kickstart"
@@ -27,8 +27,8 @@ subprojects {
2727
}
2828

2929
compileJava {
30-
sourceCompatibility = JavaVersion.VERSION_11
31-
targetCompatibility = JavaVersion.VERSION_11
30+
sourceCompatibility = JavaVersion.VERSION_17
31+
targetCompatibility = JavaVersion.VERSION_17
3232
}
3333

3434
test {
@@ -37,7 +37,7 @@ subprojects {
3737

3838
jacocoTestReport {
3939
reports {
40-
xml.enabled = true
40+
xml.required = true
4141
}
4242
}
4343
}
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package graphql.kickstart.sample;
22

3+
import org.springframework.context.annotation.Bean;
34
import org.springframework.context.annotation.Configuration;
45
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
56
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
6-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
7+
import org.springframework.security.web.SecurityFilterChain;
78

89
@Configuration
910
@EnableWebSecurity
10-
class SecurityConfig extends WebSecurityConfigurerAdapter {
11+
class SecurityConfig {
1112

12-
@Override
13-
protected void configure(final HttpSecurity http) throws Exception {
14-
http.authorizeRequests().anyRequest().permitAll();
13+
@Bean
14+
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
15+
http.authorizeHttpRequests().anyRequest().permitAll();
16+
return http.build();
1517
}
1618
}

file-upload/src/main/java/upload/UploadMutation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import graphql.kickstart.tools.GraphQLMutationResolver;
44
import java.io.IOException;
5-
import javax.servlet.http.Part;
5+
import jakarta.servlet.http.Part;
66
import lombok.extern.slf4j.Slf4j;
77
import org.springframework.stereotype.Service;
88

gradle.properties

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
LIB_GRAPHQL_SERVLET_VER=14.0.0
1+
LIB_GRAPHQL_SERVLET_VER=15.0.0
22
LIB_GRAPHQL_SPRING_BOOT_VER=15.0.0
33
LIB_GRAPHQL_TOOLS_VER=13.0.2
44
LIB_GRAPHQL_EXTENDED_VALIDATION_VER=19.1
5-
LIB_SPRING_BOOT_VER=2.7.6
6-
sourceCompatibility=11
7-
targetCompatibility=11
5+
LIB_SPRING_BOOT_VER=3.0.0

graphql-annotations/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55

66
implementation("org.springframework.boot:spring-boot-starter-web")
77
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
8-
implementation "io.reactivex.rxjava2:rxjava"
8+
implementation "io.reactivex.rxjava2:rxjava:2.2.21"
99
implementation "org.projectlombok:lombok"
1010
annotationProcessor "org.projectlombok:lombok"
1111
runtimeOnly("com.h2database:h2")

graphql-annotations/src/main/java/graphql/kickstart/spring/boot/graphql/annotations/example/model/type/Person.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import graphql.annotations.annotationTypes.GraphQLNonNull;
66
import graphql.kickstart.spring.boot.graphql.annotations.example.model.directives.UpperCaseDirective;
77
import java.time.LocalDate;
8-
import javax.persistence.Column;
9-
import javax.persistence.Entity;
10-
import javax.persistence.Id;
8+
import jakarta.persistence.Column;
9+
import jakarta.persistence.Entity;
10+
import jakarta.persistence.Id;
1111
import lombok.AllArgsConstructor;
1212
import lombok.Builder;
1313
import lombok.Data;

graphql-annotations/src/test/java/graphql/kickstart/spring/boot/graphql/annotations/example/CreatePersonTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
2424
@Slf4j
25-
public class CreatePersonTest {
25+
class CreatePersonTest {
2626

2727
private static final String FIRST_NAME = "John";
2828
private static final String LAST_NAME = "Doe";

request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomGraphQLContextBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
77
import java.util.HashMap;
88
import java.util.Map;
9-
import javax.servlet.http.HttpServletRequest;
10-
import javax.servlet.http.HttpServletResponse;
11-
import javax.websocket.Session;
12-
import javax.websocket.server.HandshakeRequest;
9+
import jakarta.servlet.http.HttpServletRequest;
10+
import jakarta.servlet.http.HttpServletResponse;
11+
import jakarta.websocket.Session;
12+
import jakarta.websocket.server.HandshakeRequest;
1313
import org.dataloader.DataLoader;
1414
import org.dataloader.DataLoaderFactory;
1515
import org.dataloader.DataLoaderRegistry;

0 commit comments

Comments
 (0)