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 to Camel Quarkus 2.14.0 #692

Merged
merged 3 commits into from Nov 8, 2022
Merged

Conversation

zbendhiba
Copy link
Collaborator

Make sure that you have run ./mvnw -Dsync and included the changes in your pull request (preferably in the same commit, unless it makes sense to do otherwise).

Thanks!

pom.xml Outdated
Comment on lines 453 to 456
<test><!-- Workaround hardcoded path -->
<skip>true</skip>
<artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-cxf-soap-grouped:${camel-quarkus-test-list.version}</artifact>
</test>
Copy link
Collaborator

@ppalaga ppalaga Nov 7, 2022

Choose a reason for hiding this comment

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

camel-quarkus-integration-test-cxf-soap-grouped contains many useful tests that are not failing. Thus, I'd vote for skipping only those specific tests with known issues via XSLT transformation in src/main/resources/xslt/camel/test-pom.xsl
The changes can be ported from 2.13 branch:

<!-- Disabled because of https://github.com/apache/camel-quarkus/issues/4254 -->
<xsl:template match="//pom:configuration[../pom:artifactId/text() = 'maven-surefire-plugin' and /pom:project/pom:artifactId/text() = 'camel-quarkus-integration-test-cxf-soap-grouped']">
<xsl:copy>
<xsl:apply-templates select="@* | node()" />
<xsl:comment>Some tests are disabled because of https://github.com/apache/camel-quarkus/issues/4254</xsl:comment>
<test>!*IT,!CxfSoapClientTest#wsdlUpToDate,!CxfSoapWssClientTest#wsdlUpToDate,!CxfSoapServiceTest#simpleSoapService</test>
</xsl:copy>
</xsl:template>
<!-- Disabled because of https://github.com/apache/camel-quarkus/issues/4255 -->
<xsl:template match="//pom:configuration[../pom:artifactId/text() = 'maven-surefire-plugin' and /pom:project/pom:artifactId/text() = 'camel-quarkus-integration-test-xml']">
<xsl:copy>
<xsl:apply-templates select="@* | node()" />
<xsl:comment>Some tests are disabled because of https://github.com/apache/camel-quarkus/issues/4255</xsl:comment>
<test>!*IT,!XmlTest#aggregate,!XmlTest#xsltSchemas</test>
</xsl:copy>
</xsl:template>

The above snippet covers also camel-quarkus-integration-test-xml where we could also skip just the two failing tests and keep the rest active.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@zbendhiba thanks for explanation. I pushed again, let me know if it's okay.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@ppalaga this should be removed maybe in 2.13 branch

<test><!-- Workaround hardcoded path -->

@gsmet
Copy link
Member

gsmet commented Nov 8, 2022

I added a commit to unhide Camel Quarkus as I had to hide it temporarily to release the CR1.

@zbendhiba probably a good idea for you to subscribe to quarkus-platform-coordination@googlegroups.com. It's a low traffic ML dealing with platform scheduling and platform issues.

pom.xml Outdated
Comment on lines 457 to 461
<test>
<!-- Workaround flaky XML test : https://github.com/apache/camel-quarkus/issues/4258 -->
<skip>true</skip>
<artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-cxf-soap:${camel-quarkus-test-list.version}</artifact>
<artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-xml:${camel-quarkus-test-list.version}</artifact>
</test>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

I pushed an update as I need this merged sooner rather than later :).

Individual tests are being ignored thanks to the XSL transformation.
@gsmet gsmet merged commit a339674 into quarkusio:main Nov 8, 2022
@zbendhiba zbendhiba deleted the cq-2.14.0 branch November 10, 2022 14:03
@zbendhiba
Copy link
Collaborator Author

Thanks @gsmet @ppalaga

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants