Skip to content

Commit

Permalink
Merge pull request #150 from ivargrimstad/fix-javadoc-ee11-M1
Browse files Browse the repository at this point in the history 
Fix Javadoc
  • Loading branch information
@ivargrimstad
ivargrimstad committed Dec 15, 2023
2 parents 9390dfb + bcce2cf commit 77cb016
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 13 deletions.
9 changes: 6 additions & 3 deletions jakartaee-web-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@
<artifactId>jakarta-data-api</artifactId>
<version>${jakarta.data.version}</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-el-api</artifactId>
<version>${jakarta.enterprise.cdi-el-api.version}</version>
</dependency>

<!-- Override from core profile to be non-optional and compiled scope -->
<dependency>
<groupId>jakarta.el</groupId>
Expand Down Expand Up @@ -258,7 +264,6 @@
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation-api.version}</version>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<!-- work around for GLASSFISH-19861 -->
<dependency>
Expand Down Expand Up @@ -286,7 +291,6 @@
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta.xml.ws-api.version}</version>
<optional>true</optional>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -299,7 +303,6 @@
<artifactId>jakarta.xml.soap-api</artifactId>
<version>${jakarta.xml.soap-api.version}</version>
<optional>true</optional>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
33 changes: 23 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@
<jakarta.annotation-api.version>3.0.0-M1</jakarta.annotation-api.version>
<jakarta.inject.version>2.0.1</jakarta.inject.version>
<jakarta.interceptor-api.version>2.2.0-M1</jakarta.interceptor-api.version>
<jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version>
<jakarta.enterprise.cdi-api.version>4.1.0-M1</jakarta.enterprise.cdi-api.version>
<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>

<!-- Web Profile -->
<jakarta.servlet-api.version>6.1.0-M1</jakarta.servlet-api.version>
<jakarta.servlet.jsp-api.version>4.0.0-M1</jakarta.servlet.jsp-api.version>
<jakarta.servlet.jsp.jstl-api.version>3.0.0</jakarta.servlet.jsp.jstl-api.version>
<jakarta.faces-api.version>4.0.1</jakarta.faces-api.version>
<jakarta.faces-api.version>4.1.0-M1</jakarta.faces-api.version>
<jakarta.el-api.version>6.0.0-M1</jakarta.el-api.version>
<jakarta.websocket-api.version>2.2.0-M1</jakarta.websocket-api.version>
<jakarta.ejb-api.version>4.0.1</jakarta.ejb-api.version>
Expand All @@ -84,25 +84,26 @@
<jakarta.security.enterprise-api.version>4.0.0-M1</jakarta.security.enterprise-api.version>
<jakarta.enterprise.concurrent-api.version>3.1.0-M1</jakarta.enterprise.concurrent-api.version>
<jakarta.data.version>1.0.0-M1</jakarta.data.version>

<!-- Full platform -->
<jakarta.enterprise.cdi-el-api.version>4.1.0-M1</jakarta.enterprise.cdi-el-api.version>

<!-- Platform -->
<jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>
<jakarta.activation-api.version>2.1.1</jakarta.activation-api.version>
<jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
<jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
<jakarta.resource-api.version>2.1.0</jakarta.resource-api.version>
<jakarta.authorization-api.version>3.0.0-M1</jakarta.authorization-api.version>
<jakarta.batch-api.version>2.1.1</jakarta.batch-api.version>

<!-- Optional APIs -->
<jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
<jakarta.xml.ws-api.version>4.0.0</jakarta.xml.ws-api.version>
<jakarta.xml.soap-api.version>3.0.0</jakarta.xml.soap-api.version>
<!-- Optional APIs Plan to remove in EE 11 M2. -->
<jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
<jakarta.xml.ws-api.version>4.0.1</jakarta.xml.ws-api.version>
<jakarta.xml.soap-api.version>3.0.1</jakarta.xml.soap-api.version>

<!-- Other dependencies -->
<copyright-plugin.version>1.50</copyright-plugin.version>

<!-- Compile-time dependencies -->
<mojarra.version>4.0.5</mojarra.version>
<mojarra.version>4.1.0-M1</mojarra.version>

<!-- Java compiler release (replaces source and target)-->
<maven.compiler.release>21</maven.compiler.release>
Expand Down Expand Up @@ -286,6 +287,7 @@
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<stripVersion>true</stripVersion>
<excludeScope>provided</excludeScope>
<excludes>home/**</excludes>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -320,6 +322,8 @@
<exclude name="jakarta.enterprise.concurrent-api-sources-jar/**"/>
<exclude name="jakarta.security.enterprise-api-sources-jar/**"/>
<exclude name="jakarta.websocket-client-api-sources-jar/**"/>
<exclude name="jakarta.faces-api-sources-jar/**"/>

<!-- full -->
<exclude name="jakarta.authorization-api-sources-jar/**"/>
<exclude name="jakarta.jms-api-sources-jar/**"/>
Expand All @@ -330,6 +334,7 @@
<copy todir="${apidocs.api.src}/jakarta.cdi" >
<fileset dir="${apidocs.api.tmp}/jakarta.enterprise.cdi-api-sources-jar">
<include name="**/*"/>
<exclude name="**/home**"/>
</fileset>
</copy>
<copy todir="${apidocs.api.src}/jakarta.cdi.lang.model" >
Expand Down Expand Up @@ -370,6 +375,13 @@
</copy>
<!-- Workaround for https://github.com/jakartaee/data/issues/361 -->
<move file="${apidocs.api.src}/jakarta-data" tofile="${apidocs.api.src}/jakarta.data"/>
<move file="${apidocs.api.src}/jakarta.enterprise.cdi-el" tofile="${apidocs.api.src}/jakarta.cdi.el"/>

<copy todir="${apidocs.api.src}/jakarta.faces" >
<fileset dir="${apidocs.api.tmp}/jakarta.faces-api-sources-jar">
<include name="**/*" />
</fileset>
</copy>

<echo file="${apidocs.api.src}/jakarta.faces/module-info.java">
module jakarta.faces {
Expand Down Expand Up @@ -399,6 +411,7 @@ module jakarta.faces {
requires java.logging;
requires jakarta.el;
requires jakarta.cdi;
requires jakarta.cdi.el;
requires jakarta.servlet;
requires jakarta.validation;
requires jakarta.websocket;
Expand Down

0 comments on commit 77cb016

Please sign in to comment.