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

FISH-5890 Upgrade MicroProfile Rest Client to 3.0 #4946

Closed
wants to merge 1 commit into from
Closed

FISH-5890 Upgrade MicroProfile Rest Client to 3.0 #4946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions ext/microprofile/mp-rest-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.ext.microprofile</groupId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -32,12 +32,12 @@
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-api</artifactId>
<version>2.0</version>
<version>${microprofile.rest.client.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
<version>1.3</version>
<version>${microprofile.config.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
Expand Down Expand Up @@ -72,7 +72,6 @@
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>${jsonp.ri.version}</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
Expand Down Expand Up @@ -110,7 +109,7 @@
<configuration>
<instructions>
<Export-Package>
org.glassfish.jersey.restclient.*;version=${project.version}
org.glassfish.jersey.microprofile.restclient.*;version=${project.version}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have this wrong in 3.1, I assume

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are planning 3.1.0-M2 this week, we should fix it there.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#4947

</Export-Package>
<Import-Package>
*
Expand Down
4 changes: 2 additions & 2 deletions ext/microprofile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<packaging>pom</packaging>

<modules>
<!-- <module>mp-rest-client</module>-->
<module>mp-config</module>
<module>mp-rest-client</module>
<module>mp-config</module>
</modules>


Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,7 +2081,8 @@

<bouncycastle.version>1.68</bouncycastle.version>
<commons-lang3.version>3.3.2</commons-lang3.version>
<microprofile.config.version>2.0</microprofile.config.version>
<microprofile.config.version>3.0.1</microprofile.config.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably should not update the config version to 3.x, there is no implementation for it out there, yet.

<microprofile.rest.client.version>3.0</microprofile.rest.client.version>
<checkstyle.mvn.plugin.version>3.1.0</checkstyle.mvn.plugin.version>
<checkstyle.version>8.28</checkstyle.version>
<easymock.version>3.3</easymock.version>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/microprofile/rest-client14-compatibility/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-api</artifactId>
<!-- specifically this version we check with the backward compatibility -->
<version>1.4.1</version>
<version>${microprofile.rest.client.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down