Skip to content

Commit

Permalink
Web profile is now a true dependency of Core profile, fixes jakartaee…
Browse files Browse the repository at this point in the history 
…#138
  • Loading branch information
@lprimak
lprimak committed May 30, 2023
1 parent e8fcd8c commit a8e27ce
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 128 deletions.
16 changes: 9 additions & 7 deletions jakartaee-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourcepath>${project.build.directory}/sources-dependency
:../jakartaee-core-api/target/sources-dependency
:../jakartaee-web-api/target/sources-dependency</sourcepath>
</configuration>
</plugin>
Expand All @@ -84,27 +85,31 @@
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-web-api</artifactId>
<version>${project.version}</version>
<optional>false</optional>
</dependency>
<!-- Core Profile API -->
<!-- We specify it here directly, so it's "closer" to the user app.
This way it will win in Maven's resolution mechanism -->
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation-api.version}</version>
<optional>false</optional>
</dependency>

<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>${jakarta.mail-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -116,7 +121,6 @@
<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
<version>${jakarta.resource-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -128,7 +132,6 @@
<groupId>jakarta.authorization</groupId>
<artifactId>jakarta.authorization-api</artifactId>
<version>${jakarta.authorization-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -140,7 +143,6 @@
<groupId>jakarta.batch</groupId>
<artifactId>jakarta.batch-api</artifactId>
<version>${jakarta.batch-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
2 changes: 0 additions & 2 deletions jakartaee-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta.enterprise.cdi-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -193,7 +192,6 @@
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<version>${jakarta.enterprise.cdi-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
Expand Down
24 changes: 8 additions & 16 deletions jakartaee-core-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,32 +74,27 @@
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.rs-api.cp.version}</version>
<optional>false</optional>
<version>${jakarta.ws.rs-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>${jakarta.json-api.cp.version}</version>
<optional>false</optional>
<version>${jakarta.json-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
<version>${jakarta.json.bind-api.cp.version}</version>
<optional>false</optional>
<version>${jakarta.json.bind-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api.cp.version}</version>
<optional>false</optional>
<version>${jakarta.annotation-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>${jakarta.interceptor-api.cp.version}</version>
<optional>false</optional>
<version>${jakarta.interceptor-api.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -110,8 +105,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta.enterprise.cdi-api.cp.version}</version>
<optional>false</optional>
<version>${jakarta.enterprise.cdi-api.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -122,14 +116,12 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject.cp.version}</version>
<optional>false</optional>
<version>${jakarta.inject.version}</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<version>${jakarta.enterprise.cdi-api.cp.version}</version>
<optional>false</optional>
<version>${jakarta.enterprise.cdi-api.version}</version>
</dependency>

<!-- Only needed to compile the RESTful Link class as it uses XML Binding -->
Expand Down
115 changes: 28 additions & 87 deletions jakartaee-web-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourcepath>${project.build.directory}/sources-dependency
:../jakartaee-core-api/target/sources-dependency</sourcepath>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -71,11 +79,16 @@
</build>

<dependencies>
<!-- Core Profile API -->
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -87,25 +100,23 @@
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>${jakarta.servlet.jsp-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Override from core profile to be non-optional and compiled scope -->
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>${jakarta.el-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>${jakarta.servlet.jsp.jstl-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -117,55 +128,27 @@
<groupId>jakarta.faces</groupId>
<artifactId>jakarta.faces-api</artifactId>
<version>${jakarta.faces-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.rs-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>${jakarta.websocket-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<version>${jakarta.websocket-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>${jakarta.json-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
<version>${jakarta.json.bind-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>${jakarta.ejb-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -177,7 +160,6 @@
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -189,61 +171,22 @@
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>${jakarta.persistence-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${jakarta.validation-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>${jakarta.interceptor-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta.enterprise.cdi-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<version>${jakarta.enterprise.cdi-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.authentication</groupId>
<artifactId>jakarta.authentication-api</artifactId>
<version>${jakarta.authentication-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -255,7 +198,6 @@
<groupId>jakarta.security.enterprise</groupId>
<artifactId>jakarta.security.enterprise-api</artifactId>
<version>${jakarta.security.enterprise-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -275,20 +217,6 @@
</exclusion>
</exclusions>
</dependency>
<!-- This is an optional dependency of Jakarta RESTful Web Services -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.bind-api.version}</version>
<optional>true</optional>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
Expand All @@ -310,6 +238,19 @@
</exclusion>
</exclusions>
</dependency>
<!-- Workaround for Javadoc failures -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.bind-api.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
</project>
Loading

0 comments on commit a8e27ce

Please sign in to comment.