diff --git a/dist-build/lang-model-tck-runner/pom.xml b/dist-build/lang-model-tck-runner/pom.xml index d08639778e..3bcf77b895 100644 --- a/dist-build/lang-model-tck-runner/pom.xml +++ b/dist-build/lang-model-tck-runner/pom.xml @@ -10,8 +10,7 @@ 11 11 - 4.0.4 - 5.0.0.SP2 + 6.0.0.Alpha1 @@ -19,7 +18,7 @@ jakarta.enterprise cdi-tck-lang-model - ${cdi.tck-4-0.version} + ${project.version} org.jboss.weld @@ -42,9 +41,11 @@ 3.0.2.Final - org.jboss.shrinkwrap - shrinkwrap-api - 1.2.6 + org.jboss.arquillian + arquillian-bom + ${arquillian.version} + import + pom org.wildfly.arquillian @@ -54,7 +55,7 @@ org.jboss.arquillian.protocol arquillian-protocol-servlet-jakarta - 1.7.0.Alpha10 + ${arquillian.version} log4j @@ -81,7 +82,7 @@ org.jboss.arquillian.junit arquillian-junit-container - 1.7.0.Alpha10 + ${arquillian.version} test diff --git a/dist-build/pom.xml b/dist-build/pom.xml index 4d6f30a9b1..e7b0b51206 100644 --- a/dist-build/pom.xml +++ b/dist-build/pom.xml @@ -125,7 +125,7 @@ jakarta.enterprise cdi-tck-core-impl ${cdi.tck.version} - sigtest-jdk11 + sigtest-jdk17 sig true diff --git a/doc/reference/src/main/asciidoc/sigtest.asciidoc b/doc/reference/src/main/asciidoc/sigtest.asciidoc index bb54d25131..1aea31708b 100644 --- a/doc/reference/src/main/asciidoc/sigtest.asciidoc +++ b/doc/reference/src/main/asciidoc/sigtest.asciidoc @@ -12,18 +12,18 @@ The sigtest plugin is availble from Maven Central using a dependency like: ---- ... - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 ---- The source for the sigtest plugin can be found here: -https://github.com/jtulach/netbeans-apitest +https://github.com/eclipse-ee4j/jakartaee-tck-tools/tree/master/tools/sigtest === Running the signature test To run the signature test, use a pom file like that found in -https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigtest-pom.xml and shown here: +https://github.com/jakartaee/cdi-tck/blob/master/impl/src/main/resources/sigtest-pom.xml and shown here: [source, xml] ---- @@ -34,21 +34,21 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise cdi-tck-sigtest - 4.0 + 4.1 CDI TCK Signature Tests CDI TCK Signature test validation of CDI dependent API jars - 2.1.0 + 3.0.0-M1 + 2.2.0-M1 2.0.1 - 2.1.0 - 5.0.0 - 4.0.1 + 5.0.1 + 4.1.0.Beta1 @@ -56,7 +56,7 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt jakarta.annotation jakarta.annotation-api - ${annotation.api.version} + ${annotations.api.version} jakarta.el @@ -66,7 +66,7 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt jakarta.interceptor jakarta.interceptor-api - ${interceptor.api.version} + ${interceptors.api.version} jakarta.inject @@ -106,9 +106,9 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 sigtest @@ -119,8 +119,8 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt - cdi-api-jdk11.sig - jakarta.decorator,jakarta.enterprise,jakarta.interceptor + cdi-api-jdk17.sig + jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor target/classes cdi-sig-report.txt @@ -133,19 +133,15 @@ Your version should specify the dependencies on these jars as used in your compa [source, console] ---- -Scotts-iMacPro:resources starksm$ mvn -f sigtest-pom.xml verify -[INFO] Scanning for projects... -[INFO] -[INFO] -----------------< jakarta.enterprise:cdi-tck-sigtest >----------------- -[INFO] Building CDI TCK Signature Tests 4.0 -[INFO] --------------------------------[ jar ]--------------------------------- -[INFO] +(base) starksm@Scotts-Mac-Studio impl % mvn -Djdk.major.version=21 -Dsignature process-resources ... -[INFO] --- sigtest-maven-plugin:1.5:check (sigtest) @ cdi-tck-sigtest --- -[INFO] Packages: jakarta.decorator,jakarta.enterprise +[INFO] --- sigtest:2.1:check (sigtest) @ cdi-tck-sigtest --- +[INFO] Packages: jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor +Feb 16, 2024 11:42:25 PM com.sun.tdk.signaturetest.SignatureTest parseParameters +INFO: SignatureTest.args: [-FileName, /Users/starksm/Dev/Jakarta/rh-cdi-tck/impl/src/main/resources/cdi-api-jdk17.sig, -static, -b, -Mode, bin, -ApiVersion, 4.1, -PackageWithoutSubpackages, jakarta.decorator, -Package, jakarta.enterprise, -PackageWithoutSubpackages, jakarta.interceptor, -BootCP, -Classpath, /Users/starksm/Dev/Jakarta/rh-cdi-tck/impl/src/main/resources/target/classes:/Users/starksm/.m2/repository/jakarta/annotation/jakarta.annotation-api/3.0.0-M1/jakarta.annotation-api-3.0.0-M1.jar:/Users/starksm/.m2/repository/jakarta/el/jakarta.el-api/5.0.1/jakarta.el-api-5.0.1.jar:/Users/starksm/.m2/repository/jakarta/interceptor/jakarta.interceptor-api/2.2.0-M1/jakarta.interceptor-api-2.2.0-M1.jar:/Users/starksm/.m2/repository/jakarta/inject/jakarta.inject-api/2.0.1/jakarta.inject-api-2.0.1.jar:/Users/starksm/.m2/repository/jakarta/enterprise/jakarta.enterprise.lang-model/4.1.0.Beta1/jakarta.enterprise.lang-model-4.1.0.Beta1.jar:/Users/starksm/.m2/repository/jakarta/enterprise/jakarta.enterprise.cdi-api/4.1.0.Beta1/jakarta.enterprise.cdi-api-4.1.0.Beta1.jar] [INFO] SignatureTest report -Base version: 4.0.0-SNAPSHOT -Tested version: 4.0 +Base version: 4.1.0-SNAPSHOT +Tested version: 4.1 Check mode: bin [throws removed] Constant checking: on @@ -154,13 +150,14 @@ Warning: The return type java.lang.reflect.Member can't be resolved Warning: The return type java.lang.reflect.Member can't be resolved -[INFO] /Users/starksm/Dev/JBoss/Jakarta/cdi-tck/impl/src/main/resources/cdi-sig-report.txt: 0 failures in /Users/starksm/Dev/JBoss/Jakarta/cdi-tck/impl/src/main/resources/cdi-api-jdk11.sig +[INFO] /Users/starksm/Dev/Jakarta/rh-cdi-tck/impl/src/main/resources/cdi-sig-report.txt: 0 failures in /Users/starksm/Dev/Jakarta/rh-cdi-tck/impl/src/main/resources/cdi-api-jdk17.sig [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ -[INFO] Total time: 1.941 s -[INFO] Finished at: 2021-12-13T11:38:06-06:00 +[INFO] Total time: 2.021 s +[INFO] Finished at: 2024-02-16T23:42:25-06:00 [INFO] ------------------------------------------------------------------------ + ---- You can ignore the following warnings: @@ -169,7 +166,7 @@ You can ignore the following warnings: The important thing is that the mvn version shows "BUILD SUCCESS". Another example that just specifies a compatible implementation test as the dependency to validate the API artifact signatures from the transitive dependencies is pom file like that found in -https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigtest-weld-pom.xml and shown here: +https://github.com/jakartaee/cdi-tck/blob/master/impl/src/main/resources/sigtest-weld-pom.xml and shown here: [source, xml] ---- @@ -180,7 +177,7 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise @@ -190,7 +187,7 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt CDI TCK Signature test validation of CDI dependent API jars - 5.0.0.CR2 + 6.0.0.Alpha2 @@ -224,9 +221,9 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 sigtest @@ -237,10 +234,10 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt - cdi-api-jdk11.sig - jakarta.decorator,jakarta.enterprise,jakarta.interceptor + cdi-api-jdk17.sig + jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor target/classes - cdi-sig-report.txt + cdi-sig-report.xml diff --git a/impl/pom.xml b/impl/pom.xml index dd57bd2db4..7eeadadeab 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -145,9 +145,9 @@ audit-int - ${basedir}/src/main/resources/cdi-api-jdk11.sig + ${basedir}/src/main/resources/cdi-api-jdk17.sig sig - sigtest-jdk11 + sigtest-jdk17 @@ -359,8 +359,8 @@ - - 11 + + 17 @@ -402,13 +402,14 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin generate + process-resources @@ -425,6 +426,7 @@ jakarta.enterprise.inject.se, jakarta.enterprise.inject.spi, jakarta.enterprise.inject.spi.configurator, + jakarta.enterprise.invoke, jakarta.enterprise.util, jakarta.enterprise.lang.model, jakarta.enterprise.lang.model.declarations, diff --git a/impl/src/main/resources/cdi-api-jdk11.sig b/impl/src/main/resources/cdi-api-jdk17.sig similarity index 97% rename from impl/src/main/resources/cdi-api-jdk11.sig rename to impl/src/main/resources/cdi-api-jdk17.sig index 21f901e950..c0cddabf84 100644 --- a/impl/src/main/resources/cdi-api-jdk11.sig +++ b/impl/src/main/resources/cdi-api-jdk17.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 4.0.0-SNAPSHOT +#Version 4.1.0-SNAPSHOT CLSS public abstract interface !annotation jakarta.decorator.Decorator anno 0 jakarta.enterprise.inject.Stereotype() @@ -14,6 +14,8 @@ CLSS public abstract interface !annotation jakarta.decorator.Delegate anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[FIELD, PARAMETER]) intf java.lang.annotation.Annotation +CLSS abstract interface jakarta.decorator.package-info + CLSS public abstract interface !annotation jakarta.enterprise.context.ApplicationScoped anno 0 jakarta.enterprise.context.NormalScope(boolean passivating=false) anno 0 java.lang.annotation.Documented() @@ -221,6 +223,8 @@ CLSS public abstract interface jakarta.enterprise.context.control.RequestContext meth public abstract boolean activate() meth public abstract void deactivate() +CLSS abstract interface jakarta.enterprise.context.package-info + CLSS public abstract interface jakarta.enterprise.context.spi.AlterableContext intf jakarta.enterprise.context.spi.Context meth public abstract void destroy(jakarta.enterprise.context.spi.Contextual) @@ -239,6 +243,8 @@ CLSS public abstract interface jakarta.enterprise.context.spi.CreationalContext< meth public abstract void push({jakarta.enterprise.context.spi.CreationalContext%0}) meth public abstract void release() +CLSS abstract interface jakarta.enterprise.context.spi.package-info + CLSS public abstract interface jakarta.enterprise.event.Event<%0 extends java.lang.Object> meth public abstract !varargs <%0 extends {jakarta.enterprise.event.Event%0}> jakarta.enterprise.event.Event<{%%0}> select(jakarta.enterprise.util.TypeLiteral<{%%0}>,java.lang.annotation.Annotation[]) meth public abstract !varargs <%0 extends {jakarta.enterprise.event.Event%0}> jakarta.enterprise.event.Event<{%%0}> select(java.lang.Class<{%%0}>,java.lang.annotation.Annotation[]) @@ -309,6 +315,8 @@ meth public static jakarta.enterprise.event.TransactionPhase valueOf(java.lang.S meth public static jakarta.enterprise.event.TransactionPhase[] values() supr java.lang.Enum +CLSS abstract interface jakarta.enterprise.event.package-info + CLSS public abstract interface !annotation jakarta.enterprise.inject.Alternative anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) @@ -644,6 +652,12 @@ CLSS public abstract interface jakarta.enterprise.inject.build.compatible.spi.Bu intf jakarta.enterprise.inject.spi.Prioritized meth public abstract jakarta.enterprise.inject.build.compatible.spi.AnnotationBuilderFactory annotationBuilderFactory() +CLSS public final jakarta.enterprise.inject.build.compatible.spi.BuildServicesResolver +cons public init() +meth public static void setBuildServices(jakarta.enterprise.inject.build.compatible.spi.BuildServices) +supr java.lang.Object +hfds configuredBuildServices,discoveredBuildServices,lock + CLSS public abstract interface jakarta.enterprise.inject.build.compatible.spi.ClassConfig intf jakarta.enterprise.inject.build.compatible.spi.DeclarationConfig meth public abstract jakarta.enterprise.inject.build.compatible.spi.ClassConfig addAnnotation(jakarta.enterprise.lang.model.AnnotationInfo) @@ -702,6 +716,11 @@ meth public abstract java.util.Collection createInvoker(jakarta.enterprise.inject.build.compatible.spi.BeanInfo,jakarta.enterprise.lang.model.declarations.MethodInfo) + +CLSS public abstract interface jakarta.enterprise.inject.build.compatible.spi.InvokerInfo + CLSS public abstract interface jakarta.enterprise.inject.build.compatible.spi.Messages meth public abstract void error(java.lang.Exception) meth public abstract void error(java.lang.String) @@ -813,6 +832,8 @@ meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBea meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,double[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,int) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,int[]) +meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.inject.build.compatible.spi.InvokerInfo) +meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.inject.build.compatible.spi.InvokerInfo[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.AnnotationInfo) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.AnnotationInfo[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.declarations.ClassInfo) @@ -858,6 +879,8 @@ meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObs meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,double[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,int) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,int[]) +meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.inject.build.compatible.spi.InvokerInfo) +meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.inject.build.compatible.spi.InvokerInfo[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.AnnotationInfo) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.AnnotationInfo[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.declarations.ClassInfo) @@ -892,6 +915,8 @@ CLSS public abstract interface !annotation jakarta.enterprise.inject.build.compa anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD]) intf java.lang.annotation.Annotation +CLSS abstract interface jakarta.enterprise.inject.build.compatible.spi.package-info + CLSS public final jakarta.enterprise.inject.literal.InjectLiteral cons public init() fld public final static jakarta.enterprise.inject.literal.InjectLiteral INSTANCE @@ -1039,6 +1064,8 @@ meth public abstract !varargs java.util.Set jakarta.enterprise.context.spi.CreationalContext<{%%0}> createCreationalContext(jakarta.enterprise.context.spi.Contextual<{%%0}>) meth public abstract <%0 extends java.lang.Object> jakarta.enterprise.inject.spi.Bean resolve(java.util.Set>) meth public abstract boolean isInterceptorBinding(java.lang.Class) +meth public abstract boolean isMatchingBean(java.util.Set,java.util.Set,java.lang.reflect.Type,java.util.Set) +meth public abstract boolean isMatchingEvent(java.lang.reflect.Type,java.util.Set,java.lang.reflect.Type,java.util.Set) meth public abstract boolean isNormalScope(java.lang.Class) meth public abstract boolean isQualifier(java.lang.Class) meth public abstract boolean isScope(java.lang.Class) @@ -1047,11 +1074,11 @@ meth public abstract jakarta.enterprise.context.spi.Context getContext(java.lang meth public abstract jakarta.enterprise.event.Event getEvent() meth public abstract jakarta.enterprise.inject.Instance createInstance() meth public abstract java.lang.Object getReference(jakarta.enterprise.inject.spi.Bean,java.lang.reflect.Type,jakarta.enterprise.context.spi.CreationalContext) +meth public abstract java.util.Collection getContexts(java.lang.Class) meth public abstract java.util.Set> getBeans(java.lang.String) CLSS public abstract interface jakarta.enterprise.inject.spi.BeanManager intf jakarta.enterprise.inject.spi.BeanContainer -meth public abstract !varargs <%0 extends java.lang.Object> java.util.Set> resolveObserverMethods({%%0},java.lang.annotation.Annotation[]) meth public abstract !varargs java.util.List> resolveDecorators(java.util.Set,java.lang.annotation.Annotation[]) meth public abstract <%0 extends jakarta.enterprise.inject.spi.Extension> {%%0} getExtension(java.lang.Class<{%%0}>) meth public abstract <%0 extends java.lang.Object, %1 extends java.lang.Object> jakarta.enterprise.inject.spi.Bean<{%%0}> createBean(jakarta.enterprise.inject.spi.BeanAttributes<{%%0}>,java.lang.Class<{%%1}>,jakarta.enterprise.inject.spi.ProducerFactory<{%%1}>) @@ -1068,7 +1095,9 @@ meth public abstract boolean isPassivatingScope(java.lang.Class getPassivationCapableBean(java.lang.String) meth public abstract jakarta.enterprise.inject.spi.BeanAttributes createBeanAttributes(jakarta.enterprise.inject.spi.AnnotatedMember) meth public abstract jakarta.enterprise.inject.spi.InjectionPoint createInjectionPoint(jakarta.enterprise.inject.spi.AnnotatedField) @@ -1238,6 +1267,7 @@ meth public abstract void setInjectionTarget(jakarta.enterprise.inject.spi.Injec CLSS public abstract interface jakarta.enterprise.inject.spi.ProcessManagedBean<%0 extends java.lang.Object> intf jakarta.enterprise.inject.spi.ProcessBean<{jakarta.enterprise.inject.spi.ProcessManagedBean%0}> meth public abstract jakarta.enterprise.inject.spi.AnnotatedType<{jakarta.enterprise.inject.spi.ProcessManagedBean%0}> getAnnotatedBeanClass() +meth public abstract jakarta.enterprise.invoke.InvokerBuilder> createInvoker(jakarta.enterprise.inject.spi.AnnotatedMethod) CLSS public abstract interface jakarta.enterprise.inject.spi.ProcessObserverMethod<%0 extends java.lang.Object, %1 extends java.lang.Object> meth public abstract jakarta.enterprise.inject.spi.AnnotatedMethod<{jakarta.enterprise.inject.spi.ProcessObserverMethod%1}> getAnnotatedMethod() @@ -1453,6 +1483,16 @@ CLSS public abstract interface jakarta.enterprise.inject.spi.configurator.Produc meth public abstract <%0 extends {jakarta.enterprise.inject.spi.configurator.ProducerConfigurator%0}> jakarta.enterprise.inject.spi.configurator.ProducerConfigurator<{jakarta.enterprise.inject.spi.configurator.ProducerConfigurator%0}> produceWith(java.util.function.Function,{%%0}>) meth public abstract jakarta.enterprise.inject.spi.configurator.ProducerConfigurator<{jakarta.enterprise.inject.spi.configurator.ProducerConfigurator%0}> disposeWith(java.util.function.Consumer<{jakarta.enterprise.inject.spi.configurator.ProducerConfigurator%0}>) +CLSS abstract interface jakarta.enterprise.inject.spi.package-info + +CLSS public abstract interface jakarta.enterprise.invoke.Invoker<%0 extends java.lang.Object, %1 extends java.lang.Object> +meth public abstract {jakarta.enterprise.invoke.Invoker%1} invoke({jakarta.enterprise.invoke.Invoker%0},java.lang.Object[]) throws java.lang.Exception + +CLSS public abstract interface jakarta.enterprise.invoke.InvokerBuilder<%0 extends java.lang.Object> +meth public abstract jakarta.enterprise.invoke.InvokerBuilder<{jakarta.enterprise.invoke.InvokerBuilder%0}> withArgumentLookup(int) +meth public abstract jakarta.enterprise.invoke.InvokerBuilder<{jakarta.enterprise.invoke.InvokerBuilder%0}> withInstanceLookup() +meth public abstract {jakarta.enterprise.invoke.InvokerBuilder%0} build() + CLSS public abstract interface jakarta.enterprise.lang.model.AnnotationInfo meth public abstract boolean hasMember(java.lang.String) meth public abstract jakarta.enterprise.lang.model.AnnotationMember member(java.lang.String) @@ -1637,6 +1677,10 @@ meth public abstract java.lang.String name() meth public jakarta.enterprise.lang.model.declarations.DeclarationInfo$Kind kind() meth public jakarta.enterprise.lang.model.declarations.RecordComponentInfo asRecordComponent() +CLSS abstract interface jakarta.enterprise.lang.model.declarations.package-info + +CLSS abstract interface jakarta.enterprise.lang.model.package-info + CLSS public abstract interface jakarta.enterprise.lang.model.types.ArrayType intf jakarta.enterprise.lang.model.types.Type meth public abstract jakarta.enterprise.lang.model.types.Type componentType() @@ -1743,6 +1787,8 @@ meth public abstract jakarta.enterprise.lang.model.types.Type upperBound() meth public jakarta.enterprise.lang.model.types.Type$Kind kind() meth public jakarta.enterprise.lang.model.types.WildcardType asWildcardType() +CLSS abstract interface jakarta.enterprise.lang.model.types.package-info + CLSS public abstract jakarta.enterprise.util.AnnotationLiteral<%0 extends java.lang.annotation.Annotation> cons protected init() intf java.io.Serializable @@ -1779,6 +1825,8 @@ meth public java.lang.String toString() supr java.lang.Object hfds actualType,serialVersionUID +CLSS abstract interface jakarta.enterprise.util.package-info + CLSS public abstract interface !annotation jakarta.inject.Inject anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) @@ -1867,6 +1915,8 @@ intf java.lang.annotation.Annotation meth public abstract java.lang.Class[] value() CLSS public abstract interface jakarta.interceptor.InvocationContext +meth public <%0 extends java.lang.annotation.Annotation> java.util.Set<{%%0}> getInterceptorBindings(java.lang.Class<{%%0}>) +meth public <%0 extends java.lang.annotation.Annotation> {%%0} getInterceptorBinding(java.lang.Class<{%%0}>) meth public abstract java.lang.Object getTarget() meth public abstract java.lang.Object getTimer() meth public abstract java.lang.Object proceed() throws java.lang.Exception @@ -1875,6 +1925,7 @@ meth public abstract java.lang.reflect.Constructor getConstructor() meth public abstract java.lang.reflect.Method getMethod() meth public abstract java.util.Map getContextData() meth public abstract void setParameters(java.lang.Object[]) +meth public java.util.Set getInterceptorBindings() CLSS public abstract interface java.io.Serializable diff --git a/impl/src/main/resources/sigtest-pom.xml b/impl/src/main/resources/sigtest-pom.xml index 5cdc5c7cd8..873f77d700 100644 --- a/impl/src/main/resources/sigtest-pom.xml +++ b/impl/src/main/resources/sigtest-pom.xml @@ -6,21 +6,21 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise cdi-tck-sigtest - 4.0 + 4.1 CDI TCK Signature Tests CDI TCK Signature test validation of CDI dependent API jars - 2.1.0 + 3.0.0-M1 + 2.2.0-M1 2.0.1 - 2.1.0 - 5.0.0 - 4.0.0-RC5 + 5.0.1 + 4.1.0.Beta1 @@ -28,7 +28,7 @@ jakarta.annotation jakarta.annotation-api - ${annotation.api.version} + ${annotations.api.version} jakarta.el @@ -38,7 +38,7 @@ jakarta.interceptor jakarta.interceptor-api - ${interceptor.api.version} + ${interceptors.api.version} jakarta.inject @@ -78,9 +78,9 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 sigtest @@ -91,8 +91,8 @@ - cdi-api-jdk11.sig - jakarta.decorator,jakarta.enterprise,jakarta.interceptor + cdi-api-jdk17.sig + jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor target/classes cdi-sig-report.txt diff --git a/impl/src/main/resources/sigtest-weld-pom.xml b/impl/src/main/resources/sigtest-weld-pom.xml index 0c7e711312..80f4b575d2 100644 --- a/impl/src/main/resources/sigtest-weld-pom.xml +++ b/impl/src/main/resources/sigtest-weld-pom.xml @@ -6,7 +6,7 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise @@ -16,7 +16,7 @@ CDI TCK Signature test validation of CDI dependent API jars - 5.0.0.CR2 + 6.0.0.Alpha2 @@ -50,9 +50,9 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 sigtest @@ -63,10 +63,10 @@ - cdi-api-jdk11.sig - jakarta.decorator,jakarta.enterprise,jakarta.interceptor + cdi-api-jdk17.sig + jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor target/classes - cdi-sig-report.txt + cdi-sig-report.xml diff --git a/pom.xml b/pom.xml index fc9fd64040..b0e5e79efc 100644 --- a/pom.xml +++ b/pom.xml @@ -246,9 +246,9 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1