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

feat: adds support for Jakarta EE based test enrichers #238

Merged
merged 14 commits into from
Apr 21, 2020
Merged

feat: adds support for Jakarta EE based test enrichers #238

merged 14 commits into from
Apr 21, 2020

Conversation

starksm64
Copy link
Member

Signed-off-by: Scott M Stark starksm64@gmail.com

Short description of what this resolves:

Add testenrichers for the Jakarta EE 9 APIs

Changes proposed in this pull request:

Add new testenricher modules:

  • cdi-jakarta
  • ejb-jakarta
  • resource-jakarta

Fixes #237

manovotn
manovotn reviewed Apr 16, 2020
View reviewed changes
Copy link
Contributor

@manovotn manovotn left a comment

Choose a reason for hiding this comment

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

Seeing this is a new module, can you incorporate the changes I did in #239 into this PR's CDI module? Then I could close my original one and we would end with two versions supporting everything from ancient version to newest jakarta.

@starksm64 starksm64 mentioned this pull request Apr 16, 2020
Closed
manovotn
manovotn suggested changes Apr 16, 2020
View reviewed changes
Copy link
Contributor

@manovotn manovotn left a comment

Choose a reason for hiding this comment

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

@starksm64 you misunderstood me, I meant to include those changes into the new module(cdi-jakarta), you applied them to the old one (cdi).

@manovotn
Copy link
Contributor

Since I cannot add commits directly into this PR, I've filed a PR against the branch where this PR originates - https://github.com/jakartaredhat/arquillian-core/pull/1.

The changes are:

  • Reverts one of the commits and applies those changes to correct module
  • Temporarily disables new module CDI tests so that we have a passing and releaseable build. This is noted in code and should be removed as soon as we have Weld release out.

@bartoszmajsak
Copy link
Member

@starksm64 could you update your PR with the changes from master? I changed the build to be run on CircleCI instead of travis (with bunch of other small things). Travis seems to be having more and more hiccups than in the past which is blocking PRs for no reason.

bartoszmajsak
bartoszmajsak requested changes Apr 20, 2020
View reviewed changes
Copy link
Member

@bartoszmajsak bartoszmajsak left a comment

Choose a reason for hiding this comment

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

Thanks a lot for this work. Shared a few points to discuss / adjust.

Also - I don't know the whole codebase by heart but it looks to me it's been mainly about changing package namespaces. If there's some significant code change could you point me to it?

@manovotn I will cut alpha release immediately when this lands on the master.

testenrichers/cdi/pom.xml Outdated Show resolved Hide resolved
...s/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/MethodParameterInjectionPoint.java Outdated Show resolved Hide resolved
...rs/cdi/src/test/java/org/jboss/arquillian/testenricher/cdi/CDIInjectionEnricherTestCase.java Outdated Show resolved Hide resolved
testenrichers/ejb-jakarta/pom.xml Outdated Show resolved Hide resolved
...rs/ejb-jakarta/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java Outdated Show resolved Hide resolved
...rc/main/java/org/jboss/arquillian/testenricher/ejb/container/EJBEnricherRemoteExtension.java Outdated Show resolved Hide resolved
...jakarta/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension Show resolved Hide resolved
testenrichers/resource-jakarta/pom.xml Outdated Show resolved Hide resolved
...arta/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java Outdated Show resolved Hide resolved
.../java/org/jboss/arquillian/testenricher/resource/client/ResourceEnricherArchiveAppender.java Outdated Show resolved Hide resolved
@manovotn
Copy link
Contributor

@bartoszmajsak thanks! Changes in jakartaredhat#1 should also get into PR before merging.

@bartoszmajsak
Copy link
Member

@bartoszmajsak thanks! Changes in jakartaredhat#1 should also get into PR before merging.

ACK, thank you for collaborating on that. I will wait for @starksm64 to bring it here.

starksm64 and others added 14 commits April 20, 2020 11:08
@starksm64
Add support for Jakarta EE 9 API based cdi, ejb, resource testenrichers
f75e8d9 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
Incorporate @manovotn changes from PR #239
93cead5 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
Add the -jarkata version of enrichers to bom
a98a4f8 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@manovotn @starksm64
Revert "Incorporate @manovotn changes from PR #239"
8e47fd8 
This reverts commit 38b9368.
@manovotn @starksm64
Make the new module use proper CDI API to bootstrap container, tempor…
77a2c27 
…arily ignore few tests until Weld release is out.
@starksm64
Remove commented out plugin
afd32b3
@starksm64
Update copyrights on new testenrichers
1a3fee2 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
Fix the javax.ejb.EJB classname to jakarta.ejb.EJB
637fd26 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
Introduce version.jakarta.annotation
39a1dc6 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
Collapse exception blocks
baec24a 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
add version.jakarta.cdi-api
165fd29 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
Add -jakarta to the new testenricher archive appenders
d6f15c5 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
Remove obsolete todo comment
898e444 
Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64
Simplify the tryResrouceLookup exception catch to avoid signature che…
8b59f46 
…ck failures

Signed-off-by: Scott M Stark <starksm64@gmail.com>
@starksm64 starksm64 requested a review from bartoszmajsak April 20, 2020 17:19
bartoszmajsak
bartoszmajsak reviewed Apr 21, 2020
View reviewed changes
testenrichers/cdi-jakarta/pom.xml
Comment on lines +28 to +29
<!-- Weld version is to be replaced by 4.x as soon as release is out, also re-enable CDIInjectionEnricherTestCase -->
<version.weld-core>3.1.4.Final</version.weld-core>
Copy link
Member

Choose a reason for hiding this comment

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

#242

bartoszmajsak
bartoszmajsak approved these changes Apr 21, 2020
View reviewed changes
Copy link
Member

@bartoszmajsak bartoszmajsak left a comment

Choose a reason for hiding this comment

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

Thanks, gonna cut the release today.

@bartoszmajsak bartoszmajsak changed the title Add support for Jakarta EE 9 API based cdi, ejb, resource testenrichers feat: adds support for Jakarta EE based test enrichers Apr 21, 2020
@bartoszmajsak bartoszmajsak merged commit eec6eb4 into arquillian:master Apr 21, 2020
@bartoszmajsak bartoszmajsak mentioned this pull request Jun 24, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manovotn manovotn manovotn requested changes

@bartoszmajsak bartoszmajsak bartoszmajsak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Need a new release for Jakarta EE 9 updates
3 participants
@starksm64 @manovotn @bartoszmajsak