Correct EE 11 BOM use and use actual dependencies from BOM. Thanks Pi…

…otrek Żygieło and Jared Anderson for help with this via platform/issues/1036 Signed-off-by: Scott Marlow <[email protected]>
scottmarlow · Feb 4, 2025 · aff394c · aff394c
1 parent f5c3265
commit aff394c
Show file tree

Hide file tree

Showing 25 changed files with 44 additions and 50 deletions.
diff --git a/install/signaturefiles/generate/pom.xml b/install/signaturefiles/generate/pom.xml
@@ -31,11 +31,11 @@ javax.rmi.sig (Corba classes for EJB)
 -->
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>jakarta.tck</groupId>
+
+   <parent>
+        <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>11.0.0-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.0.9</version>
     </parent>
 
     <artifactId>generate</artifactId>
@@ -47,6 +47,18 @@ javax.rmi.sig (Corba classes for EJB)
         <version.sigtest-maven-plugin>2.5</version.sigtest-maven-plugin>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>jakarta.platform</groupId>
+                <artifactId>jakarta.jakartaee-bom</artifactId>
+                <version>11.0.0-M4</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
 
         <dependency>
@@ -55,13 +67,6 @@ javax.rmi.sig (Corba classes for EJB)
             <version>11.0.0-M4</version>
         </dependency>
 
-<!--        <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-web-api</artifactId>
-            <version>11.0.0-M4</version>
-        </dependency>
--->
-
         <!-- SPEC API dependencies -->
         <dependency>
             <groupId>jakarta.activation</groupId>

diff --git a/.../src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.annotation.sig b/.../src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.annotation.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface !annotation jakarta.annotation.Generated
  anno 0 java.lang.annotation.Documented()
@@ -10,13 +10,6 @@ meth public abstract !hasdefault java.lang.String comments()
 meth public abstract !hasdefault java.lang.String date()
 meth public abstract java.lang.String[] value()
 
-CLSS public abstract interface !annotation jakarta.annotation.ManagedBean
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="")
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault java.lang.String value()
-
 CLSS public abstract interface !annotation jakarta.annotation.Nonnull
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
@@ -74,6 +67,8 @@ CLSS public abstract interface !annotation jakarta.annotation.Resources
 intf java.lang.annotation.Annotation
 meth public abstract jakarta.annotation.Resource[] value()
 
+CLSS abstract interface jakarta.annotation.package-info
+
 CLSS public abstract interface !annotation jakarta.annotation.security.DeclareRoles
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
@@ -107,6 +102,8 @@ CLSS public abstract interface !annotation jakarta.annotation.security.RunAs
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
+CLSS abstract interface jakarta.annotation.security.package-info
+
 CLSS public abstract interface !annotation jakarta.annotation.sql.DataSourceDefinition
  anno 0 java.lang.annotation.Repeatable(java.lang.Class<? extends java.lang.annotation.Annotation> value=class jakarta.annotation.sql.DataSourceDefinitions)
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
@@ -142,14 +139,6 @@ CLSS public abstract interface java.io.Serializable
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
-CLSS public abstract interface !annotation java.lang.Deprecated
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, MODULE, PARAMETER, TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault boolean forRemoval()
-meth public abstract !hasdefault java.lang.String since()
-
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
 innr public final static EnumDesc

diff --git a/...etest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.batch.sig b/...etest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.batch.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract jakarta.batch.api.AbstractBatchlet
 cons public init()

diff --git a/...uretest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.ejb.sig b/...uretest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.ejb.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public jakarta.ejb.AccessLocalException
 cons public init()

diff --git a/...turetest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.el.sig b/...turetest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.el.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public jakarta.el.ArrayELResolver
 cons public init()

diff --git a/...ava/com/sun/ts/tests/signaturetest/signature-repository/jakarta.enterprise.concurrent.sig b/...ava/com/sun/ts/tests/signaturetest/signature-repository/jakarta.enterprise.concurrent.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public jakarta.enterprise.concurrent.AbortedException
 cons public init()

diff --git a/.../src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.enterprise.sig b/.../src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.enterprise.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface !annotation jakarta.decorator.Decorator
  anno 0 jakarta.enterprise.inject.Stereotype()

diff --git a/...etest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.faces.sig b/...etest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.faces.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract jakarta.el.ELContext
 cons public init()

diff --git a/...src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.interceptor.sig b/...src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.interceptor.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface !annotation jakarta.interceptor.AroundConstruct
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)

diff --git a/...uretest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.jms.sig b/...uretest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.jms.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface jakarta.jms.BytesMessage
 intf jakarta.jms.Message

diff --git a/...t/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.json.bind.sig b/...t/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.json.bind.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface jakarta.json.bind.Jsonb
 intf java.lang.AutoCloseable

diff --git a/...retest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.json.sig b/...retest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.json.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public final jakarta.json.Json
 meth public static jakarta.json.JsonArrayBuilder createArrayBuilder()

diff --git a/...retest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.mail.sig b/...retest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.mail.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface jakarta.activation.DataSource
 meth public abstract java.io.InputStream getInputStream() throws java.io.IOException

diff --git a/...src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.persistence.sig b/...src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.persistence.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface !annotation jakarta.persistence.Access
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)

diff --git a/...st/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.resource.sig b/...st/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.resource.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface !annotation jakarta.resource.AdministeredObjectDefinition
  anno 0 java.lang.annotation.Repeatable(java.lang.Class<? extends java.lang.annotation.Annotation> value=class jakarta.resource.AdministeredObjectDefinitions)

diff --git a/...ava/com/sun/ts/tests/signaturetest/signature-repository/jakarta.security.auth.message.sig b/...ava/com/sun/ts/tests/signaturetest/signature-repository/jakarta.security.auth.message.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public jakarta.security.auth.message.AuthException
 cons public init()

diff --git a/.../java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.security.enterprise.sig b/.../java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.security.enterprise.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract jakarta.enterprise.util.AnnotationLiteral<%0 extends java.lang.annotation.Annotation>
 cons protected init()

diff --git a/...c/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.security.jacc.sig b/...c/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.security.jacc.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public final jakarta.security.jacc.EJBMethodPermission
 cons public init(java.lang.String,java.lang.String)

diff --git a/...ain/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.servlet.jsp.jstl.sig b/...ain/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.servlet.jsp.jstl.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract jakarta.el.Expression
 cons public init()

diff --git a/...src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.servlet.jsp.sig b/...src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.servlet.jsp.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract jakarta.el.ELResolver
 cons public init()

diff --git a/...est/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.servlet.sig b/...est/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.servlet.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface jakarta.servlet.AsyncContext
 fld public final static java.lang.String ASYNC_CONTEXT_PATH = "jakarta.servlet.async.context_path"

diff --git a/...src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.transaction.sig b/...src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.transaction.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface !annotation jakarta.enterprise.context.NormalScope
  anno 0 java.lang.annotation.Documented()

diff --git a/.../src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.validation.sig b/.../src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.validation.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface jakarta.validation.BootstrapConfiguration
 meth public abstract boolean isExecutableValidationEnabled()

diff --git a/...t/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig b/...t/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.websocket.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface !annotation jakarta.websocket.ClientEndpoint
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)

diff --git a/...etest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.ws.rs.sig b/...etest/src/main/java/com/sun/ts/tests/signaturetest/signature-repository/jakarta.ws.rs.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 11.0.0-SNAPSHOT
+#Version 1.0.9
 
 CLSS public abstract interface !annotation jakarta.ws.rs.ApplicationPath
  anno 0 java.lang.annotation.Documented()