merge conflict

grails · Feb 6, 2024 · fd21fbf · fd21fbf
2 parents f01b97b + aeb4b82
commit fd21fbf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 125 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/core/build.gradle b/core/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     api "org.grails:grails-datastore-gorm:${gormVersion}"
     api "com.graphql-java:graphql-java:$graphqlJavaVersion"
     api "com.graphql-java:graphql-java-extended-scalars:$graphqlJavaScalarExtVersion"
-    api 'com.github.javaparser:javaparser-core:3.25.6'
+    api 'com.github.javaparser:javaparser-core:3.25.7'
     api "org.grails.plugins:views-json:2.3.2"
     api 'org.javassist:javassist:3.29.2-GA'
 
@@ -20,7 +20,7 @@ dependencies {
     testImplementation "org.grails:grails-datastore-gorm-mongodb:${gormMongoDbVersion}"
     testImplementation 'com.github.fakemongo:fongo:2.1.1'
     testImplementation 'com.h2database:h2:2.2.224'
-    testImplementation "org.apache.tomcat:tomcat-jdbc:8.5.96"
+    testImplementation "org.apache.tomcat:tomcat-jdbc:8.5.97"
     testImplementation "org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.5.2"
     testImplementation "org.slf4j:slf4j-api:$slf4jVersion"
 }

diff --git a/gradle.properties b/gradle.properties
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     api "javax.servlet:javax.servlet-api:$servletApiVersion"
     api "io.micronaut:micronaut-http-client:$micronautVersion"
     api "org.grails.plugins:converters:3.3.1"
-    api 'com.github.javaparser:javaparser-core:3.25.6'
+    api 'com.github.javaparser:javaparser-core:3.25.7'
     api "com.graphql-java:graphql-java:$graphqlJavaVersion"
     testImplementation "org.grails:grails-web-testing-support"
     testImplementation "cglib:cglib-nodep:3.3.0"

diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "com.gradle.enterprise" version "3.15.1"
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1'
 }
 
 gradleEnterprise {