diff --git a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod index ca8274bd10e6..076c431b366a 100644 --- a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod +++ b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod @@ -10,7 +10,6 @@ ee10 ee10-plus [lib] -lib/jetty-ee10-annotations-${jetty.version}.jar lib/ee10-annotations/*.jar [jpms] diff --git a/jetty-ee8/jetty-ee8-annotations/pom.xml b/jetty-ee8/jetty-ee8-annotations/pom.xml new file mode 100644 index 000000000000..88385dfde222 --- /dev/null +++ b/jetty-ee8/jetty-ee8-annotations/pom.xml @@ -0,0 +1,96 @@ + + + org.eclipse.jetty.ee8 + jetty-ee8 + 12.0.0-SNAPSHOT + + + 4.0.0 + jetty-ee8-annotations + EE8 :: Jetty :: Servlet Annotations + Annotation support for deploying servlets in jetty. + + jetty-ee9-annotations + ${project.groupId}.annotations + org.eclipse.annotations.* + + + + + + maven-surefire-plugin + + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.annotations=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.ee8.annotations/org.eclipse.jetty.ee8.annotations.resources=org.eclipse.jetty.ee8.plus + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-plus + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + + + jakarta.annotation + jakarta.annotation-api + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + org.slf4j + slf4j-api + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + jakarta.transaction + jakarta.transaction-api + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty + jetty-jndi + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + diff --git a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/annotations.mod b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/annotations.mod new file mode 100644 index 000000000000..519131a07d76 --- /dev/null +++ b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/annotations.mod @@ -0,0 +1,15 @@ +# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html + +[description] +Enables Annotation scanning for deployed web applications. + +[depend] +plus + +[lib] +lib/jetty-ee8-annotations-${jetty.version}.jar +lib/annotations/*.jar + +[jpms] +add-modules:org.objectweb.asm + diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index 1ff9086fdb68..f049c0dccfd4 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -16,6 +16,7 @@ 4.0.6 4.0.4 1.3.3 + 1.3.5 true true @@ -30,6 +31,7 @@ jetty-ee8-webapp jetty-ee8-jaas jetty-ee8-plus + jetty-ee8-annotations @@ -127,6 +129,11 @@ jakarta.transaction-api ${jakarta.transaction-api.version} + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} + org.eclipse.jetty.toolchain jetty-servlet-api @@ -157,6 +164,11 @@ jetty-ee8-servlets ${project.version} + + org.eclipse.jetty.ee8 + jetty-ee8-plus + ${project.version} + diff --git a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/annotations.mod b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/annotations.mod index ec6a976386de..54a5db69611b 100644 --- a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/annotations.mod +++ b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/annotations.mod @@ -7,7 +7,7 @@ Enables Annotation scanning for deployed web applications. plus [lib] -lib/jetty-annotations-${jetty.version}.jar +lib/jetty-ee9-annotations-${jetty.version}.jar lib/annotations/*.jar [jpms]