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

Create and update several Jakarta EE 10 API bundles #21535

Merged
merged 2 commits into from
Jun 30, 2022
Merged

Create and update several Jakarta EE 10 API bundles #21535

merged 2 commits into from
Jun 30, 2022

Conversation

jhanders34
Copy link
Member

@jhanders34 jhanders34 commented Jun 23, 2022 •
edited
Loading

  • Add Jakarta EE10 tests for other compatible features
  • Add most of the missing EE10 component API bundles
  • Add missing api bundles except for a few which don't use the ones from jakarta group.
  • Update the version for the EE9 API bundles so it doesn't pull in the EE10 API artifacts
  • Update the jakarta version properties for the transformer to be right for EE9, EE10 and the EE9/EE10 file.
  • Update servlet and json b to their final API version
  • Change to export servlet APIs as 6.0 instead of 5.0.
  • Update buildpath and import statements to work with the new API versions.
  • Move CDI, lang-model and annotation API bundles to their x.y.1 version.
  • Add jsonp-2.1 feature to the appSecurity-5.0 feature.

@jhanders34 jhanders34 requested review from tevans78 and pmd1nh June 23, 2022 22:44
@jhanders34 jhanders34 self-assigned this Jun 23, 2022
@jhanders34
Copy link
Member Author

#build #spawn.fullfat.buckets=io.openliberty.jakartaee10.internal_fat

@LibbyBot
Copy link

Joe's DHE check:

✔️ I found your oss_ibm.maven GAV artifacts on DHE. Thank you! ✔️

@LibbyBot
Copy link

Please code review feature-related files, @OpenLiberty/delivery-approvers

@LibbyBot
Copy link

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_dMOy4PNIEeyYXLZn0n3zUg

Target locations of links might be accessible only to IBM employees.

pmd1nh
pmd1nh approved these changes Jun 24, 2022
View reviewed changes
Copy link
Member

@pmd1nh pmd1nh left a comment

Choose a reason for hiding this comment

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

Reviewed jakarta.servlet-api official jar is updated in dev/io.openliberty.jakarta.servlet.6.0/bnd.bnd and exports as 6.0; also removed from dev/cnf/oss_ibm.maven

@pmd1nh pmd1nh mentioned this pull request Jun 24, 2022
Closed
dmuelle
dmuelle approved these changes Jun 24, 2022
View reviewed changes
Copy link
Member

@dmuelle dmuelle left a comment

Choose a reason for hiding this comment

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

made a few minor suggestions since Libby is flagging the nlsprops for review- but I imagine these aren't new messages and might not be able to update them in the scope of this PR so I'll approve so as not to block it unnecessarily.

