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

PAYARA-4030 Upgrade HK2 to 2.6.1 and ASM to 7.1 #4183

Merged
merged 1 commit into from Aug 29, 2019

Conversation

@Cousjava
Copy link
Member

Cousjava commented Aug 27, 2019

No description provided.

@Cousjava Cousjava requested a review from MarkWareham Aug 27, 2019
@Cousjava

This comment has been minimized.

Copy link
Member Author

Cousjava commented Aug 27, 2019

Jenkins test please

@dmatej
dmatej approved these changes Aug 27, 2019
@@ -159,7 +159,7 @@
put("org.glassfish.hk2.config", 100);
put("org.glassfish.hk2.config-types", 101);
put("org.glassfish.hk2.core", 102);
put("org.glassfish.hk2.external.asm-repackaged", 103);
//put("org.glassfish.hk2.external.asm-repackaged", 103);
//put("org.glassfish.hk2.external.bean-validator", 104);

This comment has been minimized.

Copy link
@cubastanley

cubastanley Aug 28, 2019

Contributor

Should commented code be removed?

@@ -258,7 +258,11 @@
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>

<dependency>

This comment has been minimized.

Copy link
@MarkWareham

MarkWareham Aug 28, 2019

Contributor

Does this change have potential to impact test suites? - I recall a problem in testing in the past ~3 weeks to do with tiger-types

This comment has been minimized.

Copy link
@Cousjava

Cousjava Aug 28, 2019

Author Member

This what has been fixed in 2.6.1 of HK2 - it has an OSGi import of tiger-types that was unused within it and has now been removed. See eclipse-ee4j/glassfish-hk2#469.

@@ -183,14 +183,18 @@ glassfish.osgi.auto.install=\
hk2.bundles=\
${com.sun.aas.installRootURI}modules/hk2-api.jar \
${com.sun.aas.installRootURI}modules/hk2-utils.jar \
${com.sun.aas.installRootURI}modules/javax.inject.jar \
${com.sun.aas.installRootURI}modules/jakarta.inject.jar \

This comment has been minimized.

Copy link
@MarkWareham

MarkWareham Aug 28, 2019

Contributor

Is this related?

This comment has been minimized.

Copy link
@Cousjava

Cousjava Aug 28, 2019

Author Member

Yes, HK2 2.6 depends on Jakarta injection

Copy link
Contributor

MarkWareham left a comment

Some questions, but nothing stands out as wrong. I trust it's been thoroughly tested...

@Cousjava Cousjava merged commit 6c8aa0a into payara:master Aug 29, 2019
58 checks passed
58 checks passed
Payara Quick Build and Test Quick build and test passed!
Details
security/snyk - api/payara-api/pom.xml (payara-ci) No new issues
Details
security/snyk - api/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/admin/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/admingui/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/ant-tasks/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/appclient/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/batch/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/common/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/concurrent/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/connectors/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/core/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/deployment/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/distributions/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/ejb/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/extras/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/featuresets/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/flashlight/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/grizzly/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/ha/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/installer/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/jdbc/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/jms/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/load-balancer/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/orb/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/osgi-platforms/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/packager/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/payara-appserver-modules/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/persistence/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/registration/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/resources/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/security/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/tests/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/transaction/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/web/pom.xml (payara-ci) No new issues
Details
security/snyk - appserver/webservices/pom.xml (payara-ci) No new issues
Details
security/snyk - copyright/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/admin/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/cluster/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/common/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/core/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/deployment/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/diagnostics/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/distributions/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/flashlight/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/grizzly/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/hk2/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/osgi-platforms/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/packager/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/payara-modules/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/resources-l10n/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/resources/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/security/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/test-utils/pom.xml (payara-ci) No new issues
Details
security/snyk - nucleus/tests/pom.xml (payara-ci) No new issues
Details
security/snyk - pom.xml (payara-ci) No new issues
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.