add jetty-ee8-annotations

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
jetty · May 31, 2022 · a10ad54 · a10ad54
1 parent e99d26b
commit a10ad54
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 2 deletions.
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
@@ -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
@@ -0,0 +1,96 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.ee8</groupId>
+    <artifactId>jetty-ee8</artifactId>
+    <version>12.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jetty-ee8-annotations</artifactId>
+  <name>EE8 :: Jetty :: Servlet Annotations</name>
+  <description>Annotation support for deploying servlets in jetty.</description>
+  <properties>
+    <ee9.module>jetty-ee9-annotations</ee9.module>
+    <bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name>
+    <spotbugs.onlyAnalyze>org.eclipse.annotations.*</spotbugs.onlyAnalyze>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{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
+          </argLine>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",*</Import-Package>
+            <Require-Capability>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
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-plus</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-webapp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.transaction</groupId>
+      <artifactId>jakarta.transaction-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-test-helper</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jndi</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
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
@@ -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
@@ -16,6 +16,7 @@
     <jetty.servlet.api.version>4.0.6</jetty.servlet.api.version>
     <jakarta.servlet.api.version>4.0.4</jakarta.servlet.api.version>
     <jakarta.transaction-api.version>1.3.3</jakarta.transaction-api.version>
+    <jakarta.annotation.api.version>1.3.5</jakarta.annotation.api.version>
     <!-- generated sources cannot follow exactly Jetty code style -->
     <checkstyle.skip>true</checkstyle.skip>
     <sonar.skip>true</sonar.skip>
@@ -30,6 +31,7 @@
     <module>jetty-ee8-webapp</module>
     <module>jetty-ee8-jaas</module>
     <module>jetty-ee8-plus</module>
+    <module>jetty-ee8-annotations</module>
   </modules>
 
   <build>
@@ -127,6 +129,11 @@
           <artifactId>jakarta.transaction-api</artifactId>
           <version>${jakarta.transaction-api.version}</version>
         </dependency>
+        <dependency>
+          <groupId>jakarta.annotation</groupId>
+          <artifactId>jakarta.annotation-api</artifactId>
+          <version>${jakarta.annotation.api.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.eclipse.jetty.toolchain</groupId>
           <artifactId>jetty-servlet-api</artifactId>
@@ -157,6 +164,11 @@
           <artifactId>jetty-ee8-servlets</artifactId>
           <version>${project.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty.ee8</groupId>
+          <artifactId>jetty-ee8-plus</artifactId>
+          <version>${project.version}</version>
+        </dependency>
       </dependencies>
   </dependencyManagement>
 

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
@@ -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]