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

JakartaEE packages and Quarkus 3.0.x #10791

Merged
merged 1 commit into from Apr 21, 2023

Conversation

ryanemerson
Copy link
Contributor

@ryanemerson ryanemerson commented Apr 5, 2023

https://issues.redhat.com/browse/ISPN-14734
https://issues.redhat.com/browse/ISPN-14735
https://issues.redhat.com/browse/ISPN-14745
https://issues.redhat.com/browse/ISPN-14746
https://issues.redhat.com/browse/ISPN-14747
https://issues.redhat.com/browse/ISPN-14764

The JCache modules make use of the -javaee jars as the spec is effectively frozen and will not transition to using the Jakarta packages: jsr107/jsr107spec#415.

I have had to include the Quarkus 3.0.0.CR2 work in this PR, as without it native compilation will always fail. For that reason we should probably squash all of the commits before merging.

@ryanemerson ryanemerson changed the title ISPN-14735 Default to JakartaEE packages JakartaEE packages and Quarkus 3.0.x Apr 5, 2023
build/configuration/pom.xml Outdated Show resolved Hide resolved
@ryanemerson ryanemerson force-pushed the jakarata_server branch 2 times, most recently from 1c3576c to 625a4b2 Compare April 6, 2023 14:52
Copy link
Member

@wburns wburns left a comment

Choose a reason for hiding this comment

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

LFTM as far as I can tell

@ryanemerson ryanemerson force-pushed the jakarata_server branch 2 times, most recently from 373afcb to 1be0911 Compare April 13, 2023 09:58
Copy link
Member

@pruivo pruivo left a comment

Choose a reason for hiding this comment

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

Did a quick look at the pom.xml (ignoring the code changes). LGTM just those 2 nitpicks 👍

quarkus/pom.xml Outdated Show resolved Hide resolved
quarkus/pom.xml Outdated Show resolved Hide resolved
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>narayana-jta-jakarta</artifactId>
<version>5.11.2.Final</version>
<version>${version.jboss.narayana.javaee}</version>
Copy link
Member

Choose a reason for hiding this comment

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

what is the error using 6.0.0.Final?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No idea. It was already set to 5.11.2.Final before this PR. I have reverted back to this.

Copy link
Member

Choose a reason for hiding this comment

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

It looks like it is broken in main

[INFO] org.infinispan:infinispan-hibernate-cache-commons:jar:15.0.0-SNAPSHOT
[INFO] +- org.jboss.narayana.jta:narayana-jta-jakarta:jar:5.11.2.Final:test
[INFO] \- org.jboss.narayana.jta:narayana-jta:jar:5.13.1.Final:test
[INFO] --- dependency:3.1.1:tree (default-cli) @ infinispan-hibernate-cache-spi ---
[INFO] org.infinispan:infinispan-hibernate-cache-spi:jar:15.0.0-SNAPSHOT
[INFO] \- org.jboss.narayana.jta:narayana-jta:jar:5.13.1.Final:test
[INFO] org.infinispan:infinispan-hibernate-cache-v62:jar:15.0.0-SNAPSHOT
[INFO] +- org.jboss.narayana.jta:narayana-jta-jakarta:jar:5.13.1.Final:test
[INFO] \- org.jboss.narayana.jta:narayana-jta:jar:6.0.0.CR1:test

Copy link
Member

Choose a reason for hiding this comment

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

my suggestion

  • hibernate/cache-commons/pom.xml

remove <version> and add <scope>test</scope> to narayana-jta-jakarta dependency

  • hibernate/cache-v62/pom.xml

remove

-      <!-- https://mvnrepository.com/artifact/org.jboss.narayana.jta/narayana-jta -->
-      <dependency>
-          <groupId>org.jboss.narayana.jta</groupId>
-          <artifactId>narayana-jta</artifactId>
-          <version>6.0.0.CR1</version>
-          <scope>test</scope>
-      </dependency>

remove <version>5.13.1.Final</version> from narayana-jta-jakarta

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @pruivo, I have applied your suggestion but removed narayana-jta-jakarta entirely as that does not exist for 6.0.x

Copy link
Member

Choose a reason for hiding this comment

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

Right, Narayana dropped javaee! 👍

@ryanemerson ryanemerson force-pushed the jakarata_server branch 3 times, most recently from 875e67c to a91642a Compare April 20, 2023 10:00
@ryanemerson
Copy link
Contributor Author

Rebased on top of the recent killing spree of JavaEE modules.

Requires #10847 before merging.

build/configuration/pom.xml Outdated Show resolved Hide resolved
@pruivo
Copy link
Member

pruivo commented Apr 20, 2023

is there anything missing? I can press the button 🥳

@ryanemerson
Copy link
Contributor Author

ryanemerson commented Apr 21, 2023

Everything is here. I just re-pushed, but the only change was removing the unused property so we should be good to go if the build passes.

- ISPN-14745 Narayana 6.0.0.Final

- ISPN-14746 Fabric8 kubernetes-client 6.5.1

- ISPN-14747 jboss-threads 3.5.0.Final

- ISPN-14748 Smallrye Mutiny 2.1.0

- ISPN-14764 Upgrade to plexus-utils 3.5.1

- ISPN-14734 Quarkus 3.0.0.CR2
@pruivo pruivo merged commit 41337a8 into infinispan:main Apr 21, 2023
3 of 4 checks passed
@pruivo
Copy link
Member

pruivo commented Apr 21, 2023

merged! thanks @ryanemerson !

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