...ources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops Outdated Show resolved Hide resolved
...ources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops Outdated Show resolved Hide resolved
...ources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops Outdated Show resolved Hide resolved
tevans78
tevans78 reviewed Jun 24, 2022
View reviewed changes
dev/io.openliberty.jakarta.batch.2.1/src/jakarta/batch/runtime/BatchRuntime.java
@@ -0,0 +1,113 @@
/*
Copy link
Member

Choose a reason for hiding this comment

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

Is this a temporary overlay? Where can the original be found? What is the delta that we are adding? Is there an issue open to remove the overlay again in the future?

Copy link
Member Author

Choose a reason for hiding this comment

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

It was an overlay in 2.0 as well. That is how it works with batch. @scottkurz can explain about it. I took the source from the maven repo sources.zip and used the 2.0 version and put the changes that were done in the 2.0 version into the 2.1 version.

Copy link
Member Author

Choose a reason for hiding this comment

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

To answer the rest of the question, most of the class is modified.

Copy link
Member Author

Choose a reason for hiding this comment

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

There may be a way to improve this. May need to talk with @scottkurz and/or @cgianfra about it.

Copy link
Member

Choose a reason for hiding this comment

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

It's been an "overlay" since batch-1.0 back in 2015 or so (EE 7).

The API JAR from Maven Central uses ServiceLoader to find the JobOperator . In batch-1.0 we decided to use this approach to get a hold of our DS instance rather than I guess exposing it to the ServiceLoader. I'm sure whoever we asked at the time suggested this approach.

I'm curious what other APIs/features in Liberty do in similar situations. We did say clearly though in the Batch 2.1 UFO that it worked this way and that an application could NOT load a different impl using META-INF/services and ServiceLoader.

It's not something that we expect will change except possibly on a release boundary.

@cgianfra maybe you should review the 2.0 vs. 2.1 batch-api Maven JARs to see if there are any changes we should pull in.

Also the "batch.container.unavailable" message doesn't seem right to me. What does this have to do with <batchPersistence /> not being configured? Maybe this message has been dragged along since an early prototype?

Copy link
Member

Choose a reason for hiding this comment

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

While the copyright holder (IBM) is unlikely to sue in this case ;-), more generally the Apache v2 license states You must cause any modified files to carry prominent notices stating that You changed the files.

@jhanders34 jhanders34 force-pushed the perf-improvement7 branch 5 times, most recently from 6062a5d to 7a5b8ab Compare June 25, 2022 11:29
@LibbyBot
Copy link

The build jhanders34-21535-20220624-1649
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_rCtlAPQNEeyYXLZn0n3zUg
completed and has errors or failures.

For help analyzing your personal build, go to https://cognitive.hursley.ibm.com/buildAnalysis.html?uuid=_rCtlAPQNEeyYXLZn0n3zUg

@jhanders34 jhanders34 force-pushed the perf-improvement7 branch 2 times, most recently from f5fd36c to 028ed73 Compare June 26, 2022 22:36
@LibbyBot
Copy link

The build jhanders34-21535-20220626-0728
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_280h4PVSEey3m9ea3wJj4A
completed and has errors or failures.

For help analyzing your personal build, go to https://cognitive.hursley.ibm.com/buildAnalysis.html?uuid=_280h4PVSEey3m9ea3wJj4A

KyleAure
KyleAure approved these changes Jun 27, 2022
View reviewed changes
Copy link
Member

@KyleAure KyleAure left a comment

Choose a reason for hiding this comment

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

JSONB changes look good

@jhanders34 jhanders34 force-pushed the perf-improvement7 branch 3 times, most recently from 26ee719 to 55a60da Compare June 27, 2022 18:27
volosied
volosied reviewed Jun 27, 2022
View reviewed changes
dev/io.openliberty.jakarta.pages.tld.3.0/bnd.bnd Outdated
@@ -13,7 +13,7 @@ bVersion=1.0
-nouses=true

Bundle-SymbolicName: io.openliberty.jakarta.pages.tld.3.0
Bundle-Description: Jakarta Standard Tag Library, version 2.0
Bundle-Description: Jakarta Standard Tag Library, version 3.0
Copy link
Member

Choose a reason for hiding this comment

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

This is actually version 2.0, but the bundle name actually refers to 3.0 version in pages 3.0, not the underlying Tags technology. I don't know why we did this. I think we should rename to bundle now that we have Jakarta Tags 3.0 out.

Copy link
Member

@volosied volosied Jun 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

It's supposed to mimic this jsp 2.2/2.3 jar:

open-liberty/dev/com.ibm.websphere.appserver.features/visibility/public/jsp-2.3/com.ibm.websphere.appserver.jsp-2.3.feature

Line 48 in 90dd7eb

com.ibm.websphere.javaee.jsp.tld.2.2; location:=dev/api/spec/

Also related -- #18470

Copy link
Member Author

Choose a reason for hiding this comment

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

So I should leave it be 2.0?

Copy link
Member Author

Choose a reason for hiding this comment

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

I put it back to 2.0

@volosied volosied mentioned this pull request Jun 27, 2022
Closed
@LibbyBot
Copy link

The build jhanders34-21535-20220627-1251
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_Holo0PZJEey3m9ea3wJj4A
completed and has errors or failures.

For help analyzing your personal build, go to https://cognitive.hursley.ibm.com/buildAnalysis.html?uuid=_Holo0PZJEey3m9ea3wJj4A

@LibbyBot
Copy link

The build jhanders34-21535-20220627-1353
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_ieO78PZREey3m9ea3wJj4A
completed and has errors or failures.

For help analyzing your personal build, go to https://cognitive.hursley.ibm.com/buildAnalysis.html?uuid=_ieO78PZREey3m9ea3wJj4A

@jhanders34
Copy link
Member Author

#libby

@jhanders34
Add Jakarta EE10 tests for other compatible features
8c5f9c4
@jhanders34
Add most of the missing EE10 component API bundles
1be2022 
- Add missing api bundles except for a few which don't use the ones from
jakarta group.
- Update the version for the EE9 API bundles so it doesn't pull in the
EE10 API artifacts
- Update the jakarta version properties for the transformer to be right
for EE9, EE10 and the EE9/EE10 file.
- Update servlet and json b to their final API version
- Change to export servlet APIs as 6.0 instead of 5.0.
- Update buildpath and import statements to work with the new API
versions.
@LibbyBot
Copy link

Code analysis and actions

DO NOT DELETE THIS COMMENT.

  • 77 product code files were changed.

  • Please describe in a separate comment how you tested your changes.

  • 5 infrastructure code files were changed.

  • 7 FAT files were changed, added, or removed.

  • Check that the build did not break the affected FAT suite(s).

  • 15 messages files were changed and need an L2 review.

  • @OpenLiberty/message-reviewer Please review.

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_zh_TW.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_cs.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_es.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_hu.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_pt_BR.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_ru.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_zh.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_fr.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_ro.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_it.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_ko.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_ja.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_de.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_pl.nlsprops

  • 15 NLS files were changed and need an ID review.

  • @OpenLiberty/message-reviewer Please review.

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_zh_TW.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_cs.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_es.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_hu.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_pt_BR.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_ru.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_zh.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_fr.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_ro.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_it.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_ko.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_ja.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_de.nlsprops

  • dev/io.openliberty.jakarta.batch.2.1/resources/io/openliberty/jbatch/jakarta/batch/runtime/internal/resources/BatchMessages_pl.nlsprops

@LibbyBot
Copy link

Joe's DHE check:

✔️ I found your oss_ibm.maven GAV artifacts on DHE. Thank you! ✔️

@LibbyBot
Copy link

The build jhanders34-21535-20220628-0332
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_FFgLIPbEEey3m9ea3wJj4A
completed and has errors or failures.

For help analyzing your personal build, go to https://cognitive.hursley.ibm.com/buildAnalysis.html?uuid=_FFgLIPbEEey3m9ea3wJj4A

@jhanders34 jhanders34 merged commit 352b5d6 into OpenLiberty:integration Jun 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tevans78 tevans78 tevans78 approved these changes

@njr-11 njr-11 njr-11 left review comments

@dmuelle dmuelle dmuelle approved these changes

@KyleAure KyleAure KyleAure approved these changes

@pmd1nh pmd1nh pmd1nh approved these changes

@pnicolucci pnicolucci pnicolucci approved these changes

@neuwerk neuwerk neuwerk approved these changes

@volosied volosied volosied approved these changes

@scottkurz scottkurz scottkurz approved these changes

Assignees

@jhanders34 jhanders34

Labels
CLA Signed ID reviewed team:Performance
Projects
None yet
Milestone
[Iteration 22.12] Jun 13 - Jun 24
Development

Successfully merging this pull request may close these issues.