Skip to content

Commit

Permalink
Web profile is now a true dependency of Core profile, fixes #138
Browse files Browse the repository at this point in the history
  • Loading branch information
@lprimak
lprimak committed May 17, 2023
1 parent be9de89 commit f624654
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 98 deletions.
1 change: 1 addition & 0 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 Down
16 changes: 8 additions & 8 deletions jakartaee-core-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,31 +74,31 @@
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.rs-api.cp.version}</version>
<version>${jakarta.ws.rs-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>${jakarta.json-api.cp.version}</version>
<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.cp.version}</version>
<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.cp.version}</version>
<version>${jakarta.annotation-api.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>${jakarta.interceptor-api.cp.version}</version>
<version>${jakarta.interceptor-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
Expand All @@ -110,7 +110,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta.enterprise.cdi-api.cp.version}</version>
<version>${jakarta.enterprise.cdi-api.version}</version>
<optional>false</optional>
<exclusions>
<exclusion>
Expand All @@ -122,13 +122,13 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject.cp.version}</version>
<version>${jakarta.inject.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.lang-model</artifactId>
<version>${jakarta.enterprise.cdi-api.cp.version}</version>
<version>${jakarta.enterprise.cdi-api.version}</version>
<optional>false</optional>
</dependency>

Expand Down
103 changes: 29 additions & 74 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,6 +79,13 @@
</build>

<dependencies>
<!-- Core Profile API -->
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-core-api</artifactId>
<version>${project.version}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand All @@ -95,6 +110,7 @@
</exclusion>
</exclusions>
</dependency>
<!-- Override from core profile to be non-optional and compiled scope -->
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
Expand Down Expand Up @@ -125,12 +141,6 @@
</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>
Expand All @@ -143,24 +153,6 @@
<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>
Expand Down Expand Up @@ -203,42 +195,6 @@
</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>
Expand Down Expand Up @@ -275,20 +231,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 +252,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>
24 changes: 8 additions & 16 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,13 @@
<javadoc.options />

<!-- Core Profile -->
<!-- Theoretically these versions could be different from Web Profile -->
<jakarta.json-api.cp.version>2.1.0</jakarta.json-api.cp.version>
<jakarta.json.bind-api.cp.version>3.0.0</jakarta.json.bind-api.cp.version>
<jakarta.annotation-api.cp.version>2.1.1</jakarta.annotation-api.cp.version>
<jakarta.inject.cp.version>2.0.1</jakarta.inject.cp.version>
<jakarta.interceptor-api.cp.version>2.1.0</jakarta.interceptor-api.cp.version>
<jakarta.enterprise.cdi-api.cp.version>4.0.1</jakarta.enterprise.cdi-api.cp.version>
<jakarta.ws.rs-api.cp.version>3.1.0</jakarta.ws.rs-api.cp.version>
<jakarta.json-api.version>2.1.0</jakarta.json-api.version>
<jakarta.json.bind-api.version>3.0.0</jakarta.json.bind-api.version>
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
<jakarta.inject.version>2.0.1</jakarta.inject.version>
<jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
<jakarta.enterprise.cdi-api.version>4.0.1</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.0.0</jakarta.servlet-api.version>
Expand All @@ -61,19 +60,12 @@
<jakarta.faces-api.version>4.0.1</jakarta.faces-api.version>
<jakarta.el-api.version>5.0.1</jakarta.el-api.version>
<jakarta.websocket-api.version>2.1.0</jakarta.websocket-api.version>
<jakarta.json-api.version>2.1.0</jakarta.json-api.version>
<jakarta.json.bind-api.version>3.0.0</jakarta.json.bind-api.version>
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
<jakarta.ejb-api.version>4.0.1</jakarta.ejb-api.version>
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
<jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
<jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version>
<jakarta.inject.version>2.0.1</jakarta.inject.version>
<jakarta.authentication-api.version>3.0.0</jakarta.authentication-api.version>
<jakarta.security.enterprise-api.version>3.0.0</jakarta.security.enterprise-api.version>
<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
<jakarta.enterprise.concurrent-api.version>3.0.1</jakarta.enterprise.concurrent-api.version>

<!-- Full platform -->
Expand Down Expand Up @@ -247,7 +239,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<failOnError>false</failOnError>
<failOnError>true</failOnError>
<additionalJOptions>${javadoc.options}</additionalJOptions>
<docfilessubdirs>true</docfilessubdirs>
<javadocDirectory>${project.basedir}/../src/main/javadoc</javadocDirectory>
Expand Down

0 comments on commit f624654

Please sign in to comment.