Skip to content

Commit ce98889

Browse files
authored
Merge pull request #28 from MEITREX/leaderboard_achievements_merge
Leaderboard achievements merge
2 parents 866f42e + 07d167f commit ce98889

301 files changed

Lines changed: 10072 additions & 3511 deletions

File tree

Some content is hidden

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

Dockerfile

100644100755
File mode changed.

LICENSE

100644100755
File mode changed.

README.md

100644100755
File mode changed.

build.gradle

100644100755
Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ plugins {
88

99
}
1010

11+
12+
java {
13+
toolchain {
14+
languageVersion = JavaLanguageVersion.of(21)
15+
}
16+
}
17+
1118
group = 'de.unistuttgart.iste.meitrex'
1219
version = '0.0.1-SNAPSHOT'
1320
sourceCompatibility = '21'
@@ -59,6 +66,7 @@ graphqlCodegen {
5966
packageName = "de.unistuttgart.iste.meitrex.generated.dto"
6067
generatedAnnotation = "jakarta.annotation.Generated"
6168
modelValidationAnnotation = "jakarta.validation.constraints.NotNull"
69+
generateJacksonTypeIdResolver = true // allows graphql .toEntity() conversion with Jackson for interfaces and unions
6270
generateApis = false // set to false as the generator does not support spring boot graphQL
6371
customTypesMapping = [
6472
"DateTime" : "java.time.OffsetDateTime",
@@ -110,9 +118,11 @@ repositories {
110118
}
111119

112120
dependencies {
113-
implementation 'de.unistuttgart.iste.meitrex:meitrex-common:1.2.9'
114-
implementation 'de.unistuttgart.iste.meitrex:content_service:1.3.0'
115-
implementation 'de.unistuttgart.iste.meitrex:course_service:1.0.0'
121+
122+
implementation 'de.unistuttgart.iste.meitrex:meitrex-common'
123+
implementation 'de.unistuttgart.iste.meitrex:content_service'
124+
implementation 'de.unistuttgart.iste.meitrex:course_service'
125+
implementation 'de.unistuttgart.iste.meitrex:user_service'
116126

117127
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
118128
implementation 'org.springframework.boot:spring-boot-starter-graphql'
@@ -123,16 +133,13 @@ dependencies {
123133
implementation 'org.modelmapper:modelmapper:3.+'
124134
implementation 'com.graphql-java:graphql-java-extended-scalars:22.0'
125135
implementation 'com.graphql-java:graphql-java-extended-validation:22.0'
126-
implementation 'io.dapr:dapr-sdk:1.9.0'
127-
implementation 'io.dapr:dapr-sdk-springboot:1.9.0'
128-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.1'
129-
implementation 'org.projectlombok:lombok:1.18.30'
136+
implementation 'io.dapr:dapr-sdk-springboot:1.12.0'
130137
compileOnly 'org.projectlombok:lombok'
131138
developmentOnly 'org.springframework.boot:spring-boot-devtools'
132139
runtimeOnly 'org.postgresql:postgresql'
133140
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
134141
annotationProcessor 'org.projectlombok:lombok'
135-
testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.2.6'
142+
testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.4.6'
136143
testImplementation 'org.springframework.boot:spring-boot-starter-test'
137144
testImplementation 'org.springframework:spring-webflux'
138145
testImplementation 'org.springframework.graphql:spring-graphql-test'

components/pubsub.yaml

100644100755
File mode changed.

docker-compose.yml

100644100755
File mode changed.

generate_api_doc.bat

100644100755
File mode changed.

gradle/wrapper/gradle-wrapper.jar

100644100755
File mode changed.

gradle/wrapper/gradle-wrapper.properties

100644100755
File mode changed.

gradlew.bat

100644100755
File mode changed.

0 commit comments

Comments
 (0)