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

fast-track: Override the license directory path in the API to ensure the license … #1251

Merged
merged 3 commits into from
Apr 2, 2024
Merged

fast-track: Override the license directory path in the API to ensure the license … #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d1784e
Override the license directory path in the API to ensure the license …
jamezp Apr 1, 2024
66b073d
Update the spec.version used for OSGi.
jamezp Apr 1, 2024
10ff702
Remove unneeded dependencies from the API. Upgrade some dependencies …
jamezp Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions jaxrs-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<version>4.0.0-SNAPSHOT</version>
</parent>

<properties>
<legal.doc.folder>${project.basedir}/..</legal.doc.folder>
</properties>

<build>
<finalName>${project.artifactId}</finalName>
<plugins>
Expand Down Expand Up @@ -81,19 +85,6 @@
</build>

<dependencies>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions jaxrs-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
<servlet.api.version>6.1.0-M2</servlet.api.version>
<common.httpclient.version>3.1</common.httpclient.version>
<arquillian.version>1.8.0.Final</arquillian.version>
<annotation-api.version>3.0.0-M1</annotation-api.version>
<activation-api.version>2.1.3</activation-api.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -89,7 +87,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${annotation-api.version}</version>
</dependency>

<dependency>
Expand All @@ -101,7 +98,6 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${activation-api.version}</version>
</dependency>

<dependency>
Expand Down
12 changes: 9 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@
<api.package>jakarta.ws.rs</api.package>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip.release.tests>false</skip.release.tests>
<spec.version>3.2</spec.version>
<spec.version>4.0</spec.version>
<spec.version.revision /> <!-- e.g. (Rev a) -->

<annotation.api.version>2.1.1</annotation.api.version>
<activation.api.version>2.0.0</activation.api.version>
<annotation.api.version>3.0.0-M1</annotation.api.version>
<activation.api.version>2.1.3</activation.api.version>
<inject.api.version>2.0.0</inject.api.version>
<validation.api.version>3.0.0</validation.api.version>
<concurrent.api.version>2.0.0</concurrent.api.version>
Expand Down Expand Up @@ -139,31 +139,37 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Used only in the examples -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${annotation.api.version}</version>
</dependency>
<!-- Required for the TCK -->
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${activation.api.version}</version>
</dependency>
<!-- Used onlu in the examples -->
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${inject.api.version}</version>
</dependency>
<!-- Used only in the examples -->
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${cdi.api.version}</version>
</dependency>
<!-- Used only in the examples -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${validation.api.version}</version>
</dependency>
<!-- Used only in the examples -->
<dependency>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent-api</artifactId>
Expand Down