-
Notifications
You must be signed in to change notification settings - Fork 7
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
Move components to Jakarta EE 10 (fixes #416) #536
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # eclipse/bundles/org.openntf.xsp.jaxrs.factory/META-INF/MANIFEST.MF # eclipse/nsfs/nsf-jakartaee-jpa-example/META-INF/MANIFEST.MF
…es to 3.1.1 (Issue #416)
# Conflicts: # eclipse/bundles/org.openntf.xsp.beanvalidation/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.beanvalidation/pom.xml # eclipse/bundles/org.openntf.xsp.cdi.jigsaw/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.cdi.jigsaw/pom.xml # eclipse/bundles/org.openntf.xsp.cdi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.cdi/pom.xml # eclipse/bundles/org.openntf.xsp.cdi/src/org/openntf/xsp/cdi/provider/DominoCDIProvider.java # eclipse/bundles/org.openntf.xsp.el/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.el/pom.xml # eclipse/bundles/org.openntf.xsp.jakarta.concurrency/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakarta.concurrency/pom.xml # eclipse/bundles/org.openntf.xsp.jakarta.persistence/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakarta.persistence/pom.xml # eclipse/bundles/org.openntf.xsp.jakarta.servlet/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakarta.servlet/pom.xml # eclipse/bundles/org.openntf.xsp.jakarta.transaction/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakarta.transaction/pom.xml # eclipse/bundles/org.openntf.xsp.jakartaee.bridge.jasapi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakartaee.bridge.jasapi/pom.xml # eclipse/bundles/org.openntf.xsp.jakartaee.commons/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakartaee.commons/pom.xml # eclipse/bundles/org.openntf.xsp.jakartaee.osgiresourcelocator/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakartaee.osgiresourcelocator/pom.xml # eclipse/bundles/org.openntf.xsp.jaxrs.cdi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jaxrs.cdi/pom.xml # eclipse/bundles/org.openntf.xsp.jaxrs.factory/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jaxrs.factory/pom.xml # eclipse/bundles/org.openntf.xsp.jaxrs.providers/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jaxrs.providers/pom.xml # eclipse/bundles/org.openntf.xsp.jaxrs/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jaxrs/pom.xml # eclipse/bundles/org.openntf.xsp.jsf/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jsf/pom.xml # eclipse/bundles/org.openntf.xsp.jsf/src/org/openntf/xsp/jsf/nsf/NSFJsfServlet.java # eclipse/bundles/org.openntf.xsp.jsonapi.cdi/pom.xml # eclipse/bundles/org.openntf.xsp.jsonapi.jaxrs/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jsonapi.jaxrs/pom.xml # eclipse/bundles/org.openntf.xsp.jsonapi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jsonapi/pom.xml # eclipse/bundles/org.openntf.xsp.jsp/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jsp/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.config/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.config/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.fault.tolerance/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.fault.tolerance/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.health/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.health/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.metrics/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.metrics/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.openapi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.openapi/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.rest.client/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.rest.client/pom.xml # eclipse/bundles/org.openntf.xsp.mvc/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.mvc/pom.xml # eclipse/bundles/org.openntf.xsp.nosql.driver.lsxbe/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.nosql.driver.lsxbe/pom.xml # eclipse/bundles/org.openntf.xsp.nosql.driver/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.nosql.driver/pom.xml # eclipse/bundles/org.openntf.xsp.nosql/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.nosql/pom.xml # eclipse/features/org.openntf.xsp.beanvalidation.feature/feature.xml # eclipse/features/org.openntf.xsp.beanvalidation.feature/pom.xml # eclipse/features/org.openntf.xsp.cdi.feature/feature.xml # eclipse/features/org.openntf.xsp.cdi.feature/pom.xml # eclipse/features/org.openntf.xsp.el.feature/feature.xml # eclipse/features/org.openntf.xsp.el.feature/pom.xml # eclipse/features/org.openntf.xsp.jakarta.persistence.feature/feature.xml # eclipse/features/org.openntf.xsp.jakarta.persistence.feature/pom.xml # eclipse/features/org.openntf.xsp.jakarta.servlet.feature/feature.xml # eclipse/features/org.openntf.xsp.jakarta.servlet.feature/pom.xml # eclipse/features/org.openntf.xsp.jakartaee.feature/feature.xml # eclipse/features/org.openntf.xsp.jakartaee.feature/pom.xml # eclipse/features/org.openntf.xsp.jaxrs.feature/feature.xml # eclipse/features/org.openntf.xsp.jaxrs.feature/pom.xml # eclipse/features/org.openntf.xsp.jsf.feature/feature.xml # eclipse/features/org.openntf.xsp.jsf.feature/pom.xml # eclipse/features/org.openntf.xsp.jsonapi.feature/feature.xml # eclipse/features/org.openntf.xsp.jsonapi.feature/pom.xml # eclipse/features/org.openntf.xsp.jsp.feature/feature.xml # eclipse/features/org.openntf.xsp.jsp.feature/pom.xml # eclipse/features/org.openntf.xsp.microprofile.config.feature/feature.xml # eclipse/features/org.openntf.xsp.microprofile.config.feature/pom.xml # eclipse/features/org.openntf.xsp.microprofile.fault.tolerance.feature/feature.xml # eclipse/features/org.openntf.xsp.microprofile.fault.tolerance.feature/pom.xml # eclipse/features/org.openntf.xsp.microprofile.health.feature/feature.xml # eclipse/features/org.openntf.xsp.microprofile.health.feature/pom.xml # eclipse/features/org.openntf.xsp.microprofile.rest.client.feature/feature.xml # eclipse/features/org.openntf.xsp.microprofile.rest.client.feature/pom.xml # eclipse/features/org.openntf.xsp.mvc.feature/feature.xml # eclipse/features/org.openntf.xsp.mvc.feature/pom.xml # eclipse/features/org.openntf.xsp.nosql.feature/feature.xml # eclipse/features/org.openntf.xsp.nosql.feature/pom.xml # eclipse/nsfs/nsf-jakartaee-bundle-example/pom.xml # eclipse/nsfs/nsf-jakartaee-bundlebase-example/pom.xml # eclipse/nsfs/nsf-jakartaee-example/pom.xml # eclipse/nsfs/nsf-jakartaee-jpa-example/pom.xml # eclipse/nsfs/nsf-jakartaee-jsonbconfig-example/pom.xml # eclipse/nsfs/nsf-jakartaee-primefaces-example/pom.xml # eclipse/pom.xml # eclipse/releng/org.openntf.xsp.jakartaee.source.updatesite/pom.xml # eclipse/releng/org.openntf.xsp.jakartaee.updatesite/pom.xml # eclipse/releng/xsp-jakartaee-dist/pom.xml # eclipse/tests/it-xsp-jakartaee/pom.xml # eclipse/tests/org.openntf.xsp.beanvalidation.test/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.beanvalidation.test/pom.xml # eclipse/tests/org.openntf.xsp.jakarta.example.webapp/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.jakarta.example.webapp/pom.xml # eclipse/tests/org.openntf.xsp.jakartaee.test/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.jakartaee.test/pom.xml # eclipse/tests/org.openntf.xsp.jsonapi.test/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.jsonapi.test/pom.xml # eclipse/tests/org.openntf.xsp.test.beanbundle/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.test.beanbundle/pom.xml # eclipse/tests/org.openntf.xsp.test.jasapi/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.test.jasapi/pom.xml # eclipse/tests/org.openntf.xsp.test.postinstall/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.test.postinstall/pom.xml
# Conflicts: # eclipse/bundles/org.openntf.xsp.beanvalidation/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.beanvalidation/pom.xml # eclipse/bundles/org.openntf.xsp.cdi.jigsaw/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.cdi.jigsaw/pom.xml # eclipse/bundles/org.openntf.xsp.cdi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.cdi/pom.xml # eclipse/bundles/org.openntf.xsp.el/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.el/pom.xml # eclipse/bundles/org.openntf.xsp.jakarta.concurrency/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakarta.concurrency/pom.xml # eclipse/bundles/org.openntf.xsp.jakarta.persistence/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakarta.persistence/pom.xml # eclipse/bundles/org.openntf.xsp.jakarta.servlet/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakarta.servlet/pom.xml # eclipse/bundles/org.openntf.xsp.jakarta.transaction/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakarta.transaction/pom.xml # eclipse/bundles/org.openntf.xsp.jakartaee.bridge.jasapi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakartaee.bridge.jasapi/pom.xml # eclipse/bundles/org.openntf.xsp.jakartaee.commons/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakartaee.commons/pom.xml # eclipse/bundles/org.openntf.xsp.jakartaee.osgiresourcelocator/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jakartaee.osgiresourcelocator/pom.xml # eclipse/bundles/org.openntf.xsp.jaxrs.cdi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jaxrs.cdi/pom.xml # eclipse/bundles/org.openntf.xsp.jaxrs.factory/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jaxrs.factory/pom.xml # eclipse/bundles/org.openntf.xsp.jaxrs.providers/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jaxrs.providers/pom.xml # eclipse/bundles/org.openntf.xsp.jaxrs/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jaxrs/pom.xml # eclipse/bundles/org.openntf.xsp.jsf/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jsf/pom.xml # eclipse/bundles/org.openntf.xsp.jsonapi.cdi/pom.xml # eclipse/bundles/org.openntf.xsp.jsonapi.jaxrs/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jsonapi.jaxrs/pom.xml # eclipse/bundles/org.openntf.xsp.jsonapi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jsonapi/pom.xml # eclipse/bundles/org.openntf.xsp.jsp/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.jsp/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.config/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.config/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.fault.tolerance/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.fault.tolerance/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.health/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.health/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.metrics/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.metrics/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.openapi/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.openapi/pom.xml # eclipse/bundles/org.openntf.xsp.microprofile.rest.client/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.microprofile.rest.client/pom.xml # eclipse/bundles/org.openntf.xsp.mvc/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.mvc/pom.xml # eclipse/bundles/org.openntf.xsp.nosql.driver.lsxbe/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.nosql.driver.lsxbe/pom.xml # eclipse/bundles/org.openntf.xsp.nosql.driver/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.nosql.driver/pom.xml # eclipse/bundles/org.openntf.xsp.nosql/META-INF/MANIFEST.MF # eclipse/bundles/org.openntf.xsp.nosql/pom.xml # eclipse/features/org.openntf.xsp.beanvalidation.feature/feature.xml # eclipse/features/org.openntf.xsp.beanvalidation.feature/pom.xml # eclipse/features/org.openntf.xsp.cdi.feature/feature.xml # eclipse/features/org.openntf.xsp.cdi.feature/pom.xml # eclipse/features/org.openntf.xsp.el.feature/feature.xml # eclipse/features/org.openntf.xsp.el.feature/pom.xml # eclipse/features/org.openntf.xsp.jakarta.persistence.feature/feature.xml # eclipse/features/org.openntf.xsp.jakarta.persistence.feature/pom.xml # eclipse/features/org.openntf.xsp.jakarta.servlet.feature/feature.xml # eclipse/features/org.openntf.xsp.jakarta.servlet.feature/pom.xml # eclipse/features/org.openntf.xsp.jakartaee.feature/feature.xml # eclipse/features/org.openntf.xsp.jakartaee.feature/pom.xml # eclipse/features/org.openntf.xsp.jaxrs.feature/feature.xml # eclipse/features/org.openntf.xsp.jaxrs.feature/pom.xml # eclipse/features/org.openntf.xsp.jsf.feature/feature.xml # eclipse/features/org.openntf.xsp.jsf.feature/pom.xml # eclipse/features/org.openntf.xsp.jsonapi.feature/feature.xml # eclipse/features/org.openntf.xsp.jsonapi.feature/pom.xml # eclipse/features/org.openntf.xsp.jsp.feature/feature.xml # eclipse/features/org.openntf.xsp.jsp.feature/pom.xml # eclipse/features/org.openntf.xsp.microprofile.config.feature/feature.xml # eclipse/features/org.openntf.xsp.microprofile.config.feature/pom.xml # eclipse/features/org.openntf.xsp.microprofile.fault.tolerance.feature/feature.xml # eclipse/features/org.openntf.xsp.microprofile.fault.tolerance.feature/pom.xml # eclipse/features/org.openntf.xsp.microprofile.health.feature/feature.xml # eclipse/features/org.openntf.xsp.microprofile.health.feature/pom.xml # eclipse/features/org.openntf.xsp.microprofile.rest.client.feature/feature.xml # eclipse/features/org.openntf.xsp.microprofile.rest.client.feature/pom.xml # eclipse/features/org.openntf.xsp.mvc.feature/feature.xml # eclipse/features/org.openntf.xsp.mvc.feature/pom.xml # eclipse/features/org.openntf.xsp.nosql.feature/feature.xml # eclipse/features/org.openntf.xsp.nosql.feature/pom.xml # eclipse/nsfs/nsf-jakartaee-bundle-example/pom.xml # eclipse/nsfs/nsf-jakartaee-bundlebase-example/pom.xml # eclipse/nsfs/nsf-jakartaee-example/pom.xml # eclipse/nsfs/nsf-jakartaee-jpa-example/pom.xml # eclipse/nsfs/nsf-jakartaee-jsonbconfig-example/pom.xml # eclipse/nsfs/nsf-jakartaee-primefaces-example/pom.xml # eclipse/pom.xml # eclipse/releng/org.openntf.xsp.jakartaee.source.updatesite/pom.xml # eclipse/releng/org.openntf.xsp.jakartaee.updatesite/pom.xml # eclipse/releng/xsp-jakartaee-dist/pom.xml # eclipse/tests/it-xsp-jakartaee/pom.xml # eclipse/tests/org.openntf.xsp.beanvalidation.test/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.beanvalidation.test/pom.xml # eclipse/tests/org.openntf.xsp.jakarta.example.webapp/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.jakarta.example.webapp/pom.xml # eclipse/tests/org.openntf.xsp.jakartaee.test/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.jakartaee.test/pom.xml # eclipse/tests/org.openntf.xsp.jsonapi.test/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.jsonapi.test/pom.xml # eclipse/tests/org.openntf.xsp.test.beanbundle/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.test.beanbundle/pom.xml # eclipse/tests/org.openntf.xsp.test.jasapi/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.test.jasapi/pom.xml # eclipse/tests/org.openntf.xsp.test.postinstall/META-INF/MANIFEST.MF # eclipse/tests/org.openntf.xsp.test.postinstall/pom.xml # osgi-deps/pom.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.