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

Initial update of dependencies to Jakarta EE 10 versions. #23729

Merged
merged 35 commits into from
Jan 1, 2022
Merged

Initial update of dependencies to Jakarta EE 10 versions. #23729

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
638c633
Update dependencies to Jakarta EE 10 versions.
arjantijms Dec 1, 2021
7be3ade
Second batch
arjantijms Dec 1, 2021
4628cd0
Third batch
arjantijms Dec 2, 2021
9725827
Updated Servlet, Authorization and more. Added patches for Metro.
arjantijms Dec 10, 2021
62d12d9
Patch Hibernate Validator and integrate Sun EL 5.0.0-M1
arjantijms Dec 12, 2021
1e77b91
Integrate WaSP 3.1.0-M1
arjantijms Dec 12, 2021
a16af04
Faces and Mojarra 4.0.0 + Weld cleanup
arjantijms Dec 13, 2021
91fa8cc
Integrated CDI 4/Weld 5
arjantijms Dec 13, 2021
7ca6328
Integrate Batch 2.1.0-M1
arjantijms Dec 15, 2021
38a6959
Improve logging of OSGi errors
arjantijms Dec 15, 2021
68a7941
Integrate Standard Tags 3.0.0-SNAPSHOT API + Impl
arjantijms Dec 15, 2021
0cbb56f
Integrated WaSP further, disabled Krazo & Soteria
arjantijms Dec 16, 2021
0429998
Integrate Metro 4.0.0-M1 and XNL Bind RC3/M2
arjantijms Dec 16, 2021
0324fa8
Added santuario dependency and added new patch for Metro
arjantijms Dec 17, 2021
7b4ceaf
Updated CDI tests for CDI 4.0
arjantijms Dec 19, 2021
a9cc90c
Integrated EclipseLink 4.0.0-M1 and Angus 1.0.0
arjantijms Dec 19, 2021
0fa12dc
Small amount of cleaning before changes.
arjantijms Dec 21, 2021
3e2df4f
Fix Jakarta Pages tests
arjantijms Dec 21, 2021
248b910
Added more info about what's happening in quicklook tests
arjantijms Dec 21, 2021
9d5d66f
Fixed QuickLook tests
arjantijms Dec 25, 2021
080c9db
Fix typo
arjantijms Dec 25, 2021
647fd6f
Fixed checkstyle warnings
arjantijms Dec 25, 2021
c800b09
Tidying of poms
arjantijms Dec 25, 2021
2fa833a
Added snapshots module to build dependencies as part of the project.
arjantijms Dec 25, 2021
0cdf588
Merge remote-tracking branch 'origin/master' into ee10_dependencies
arjantijms Dec 25, 2021
54953b4
Fix breakage of build
arjantijms Dec 26, 2021
3602616
Add jBatch snapshot
arjantijms Dec 26, 2021
8091455
Fix copy/paste error
arjantijms Dec 26, 2021
cc73ccf
Run quicklook web twice
arjantijms Dec 27, 2021
dcaf2ee
Corrected typo
arjantijms Dec 27, 2021
2e506ac
Test web
arjantijms Dec 27, 2021
0dc6c5b
Add Hibernate Validator patch for Web Profile too.
arjantijms Dec 27, 2021
73270c4
Added other jobs back
arjantijms Dec 27, 2021
ae56043
Update Jakarta Pages URI
arjantijms Dec 28, 2021
a1e0a61
No TCK on profile oss-release
arjantijms Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions appserver/featuresets/web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,6 +1394,8 @@
</exclusion>
</exclusions>
</dependency>
<!-- Provides conflicting JAXB provider.
See https://github.com/eclipse-ee4j/eclipselink/issues/1380
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
Expand All @@ -1404,6 +1406,7 @@
</exclusion>
</exclusions>
</dependency>
-->
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.dbws</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

<!-- Jakarta WebSocket -->
<websocket-api.version>2.0.0</websocket-api.version>
<tyrus.version>2.0.1</tyrus.version>
<tyrus.version>2.0.2</tyrus.version>

