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.

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

Upgrade MP Health to 3.1 and SR Health to 3.1.1 #18158

Merged
merged 1 commit into from
Jun 29, 2021

Conversation

xstefank
Copy link
Contributor

No description provided.

@quarkus-bot quarkus-bot bot added area/dependencies Pull requests that update a dependency file area/health area/smallrye labels Jun 25, 2021
@quarkus-bot
Copy link

quarkus-bot bot commented Jun 25, 2021

This workflow status is outdated as a new workflow run has been triggered.

Failing Jobs - Building 06ce892

Status Name Step Test failures Logs Raw logs
Initial JDK 11 Build Build ⚠️ Check → Logs Raw logs

@xstefank
Copy link
Contributor Author

quarkus-integration-test-reactive-messaging-kafka still depends on MP Health 3.0 so enforcer fails on dependency conflict.

@xstefank
Copy link
Contributor Author

Added enforcer skip for the relevant test module.

<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<skip>true</skip>
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure I like this fix. Which dependency does bring the old version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reactive messaging. I don't like it too but is there any other way around it?

Copy link
Member

Choose a reason for hiding this comment

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

Please don't disable all enforcer rules like this! I'll take a look and see if I can help.

Copy link
Member

Choose a reason for hiding this comment

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

IIUC, MP Health API 3.1 shall be used? If so, I strongly suggest to apply this:

diff --git a/integration-tests/reactive-messaging-kafka/pom.xml b/integration-tests/reactive-messaging-kafka/pom.xml
index 184230787f..3ca5928173 100644
--- a/integration-tests/reactive-messaging-kafka/pom.xml
+++ b/integration-tests/reactive-messaging-kafka/pom.xml
@@ -51,6 +51,13 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
+            <exclusions>
+                <!-- avoid convergence error; use health-api version from quarkus-smallrye-health -->
+                <exclusion>
+                    <groupId>org.eclipse.microprofile.health</groupId>
+                    <artifactId>microprofile-health-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>


@@ -175,13 +182,6 @@

     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll try, might work as this wasn't a breaking release. Of course this will need to be reverted in every case once RM is updated too.

Copy link
Member

Choose a reason for hiding this comment

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

FYI, this exclusion will be removed by #18334

@quarkus-bot
Copy link

quarkus-bot bot commented Jun 25, 2021

This workflow status is outdated as a new workflow run has been triggered.

Failing Jobs - Building a40f3f6

Status Name Step Test failures Logs Raw logs
Maven Tests - JDK 11 Build Test failures Logs Raw logs

Full information is available in the Build summary check run.

Test Failures

⚙️ Maven Tests - JDK 11 #

📦 integration-tests/maven

io.quarkus.maven.it.DevMojoIT.testThatNewResourcesAreServed line 849 - More details - Source on GitHub

@xstefank
Copy link
Contributor Author

So applied the suggestion from @famod. Thanks.

Copy link
Member

@gsmet gsmet left a comment

Choose a reason for hiding this comment

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

Thanks!

@gsmet
Copy link
Member

gsmet commented Jun 28, 2021

I pushed a rebase to get the latest CI fixes.

@gsmet gsmet added the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jun 28, 2021
@quarkus-bot
Copy link

quarkus-bot bot commented Jun 28, 2021

This workflow status is outdated as a new workflow run has been triggered.

🚫 This workflow run has been cancelled.

Failing Jobs - Building ea10da2

⚠️ Artifacts of the workflow run were not available thus the report misses some details.

Status Name Step Test failures Logs Raw logs
Gradle Tests - JDK 11 Windows Build ⚠️ Check → Logs Raw logs
JVM Tests - JDK 11 Build ⚠️ Check → Logs Raw logs
JVM Tests - JDK 11 Windows Build ⚠️ Check → Logs Raw logs
JVM Tests - JDK 16 Build ⚠️ Check → Logs Raw logs
Native Tests - Data3 Build ⚠️ Check → Logs Raw logs
Native Tests - HTTP Build ⚠️ Check → Logs Raw logs
Native Tests - Messaging1 Build ⚠️ Check → Logs Raw logs
Native Tests - Misc1 Build ⚠️ Check → Logs Raw logs
Native Tests - Misc2 Build ⚠️ Check → Logs Raw logs
Native Tests - Misc3 Build ⚠️ Check → Logs Raw logs
Native Tests - Misc4 Build ⚠️ Check → Logs Raw logs
Native Tests - Security1 Build ⚠️ Check → Logs Raw logs
Native Tests - Security2 Build ⚠️ Check → Logs Raw logs
Native Tests - Spring ⚠️ Check → Logs Raw logs
Native Tests - Windows - hibernate-validator ⚠️ Check → Logs Raw logs
Native Tests - gRPC ⚠️ Check → Logs Raw logs

@quarkus-bot
Copy link

quarkus-bot bot commented Jun 28, 2021

Failing Jobs - Building d767e4c

Status Name Step Test failures Logs Raw logs
Native Tests - Misc4 Build ⚠️ Check → Logs Raw logs

@gsmet gsmet merged commit 236c8b4 into quarkusio:main Jun 29, 2021
@quarkus-bot quarkus-bot bot added this to the 2.1 - main milestone Jun 29, 2021
@quarkus-bot quarkus-bot bot removed the triage/waiting-for-ci Ready to merge when CI successfully finishes label Jun 29, 2021
@xstefank xstefank deleted the mp-health-3.1 branch June 29, 2021 18:13
@famod famod mentioned this pull request Jul 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dependencies Pull requests that update a dependency file area/health area/smallrye
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants