Move from javax.el to jakarta.el. (#8966)

.gitattributes

@@ -1,18 +1,19 @@
 # Auto detect text files and perform LF normalization
 *        text=auto
 
-*.java   text
-*.html   text
-*.kt     text
-*.kts    text
-*.md     text diff=markdown
+*.java   text eol=lf
+*.groovy text eol=lf
+*.html   text eol=lf
+*.kt     text eol=lf
+*.kts    text eol=lf
+*.md     text diff=markdown eol=lf
 *.py     text diff=python executable
 *.pl     text diff=perl executable
 *.pm     text diff=perl
-*.css    text diff=css
-*.js     text
-*.sql    text
-*.q      text
+*.css    text diff=css eol=lf
+*.js     text eol=lf
+*.sql    text eol=lf
+*.q      text eol=lf
 
 *.sh     text eol=lf
 gradlew  text eol=lf

gradle.properties

@@ -45,7 +45,6 @@ hibernateapi=http://docs.jboss.org/hibernate/orm/current/javadocs
 rsapi=http://www.reactive-streams.org/reactive-streams-1.0.3-javadoc
 projectUrl=https://micronaut.io
 developers=Graeme Rocher
-kapt.use.worker.api=true
 
 # Dependency Versions
 micronautMavenPluginVersion=3.5.2

gradle/libs.versions.toml

@@ -26,8 +26,8 @@ jetty = "9.4.48.v20220622"
 jmh = "1.35"
 jsr107 = "1.1.1"
 jsr305 = "3.0.2"
-javax-el = "3.0.1-b12"
-javax-el-impl = "2.2.1-b05"
+jakarta-el = "5.0.1"
+jakarta-el-impl = "5.0.0-M1"
 jcache = "1.1.1"
 junit5 = "5.9.1"
 junit-platform="1.9.1"
@@ -168,8 +168,8 @@ jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version.ref
 jakarta-inject-tck = { module = "jakarta.inject:jakarta.inject-tck", version.ref = "jakarta-inject-tck" }
 
 javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax-annotation-api" }
-javax-el = { module = "org.glassfish:javax.el", version.ref = "javax-el" }
-javax-el-impl = { module = "org.glassfish:javax.el", version.ref = "javax-el" }
+jakarta-el = { module = "jakarta.el:jakarta.el-api", version.ref = "jakarta-el" }
+jakarta-el-impl = { module = "org.glassfish:jakarta.el", version.ref = "jakarta-el-impl" }
 javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" }
 javax-persistence = { module = "javax.persistence:javax.persistence-api", version.ref = "javax-persistence" }
 

inject-groovy/build.gradle

@@ -17,8 +17,8 @@ dependencies {
     testImplementation libs.spotbugs
     testImplementation libs.hibernate
     testImplementation libs.hibernate.validator
-    testRuntimeOnly libs.javax.el.impl
-    testRuntimeOnly libs.javax.el
+    testRuntimeOnly libs.jakarta.el.impl
+    testRuntimeOnly libs.jakarta.el
     testImplementation project(":http-server-netty")
     testImplementation project(":http-client")
     testImplementation project(":jackson-databind")

inject-java/build.gradle

@@ -58,8 +58,8 @@ dependencies {
     }
     testImplementation libs.javax.annotation.api
     testImplementation libs.managed.snakeyaml
-    testRuntimeOnly libs.javax.el.impl
-    testRuntimeOnly libs.javax.el
+    testRuntimeOnly libs.jakarta.el.impl
+    testRuntimeOnly libs.jakarta.el
 }
 //compileTestJava.options.fork = true
 //compileTestJava.options.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']

inject-java/src/test/groovy/io/micronaut/inject/failures/postconstruct/PostConstructExceptionSpec.groovy

@@ -16,8 +16,7 @@
 package io.micronaut.inject.failures.postconstruct
 
 import io.micronaut.context.ApplicationContext
-import io.micronaut.context.BeanContext
-import io.micronaut.context.DefaultBeanContext
+import io.micronaut.context.env.CachedEnvironment
 import io.micronaut.context.exceptions.BeanInstantiationException
 import spock.lang.Specification
 
@@ -32,10 +31,10 @@ class PostConstructExceptionSpec extends Specification {
 
         then:"The implementation is injected"
         def e = thrown(BeanInstantiationException)
-        e.message == '''Error instantiating bean of type  [io.micronaut.inject.failures.postconstruct.B]
-
-Message: bad
-Path Taken: new B()'''
+        def ls = CachedEnvironment.getProperty("line.separator")
+        e.message == 'Error instantiating bean of type  [io.micronaut.inject.failures.postconstruct.B]' + ls + ls +
+                'Message: bad' + ls +
+                'Path Taken: new B()'
 
         cleanup:
         context.close()

runtime/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     compileOnly libs.graal
     compileOnly libs.jcache
 
-    compileOnly libs.javax.el
+    compileOnly libs.jakarta.el
     compileOnly libs.caffeine
     compileOnly libs.kotlinx.coroutines.core
     compileOnly libs.kotlinx.coroutines.reactive