diff --git a/docs/src/main/docs/guide/events/consuming.adoc b/docs/src/main/docs/guide/events/consuming.adoc index 96db04dd..f6f7c20a 100644 --- a/docs/src/main/docs/guide/events/consuming.adoc +++ b/docs/src/main/docs/guide/events/consuming.adoc @@ -25,7 +25,7 @@ If you wish to subscribe to events dynamically or need more flexibility, then an .TotalService.groovy ---- import grails.events.bus.EventBusAware -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct ... include::{sourcedir}/grails-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy[tags=subscriber] ---- diff --git a/examples/pubsub-demo/build.gradle b/examples/pubsub-demo/build.gradle index 4d09222c..c665eec9 100644 --- a/examples/pubsub-demo/build.gradle +++ b/examples/pubsub-demo/build.gradle @@ -2,7 +2,7 @@ plugins { id 'application' id 'groovy' id 'org.grails.grails-web' - //id 'org.grails.plugins.views-json' + //id 'org.grails.plugins.views-json' error loading when following documentation and not required for test } group = 'pubsub.demo' @@ -30,12 +30,14 @@ dependencies { implementation 'org.grails:grails-web-boot' implementation 'org.grails.plugins:hibernate5' - implementation 'org.grails.plugins:views-json' + implementation libs.grails.views.json + implementation libs.grails.views.json.templates implementation 'org.springframework.boot:spring-boot-autoconfigure' implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-logging' implementation 'org.springframework.boot:spring-boot-starter-tomcat' + implementation libs.micronaut.serde.jackson runtimeOnly 'com.h2database:h2' runtimeOnly 'org.apache.tomcat:tomcat-jdbc' diff --git a/gradle/buildsrc.libs.versions.toml b/gradle/buildsrc.libs.versions.toml index b00ca76d..3a0a5c04 100644 --- a/gradle/buildsrc.libs.versions.toml +++ b/gradle/buildsrc.libs.versions.toml @@ -1,7 +1,7 @@ [versions] grails = '7.0.0-SNAPSHOT' grails-gradle-plugin = '7.0.0-SNAPSHOT' -grails-views = '3.2.1' +grails-views = '4.0.0-SNAPSHOT' groovy-doc = '1.0.1' nexus-publish-gradle-plugin = '1.3.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7eefa293..6c6d6d22 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,9 +3,11 @@ bytebuddy = '1.14.12' gpars = '1.2.1' grails = '7.0.0-SNAPSHOT' grails-gsp = '7.0.0-SNAPSHOT' +grails-views = '4.0.0-SNAPSHOT' groovy = '4.0.22' -gorm = '8.1.2' -javax-annotation = '1.3.2' +gorm = '9.0.0-SNAPSHOT' +jakarta-annotation-api = '3.0.0' +micronaut-serde-jackson = '2.10.2' objenesis = '3.3' rxjava = '1.3.8' rxjava2 = '2.2.21' @@ -27,7 +29,7 @@ grails-web-mvc = { module = 'org.grails:grails-web-mvc', version.ref = 'grails' grails-web-sitemesh = { module = 'org.grails:grails-web-sitemesh', version.ref = 'grails-gsp' } gpars = { module = 'org.codehaus.gpars:gpars', version.ref = 'gpars' } groovy-core = { module = 'org.apache.groovy:groovy', version.ref = 'groovy' } -javax-annotation-api = { module = 'javax.annotation:javax.annotation-api', version.ref = 'javax-annotation' } +jakarta-annotation-api = { module = 'jakarta.annotation:jakarta.annotation-api', version.ref = 'jakarta-annotation-api' } objenesis = { module = 'org.objenesis:objenesis', version.ref = 'objenesis' } rxjava = { module = 'io.reactivex:rxjava', version.ref = 'rxjava' } rxjava2 = { module = 'io.reactivex.rxjava2:rxjava', version.ref = 'rxjava2' } @@ -40,4 +42,7 @@ spring-beans = { module = 'org.springframework:spring-beans', version.ref = 'spr spring-core = { module = 'org.springframework:spring-core', version.ref = 'spring' } spring-context = { module = 'org.springframework:spring-context', version.ref = 'spring' } spring-tx = { module = 'org.springframework:spring-tx', version.ref = 'spring' } -spring-web = { module = 'org.springframework:spring-web', version.ref = 'spring' } \ No newline at end of file +spring-web = { module = 'org.springframework:spring-web', version.ref = 'spring' } +micronaut-serde-jackson = { module = 'io.micronaut.serde:micronaut-serde-jackson', version.ref = 'micronaut-serde-jackson' } +grails-views-json = { module = 'org.grails.plugins:views-json', version.ref = 'grails-views' } +grails-views-json-templates = { module = 'org.grails.plugins:views-json-templates', version.ref = 'grails-views' } diff --git a/grails-async-core/build.gradle b/grails-async-core/build.gradle index 27d5f924..ca3f35af 100644 --- a/grails-async-core/build.gradle +++ b/grails-async-core/build.gradle @@ -11,8 +11,9 @@ dependencies { implementation libs.groovy.core implementation libs.slf4j.api + implementation libs.jakarta.annotation.api - compileOnly libs.javax.annotation.api + compileOnly libs.jakarta.annotation.api testImplementation libs.spock.core diff --git a/grails-async-core/src/main/groovy/org/grails/async/factory/future/CachedThreadPoolPromiseFactory.groovy b/grails-async-core/src/main/groovy/org/grails/async/factory/future/CachedThreadPoolPromiseFactory.groovy index 813d2ace..aa343669 100644 --- a/grails-async-core/src/main/groovy/org/grails/async/factory/future/CachedThreadPoolPromiseFactory.groovy +++ b/grails-async-core/src/main/groovy/org/grails/async/factory/future/CachedThreadPoolPromiseFactory.groovy @@ -7,7 +7,7 @@ import groovy.transform.AutoFinal import groovy.transform.CompileStatic import org.grails.async.factory.BoundPromise -import javax.annotation.PreDestroy +import jakarta.annotation.PreDestroy import java.util.concurrent.* /** diff --git a/grails-events-transform/build.gradle b/grails-events-transform/build.gradle index 5081ddfc..61e9a6db 100644 --- a/grails-events-transform/build.gradle +++ b/grails-events-transform/build.gradle @@ -22,6 +22,7 @@ dependencies { implementation libs.spring.beans implementation libs.spring.core implementation libs.spring.tx + implementation libs.jakarta.annotation.api testImplementation libs.grails.datastore.gorm.test, { // TODO: Explain why this exclusion is done (I don't know) diff --git a/grails-events-transform/src/main/groovy/org/grails/events/transform/AnnotatedSubscriber.groovy b/grails-events-transform/src/main/groovy/org/grails/events/transform/AnnotatedSubscriber.groovy index 4e6bfd4b..e5a80d82 100644 --- a/grails-events-transform/src/main/groovy/org/grails/events/transform/AnnotatedSubscriber.groovy +++ b/grails-events-transform/src/main/groovy/org/grails/events/transform/AnnotatedSubscriber.groovy @@ -11,7 +11,7 @@ import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent import org.grails.events.EventIdUtils import org.springframework.util.ReflectionUtils -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct import java.beans.Introspector import java.lang.reflect.Method diff --git a/grails-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy b/grails-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy index 59c17bc0..6e11e0dd 100644 --- a/grails-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy +++ b/grails-events-transform/src/test/groovy/grails/events/ManualPubSubSpec.groovy @@ -3,7 +3,7 @@ package grails.events import grails.events.bus.EventBusAware import spock.lang.Specification -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct import java.util.concurrent.atomic.AtomicInteger /**