<!-- Jakarta Concurrency -->
<concurrent-api.version>2.0.0</concurrent-api.version>
Expand Down
4 changes: 2 additions & 2 deletions appserver/tests/quicklook/QuickLook_Test_Instructions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ <H1 STYLE="margin-left: 0.83in"><FONT FACE="Trebuchet MS, sans-serif"><FONT SIZE
deploy runtest&quot;</P>
<P STYLE="margin-bottom: 0in">Since QL runs in multiple profiles, the
test cases need to be defined in the 3 test lists (under
quicklook/testng dir) for the profiles: testng_wd.xml for the Web
profile, testng_gd.xml for Glassfish profile, testng_debug.xml for
quicklook/testng dir) for the profiles: testng_web_profile.xml for the Web
profile, ttestng_full_profile.xml for Glassfish full profile, testng_debug.xml for
arjantijms marked this conversation as resolved.
Show resolved Hide resolved
the debug profile. The module level testng.xml is optional but it
provides the conveniences of running the module test locally. User
can also choose to define the class name in the local build.xml. In
Expand Down
93 changes: 49 additions & 44 deletions appserver/tests/quicklook/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2021 Contributors to Eclipse Foundation.
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -101,7 +102,7 @@
<echo>| |</echo>
<echo>| R u n n i n g |</echo>
<echo>| all_wd |</echo>
<echo>| |</echo>
<echo>| Web Profile |</echo>
<echo>+-----------------------------+</echo>

<property name="env.security_manager" value="OFF" />
Expand All @@ -111,7 +112,7 @@
<antcall target="build-deploy" />

<antcall target="runtest">
<param name="testng.xml" value="testng/testng_wd.xml" />
<param name="testng.xml" value="testng/testng_web_profile.xml" />
</antcall>

<antcall target="undeploy" />
Expand All @@ -132,7 +133,7 @@
<echo>| |</echo>
<echo>| R u n n i n g |</echo>
<echo>| all_wd_security |</echo>
<echo>| |</echo>
<echo>| Web Profile |</echo>
<echo>+-----------------------------+</echo>

<antcall target="add-quicklook-policy-grants" />
Expand All @@ -142,7 +143,7 @@
<antcall target="build-deploy" />

<antcall target="runtest">
<param name="testng.xml" value="testng/testng_wd.xml" />
<param name="testng.xml" value="testng/testng_web_profile.xml" />
</antcall>

<antcall target="undeploy" />
Expand Down Expand Up @@ -178,7 +179,7 @@
<antcall target="build-cluster" />

<antcall target="runtest">
<param name="testng.xml" value="testng/testng_gd.xml" />
<param name="testng.xml" value="testng/testng_full_profile.xml" />
</antcall>

<antcall target="undeploy" />
Expand Down Expand Up @@ -236,7 +237,7 @@
<echo>| |</echo>
<echo>| R u n n i n g |</echo>
<echo>| all_gd_security |</echo>
<echo>| glassfish distribution |</echo>
<echo>| Full Profile |</echo>
<echo>+-----------------------------+</echo>


Expand All @@ -252,7 +253,7 @@
<antcall target="build-deploy-gd" />

<antcall target="runtest">
<param name="testng.xml" value="testng/testng_gd.xml" />
<param name="testng.xml" value="testng/testng_full_profile.xml" />
</antcall>

<antcall target="undeploy" />
Expand All @@ -276,7 +277,7 @@
<echo>| |</echo>
<echo>| R u n n i n g |</echo>
<echo>| dev_debug |</echo>
<echo>| glassfish distribution |</echo>
<echo>| Full Profile |</echo>
<echo>+-----------------------------+</echo>

<antcall target="verify-xml" />
Expand Down Expand Up @@ -387,7 +388,9 @@
<run-quicklook-test path="amx" target="build" />
<run-quicklook-test path="admin" target="build" />
<run-quicklook-test path="admincli" target="build" />
<!-- For now GlassFish 7 doesn't have an admin console
<run-quicklook-test path="adminconsole" target="build" />
-->
<run-quicklook-test path="rest" target="build" />
<!--<run-quicklook-test path="osgitest/basicosgi" target="build"/>-->
<run-quicklook-test path="web/helloworld" target="build-deploy" />
Expand All @@ -409,35 +412,15 @@
</target>

<target name="build-deploy-gd">
<echo message="Glassfish Distribution Build Deploy" />
<ant dir="ejb/remoteview" target="build-deploy" />
<ant dir="ejb/singleton" target="build-deploy" />
<ant dir="ejb/cmp" target="build-deploy" />
<ant dir="ejb/mdb" target="build" />
<ant dir="jms/injection" target="build-deploy" />
<ant dir="wsit/JaxwsFromWsdl" target="build-deploy" />
<ant dir="wsit/jsr109tester" target="build-deploy" />
<ant dir="security/appperms" target="build-deploy" />
</target>

