Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add module-info to the api artifacts, update to Java SE 11 #565

Merged
merged 11 commits into from
Dec 7, 2021
Merged

Add module-info to the api artifacts, update to Java SE 11 #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a83acd5
Correct the readme url in 2021-10-25-pages-here.md
starksm64 Oct 26, 2021
398ef74
Merge branch 'eclipse-ee4j:master' into master
starksm64 Nov 17, 2021
3cd3501
Update asciidoc plugin and config for #558
starksm64 Nov 17, 2021
6580fb4
Add explicit asciidoctorj version and dependency, update sourceDirect…
starksm64 Nov 18, 2021
2ba1495
Correct the revnumber and revdate
starksm64 Nov 18, 2021
4d22186
Merge branch 'master' of https://github.com/eclipse-ee4j/cdi
starksm64 Nov 18, 2021
23ddc50
Merge branch 'master' of https://github.com/eclipse-ee4j/cdi
starksm64 Nov 27, 2021
61e44bc
Cleanup warnings
starksm64 Nov 28, 2021
1af72e8
Change to canAccess to avoid isAccessible deprecation
starksm64 Nov 28, 2021
548ab81
Add module infos to api artifacts
starksm64 Nov 28, 2021
c5a9680
Address comments from Ladicek
starksm64 Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 19 additions & 8 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,17 @@

<properties>
<annotation.api.version>2.1.0-B1</annotation.api.version>
<atinject.api.version>2.0.0</atinject.api.version>
<uel.api.version>4.0.0</uel.api.version>
<interceptor.api.version>2.0.0</interceptor.api.version>
<atinject.api.version>2.0.1</atinject.api.version>
<uel.api.version>5.0.0</uel.api.version>
<interceptor.api.version>2.0.1-RC1</interceptor.api.version>
<!-- These are only used in javadoc links -->
<ejb.api.version>4.0.0-RC2</ejb.api.version>
<transaction.api.version>2.0.0-RC2</transaction.api.version>

<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven-bundle-plugin.version>2.5.4</maven-bundle-plugin.version>
<maven-javadoc-plugin>3.2.0</maven-javadoc-plugin>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
<maven.compiler.release>11</maven.compiler.release>
<maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
<maven-javadoc-plugin>3.3.0</maven-javadoc-plugin>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -310,6 +309,15 @@
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -362,6 +370,7 @@
<excludes>
<exclude>**/privileged/**</exclude>
</excludes>
<useModulePath>false</useModulePath>
</configuration>
</execution>
<execution>
Expand All @@ -379,6 +388,7 @@
</includes>
<argLine>-Djava.security.manager -Djava.security.policy=${project.build.testOutputDirectory}/java.policy</argLine>
<forkCount>0</forkCount>
<useModulePath>false</useModulePath>
</configuration>
</execution>
</executions>
Expand All @@ -391,6 +401,7 @@
<docfilessubdirs>true</docfilessubdirs>
<description>Jakarta Context Dependency Injection API</description>
<doctitle>Jakarta Context Dependency Injection API</doctitle>
<detectJavaApiLink>false</detectJavaApiLink>
<windowtitle>Jakarta Context Dependency Injection API</windowtitle>
<header><![CDATA[<br>Jakarta Context Dependency Injection ${project.version}]]>
</header>
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/jakarta/enterprise/util/AnnotationLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ private static Object getMemberValue(Method member, Annotation instance) {

private static Object invoke(Method method, Object instance) {
try {
if (!method.isAccessible())
if (!method.canAccess(instance))
SecurityActions.setAccessible(method);
return method.invoke(instance);
} catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {
Expand Down
27 changes: 27 additions & 0 deletions api/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module jakarta.cdi {
exports jakarta.decorator;
exports jakarta.enterprise.context;
exports jakarta.enterprise.context.control;
exports jakarta.enterprise.context.spi;
exports jakarta.enterprise.event;
exports jakarta.enterprise.inject;
exports jakarta.enterprise.inject.build.compatible.spi;
exports jakarta.enterprise.inject.literal;
exports jakarta.enterprise.inject.se;
exports jakarta.enterprise.inject.spi;
exports jakarta.enterprise.inject.spi.configurator;
exports jakarta.enterprise.util;

requires transitive jakarta.annotation;
requires transitive jakarta.interceptor;
requires transitive jakarta.cdi.lang.model;
requires transitive jakarta.inject;
requires static jakarta.el;
// For javadoc
requires static java.naming;
//TODO: requires static jakarta.transation;

uses jakarta.enterprise.inject.se.SeContainerInitializer;
uses jakarta.enterprise.inject.spi.CDIProvider;
starksm64 marked this conversation as resolved.
Show resolved Hide resolved
uses jakarta.enterprise.inject.build.compatible.spi.BuildServices;
}
6 changes: 4 additions & 2 deletions api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ public SeContainerInitializer addExtensions(Extension... extensions) {
return null;
}

@SafeVarargs
@Override
public SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) {
public final SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) {
return null;
}

Expand All @@ -80,8 +81,9 @@ public SeContainerInitializer selectAlternatives(Class<?>... alternativeClasses)
return null;
}

@SafeVarargs
@Override
public SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
public final SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
return null;
}

Expand Down
6 changes: 4 additions & 2 deletions api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ public SeContainerInitializer addExtensions(Extension... extensions) {
return null;
}

@SafeVarargs
@Override
public SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) {
public final SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) {
return null;
}

Expand All @@ -80,8 +81,9 @@ public SeContainerInitializer selectAlternatives(Class<?>... alternativeClasses)
return null;
}

@SafeVarargs
@Override
public SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
public final SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
return null;
}

Expand Down
14 changes: 11 additions & 3 deletions lang-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
</licenses>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven-bundle-plugin.version>2.5.4</maven-bundle-plugin.version>
<maven.compiler.release>11</maven.compiler.release>
<maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
<maven-javadoc-plugin>3.2.0</maven-javadoc-plugin>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -46,6 +45,15 @@
</resources>

<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions lang-model/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module jakarta.cdi.lang.model {
exports jakarta.enterprise.lang.model;
exports jakarta.enterprise.lang.model.declarations;
exports jakarta.enterprise.lang.model.types;
}