<target name="undeploy">
<record name="${basedir}/undeploy.output" action="start" />
<ant dir="web/helloworld" target="undeploy" />
<ant dir="web/jsfastrologer" target="undeploy" />
<ant dir="web/jsfinjection" target="undeploy" />
<ant dir="jdbc/jdbcusertx" target="undeploy" />
<ant dir="persistence/jpainjectemf" target="undeploy" />
<ant dir="persistence/jpavalidation" target="undeploy" />
<ant dir="security/helloworld" target="undeploy" />
<ant dir="security/basicauth" target="undeploy" />
<ant dir="ejb/slsbnicmt" target="undeploy" />
<ant dir="ejb/sfulnoi" target="undeploy" />
<ant dir="bean-validator/simple-bv-servlet" target="undeploy" />
<ant dir="weld/numberguess" target="undeploy" />
<ant dir="weld/osgiweld" target="undeploy" />
<ant dir="weld/extensions" target="undeploy" />
<ant dir="jms/injection" target="undeploy" />
<record name="${basedir}/undeploy.output" action="stop" />
<echo message="Glassfish Full Profile Build Deploy" />
<run-quicklook-test path="ejb/remoteview" target="build-deploy" />
<run-quicklook-test path="ejb/singleton" target="build-deploy" />
<run-quicklook-test path="ejb/cmp" target="build-deploy" />
<run-quicklook-test path="ejb/mdb" target="build" />
<run-quicklook-test path="jms/injection" target="build-deploy" />
<run-quicklook-test path="wsit/JaxwsFromWsdl" target="build-deploy" />
<run-quicklook-test path="wsit/jsr109tester" target="build-deploy" />
<run-quicklook-test path="security/appperms" target="build-deploy" />
</target>


Expand Down Expand Up @@ -508,17 +491,39 @@


<!-- U N D E P L O Y T E S T A R C H I V E S -->

<target name="undeploy">
<record name="${basedir}/undeploy.output" action="start" />

<run-quicklook-test path="web/helloworld" target="undeploy" />
<run-quicklook-test path="web/jsfastrologer" target="undeploy" />
<run-quicklook-test path="web/jsfinjection" target="undeploy" />
<run-quicklook-test path="jdbc/jdbcusertx" target="undeploy" />
<run-quicklook-test path="persistence/jpainjectemf" target="undeploy" />
<run-quicklook-test path="persistence/jpavalidation" target="undeploy" />
<run-quicklook-test path="security/helloworld" target="undeploy" />
<run-quicklook-test path="security/basicauth" target="undeploy" />
<run-quicklook-test path="ejb/slsbnicmt" target="undeploy" />
<run-quicklook-test path="ejb/sfulnoi" target="undeploy" />
<run-quicklook-test path="bean-validator/simple-bv-servlet" target="undeploy" />
<run-quicklook-test path="weld/numberguess" target="undeploy" />
<run-quicklook-test path="weld/osgiweld" target="undeploy" />
<run-quicklook-test path="weld/extensions" target="undeploy" />
<run-quicklook-test path="jms/injection" target="undeploy" />

<record name="${basedir}/undeploy.output" action="stop" />
</target>

<target name="undeploy-gd">
<ant dir="ejb/singleton" target="undeploy" />
<ant dir="ejb/remoteview" target="undeploy" />
<ant dir="ejb/cmp" target="undeploy" />
<run-quicklook-test path="ejb/singleton" target="undeploy" />
<run-quicklook-test path="ejb/remoteview" target="undeploy" />
<run-quicklook-test path="ejb/cmp" target="undeploy" />
<!-- <ant dir="wsit/JaxwsFromWsdl" target="undeploy"/>
<ant dir="wsit/jsr109tester" target="undeploy"/>-->
<ant dir="security/appperms" target="undeploy" />
<run-quicklook-test path="security/appperms" target="undeploy" />
</target>

<!-- Target is re-defined here as someone didn't want to specify ws.root property -->
<!-- Target is re-defined here as someone (who?) didn't want to specify ws.root property -->
<target name="clean">
<delete dir="${basedir}/classes" />
<delete verbose="true" includeemptydirs="true">
Expand Down Expand Up @@ -815,9 +820,9 @@
<local name="do-run-test" />
<condition property="do-run-test" else="false">
<or>
<equals arg1="${env.cdi_all}" arg2="@{path}" />
<equals arg1="${env.quicklook}" arg2="@{path}" />
<not>
<isset property="env.cdi_all" />
<isset property="env.quicklook" />
</not>
</or>
</condition>
Expand Down
Loading