Skip to content

Commit 493bd9f

Browse files
panos-kakospanos-kakos
authored
[JAVA-37091] Manage remaining modules for JDK 21(eugenp#17463)
1 parent 3b53937 commit 493bd9f

6 files changed

Lines changed: 66 additions & 42 deletions

File tree

‎core-java-modules/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<module>core-java-collections-conversions-3</module>
3131
<!--<module>core-java-concurrency-advanced-5</module>--> <!-- Migrated to heavy profile -->
3232
<module>core-java-9-new-features</module>
33-
<module>core-java-14</module>
33+
<!--<module>core-java-14</module> --> <!-- failing after upgrade to jdk21 -->
3434
<module>core-java-16</module>
3535
<!-- <module>core-java-modules/core-java-17</module> --> <!-- JAVA-26056 -->
3636
<!-- <module>core-java-modules/core-java-18</module> --> <!-- JAVA-26056 -->
@@ -69,9 +69,9 @@
6969
<module>core-java-streams-6</module>
7070
<module>core-java-streams-collect</module>
7171
<module>core-java-streams-maps</module>
72-
<module>core-java-string-operations-3</module>
72+
<!-- <module>core-java-string-operations-3</module> --> <!-- failing after upgrade to jdk21 -->
7373
<module>core-java-string-operations-4</module>
74-
<module>core-java-string-operations-5</module>
74+
<!-- <module>core-java-string-operations-5</module> --> <!-- failing after upgrade to jdk21 -->
7575
<!--<module>core-java-strings</module> Failing test cases JAVA-24414-->
7676
<module>core-java-time-measurements</module>
7777
<module>core-java-annotations</module>
@@ -123,7 +123,7 @@
123123
<module>core-java-exceptions</module>
124124
<module>core-java-exceptions-2</module>
125125
<module>core-java-exceptions-3</module>
126-
<module>core-java-exceptions-4</module>
126+
<!-- <module>core-java-exceptions-4</module> --> <!-- failing after upgrade to jdk21 -->
127127
<module>core-java-function</module>
128128
<module>core-java-functional</module>
129129
<module>core-java-hex</module>
@@ -132,14 +132,14 @@
132132
<module>core-java-io-3</module>
133133
<module>core-java-io-4</module>
134134
<module>core-java-io-5</module>
135-
<module>core-java-io-6</module>
135+
<!-- <module>core-java-io-6</module> --> <!-- failing after upgrade to jdk21 -->
136136
<module>core-java-io-apis</module>
137137
<module>core-java-io-apis-2</module>
138138
<module>core-java-io-conversions</module>
139139
<module>core-java-io-conversions-3</module>
140140
<module>core-java-jar</module>
141141
<module>core-java-jndi</module>
142-
<module>core-java-jvm</module>
142+
<!-- <module>core-java-jvm</module> --> <!-- failing after upgrade to jdk21 -->
143143
<module>core-java-jvm-2</module>
144144
<module>core-java-jvm-3</module>
145145
<module>core-java-lambdas</module>
@@ -148,14 +148,14 @@
148148
<module>core-java-lang-4</module>
149149
<module>core-java-lang-5</module>
150150
<module>core-java-lang-6</module>
151-
<module>core-java-lang-7</module>
151+
<!-- <module>core-java-lang-7</module> --> <!-- failing after upgrade to jdk21 -->
152152
<module>core-java-lang-math</module>
153153
<module>core-java-lang-math-2</module>
154154
<module>core-java-lang-math-4</module>
155155
<module>core-java-lang-oop-constructors</module>
156156
<module>core-java-lang-oop-patterns</module>
157157
<module>core-java-lang-oop-generics</module>
158-
<module>core-java-lang-oop-modifiers</module>
158+
<!-- <module>core-java-lang-oop-modifiers</module> --> <!-- failing after upgrade to jdk21 -->
159159
<module>core-java-lang-oop-types</module>
160160
<module>core-java-lang-oop-types-2</module>
161161
<module>core-java-lang-oop-inheritance</module>
@@ -227,7 +227,7 @@
227227
<!--<module>core-java-conditionals</module>--> <!--JAVA-20931-->
228228
<module>core-java-collections-set</module>
229229
<module>core-java-date-operations-1</module>
230-
<module>core-java-datetime-conversion</module>
230+
<!-- <module>core-java-datetime-conversion</module> --> <!-- failing after upgrade to jdk21 -->
231231
<module>core-java-datetime-conversion-2</module>
232232
<module>core-java-httpclient</module>
233233
<module>java-native</module>

‎json-modules/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<module>json-conversion</module>
2121
<module>json-operations</module>
2222
<module>json-path</module>
23-
<module>gson</module>
23+
<!-- <module>gson</module> --> <!-- failing after upgrade to jdk21 -->
2424
<module>gson-2</module>
2525
</modules>
2626

‎pom.xml‎

Lines changed: 46 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -575,23 +575,27 @@
575575
<module>parent-spring-5</module>
576576
<module>parent-spring-6</module>
577577
<module>core-groovy-modules</module>
578-
<module>core-java-modules</module>
579-
<module>json-modules</module>
578+
<module>core-java-modules/core-java-exceptions-4</module>
579+
<module>core-java-modules/core-java-io-6</module>
580+
<module>core-java-modules/core-java-jvm</module>
581+
<module>core-java-modules/core-java-lang-7</module>
582+
<module>core-java-modules/core-java-lang-oop-modifiers</module>
583+
<module>core-java-modules/core-java-datetime-conversion</module>
584+
<module>json-modules/gson</module>
580585
<module>maven-modules</module>
581-
<module>messaging-modules</module>
582-
<module>persistence-modules</module>
583586
<!--<module>persistence-modules/java-harperdb</module>--> <!-- This module requires a library to download manually -->
584587
<module>persistence-modules/spring-data-neo4j</module>
585-
<module>quarkus-modules</module>
586-
<module>security-modules</module>
588+
<module>quarkus-modules/quarkus</module>
587589
<!--<module>spring-cloud-modules/spring-cloud-data-flow</module>--><!-- failing after upgrading to jdk17-->
588590
<!--<module>spring-cloud-modules/spring-cloud-stream-starters</module>--><!-- failing after upgrading to jdk17-->
589591
<!--<module>spring-di-2</module>--><!-- failing after upgrading to jdk17-->
590592
<!--<module>spring-integration</module>--><!-- failing after upgrading to jdk17-->
591593
<!--<module>spring-jinq</module>--><!--disabling the jinq modules, as the default build profile is failing due to bad mv files. Please refer: JAVA-31341-->
592-
<module>spring-security-modules</module>
593-
<module>spring-static-resources</module>
594-
<module>testing-modules</module>
594+
<module>spring-security-modules/spring-security-legacy-oidc</module>
595+
<module>testing-modules/junit-5-advanced</module>
596+
<module>testing-modules/spring-testing</module>
597+
<module>testing-modules/spring-testing-2</module>
598+
<module>testing-modules/testing-libraries-2</module>
595599
<!--<module>static-analysis</module> - requires additional configuration to be compiled due to the JVM strong encapsulation -->
596600
<!--<module>tablesaw</module>--><!-- failing after upgrading to jdk17-->
597601
<!--<module>spring-swagger-codegen/openapi-custom-generator</module>
@@ -664,6 +668,7 @@
664668
<module>azure-functions</module>
665669
<module>bazel</module>
666670
<module>checker-framework</module>
671+
<module>core-java-modules</module>
667672
<module>custom-pmd</module>
668673
<module>data-structures</module>
669674
<module>deeplearning4j</module>
@@ -700,6 +705,7 @@
700705
<module>jetbrains</module>
701706
<module>jgit</module>
702707
<module>jmh</module>
708+
<module>json-modules</module>
703709
<module>jsoup</module>
704710
<module>jws</module>
705711
<module>ksqldb</module>
@@ -725,8 +731,8 @@
725731
<module>libraries-data</module>
726732
<module>libraries-files</module>
727733
<module>libraries-http</module>
728-
<module>libraries-http-2</module>
729-
<module>libraries-http-3</module>
734+
<module>libraries-http-2</module>
735+
<module>libraries-http-3</module>
730736
<module>libraries-io</module>
731737
<module>libraries-llms</module>
732738
<module>libraries-primitive</module>
@@ -744,6 +750,7 @@
744750
<module>lucene</module>
745751
<module>mapstruct</module>
746752
<module>mapstruct-2</module>
753+
<module>messaging-modules</module>
747754
<module>metrics</module>
748755
<module>microservices-modules</module>
749756
<module>mustache</module>
@@ -755,15 +762,18 @@
755762
<module>osgi</module>
756763
<module>patterns-modules</module>
757764
<module>performance-tests</module>
765+
<module>persistence-modules</module>
758766
<module>protobuffer</module>
759767
<module>podman</module>
768+
<module>quarkus-modules</module>
760769
<module>reactive-systems</module>
761770
<module>reactor-core</module>
762771
<module>reactor-core-2</module>
763772
<module>rsocket</module>
764773
<module>rule-engines-modules</module>
765774
<module>rxjava-modules</module>
766775
<module>saas-modules</module>
776+
<module>security-modules</module>
767777
<module>server-modules</module>
768778
<module>spf4j</module>
769779
<module>spring-5-webflux-2</module>
@@ -815,16 +825,19 @@
815825
<module>spring-remoting-modules</module> <!-- Upgrade to Boot 3 not possible as since Spring 6 the remoting modules has been removed from Spring. -->
816826
<module>spring-scheduling</module>
817827
<module>spring-scheduling-2</module>
828+
<module>spring-security-modules</module>
818829
<module>spring-shell</module>
819830
<module>spring-soap</module>
820831
<module>spring-spel</module>
821832
<module>spring-state-machine</module>
833+
<module>spring-static-resources</module>
822834
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
823835
<module>spring-threads</module>
824836
<module>spring-vault</module>
825837
<module>spring-web-modules</module>
826838
<module>spring-websockets</module>
827839
<module>tensorflow-java</module>
840+
<module>testing-modules</module>
828841
<module>timefold-solver</module>
829842
<module>vaadin</module>
830843
<module>vavr-modules</module>
@@ -877,23 +890,27 @@
877890
<module>parent-spring-5</module>
878891
<module>parent-spring-6</module>
879892
<module>core-groovy-modules</module>
880-
<module>core-java-modules</module>
881-
<module>json-modules</module>
893+
<module>core-java-modules/core-java-exceptions-4</module>
894+
<module>core-java-modules/core-java-io-6</module>
895+
<module>core-java-modules/core-java-jvm</module>
896+
<module>core-java-modules/core-java-lang-7</module>
897+
<module>core-java-modules/core-java-lang-oop-modifiers</module>
898+
<module>core-java-modules/core-java-datetime-conversion</module>
899+
<module>json-modules/gson</module>
882900
<module>maven-modules</module>
883-
<module>messaging-modules</module>
884-
<module>persistence-modules</module>
885901
<!--<module>persistence-modules/java-harperdb</module>--> <!-- This module requires a library to download manually -->
886902
<module>persistence-modules/spring-data-neo4j</module>
887-
<module>quarkus-modules</module>
888-
<module>security-modules</module>
903+
<module>quarkus-modules/quarkus</module>
889904
<!--<module>spring-cloud-modules/spring-cloud-data-flow</module>--><!-- failing after upgrading to jdk17-->
890905
<!--<module>spring-cloud-modules/spring-cloud-stream-starters</module>--><!-- failing after upgrading to jdk17-->
891906
<!--<module>spring-di-2</module>--><!-- failing after upgrading to jdk17-->
892907
<!--<module>spring-integration</module>--><!-- failing after upgrading to jdk17-->
893908
<!--<module>spring-jinq</module>--><!--disabling the jinq modules, as the default build profile is failing due to bad mv files. Please refer: JAVA-31341-->
894-
<module>spring-security-modules</module>
895-
<module>spring-static-resources</module>
896-
<module>testing-modules</module>
909+
<module>spring-security-modules/spring-security-legacy-oidc</module>
910+
<module>testing-modules/junit-5-advanced</module>
911+
<module>testing-modules/spring-testing</module>
912+
<module>testing-modules/spring-testing-2</module>
913+
<module>testing-modules/testing-libraries-2</module>
897914
<!--<module>static-analysis</module> - requires additional configuration to be compiled due to the JVM strong encapsulation -->
898915
<!--<module>tablesaw</module>--><!-- failing after upgrading to jdk17-->
899916
<!--<module>spring-swagger-codegen/openapi-custom-generator</module>
@@ -960,6 +977,7 @@
960977
<module>azure-functions</module>
961978
<module>bazel</module>
962979
<module>checker-framework</module>
980+
<module>core-java-modules</module>
963981
<module>custom-pmd</module>
964982
<module>data-structures</module>
965983
<module>deeplearning4j</module>
@@ -995,6 +1013,7 @@
9951013
<module>jetbrains</module>
9961014
<module>jgit</module>
9971015
<module>jmh</module>
1016+
<module>json-modules</module>
9981017
<module>jsoup</module>
9991018
<module>jws</module>
10001019
<module>ksqldb</module>
@@ -1019,7 +1038,7 @@
10191038
<module>libraries-data-io</module>
10201039
<module>libraries-data</module>
10211040
<module>libraries-files</module>
1022-
<module>libraries-http</module>
1041+
<module>libraries-http</module>
10231042
<module>libraries-http-2</module>
10241043
<module>libraries-http-3</module>
10251044
<module>libraries-io</module>
@@ -1039,7 +1058,6 @@
10391058
<module>lucene</module>
10401059
<module>mapstruct</module>
10411060
<module>mapstruct-2</module>
1042-
<module>maven-modules</module>
10431061
<module>messaging-modules</module>
10441062
<module>metrics</module>
10451063
<module>microservices-modules</module>
@@ -1052,15 +1070,18 @@
10521070
<module>osgi</module>
10531071
<module>patterns-modules</module>
10541072
<module>performance-tests</module>
1073+
<module>persistence-modules</module>
10551074
<module>protobuffer</module>
10561075
<module>podman</module>
1076+
<module>quarkus-modules</module>
10571077
<module>reactive-systems</module>
10581078
<module>reactor-core</module>
10591079
<module>reactor-core-2</module>
10601080
<module>rsocket</module>
10611081
<module>rule-engines-modules</module>
10621082
<module>rxjava-modules</module>
10631083
<module>saas-modules</module>
1084+
<module>security-modules</module>
10641085
<module>server-modules</module>
10651086
<module>spf4j</module>
10661087
<module>spring-5-webflux-2</module>
@@ -1112,16 +1133,19 @@
11121133
<module>spring-remoting-modules</module> <!-- Upgrade to Boot 3 not possible as since Spring 6 the remoting modules has been removed from Spring. -->
11131134
<module>spring-scheduling</module>
11141135
<module>spring-scheduling-2</module>
1136+
<module>spring-security-modules</module>
11151137
<module>spring-shell</module>
11161138
<module>spring-soap</module>
11171139
<module>spring-spel</module>
11181140
<module>spring-state-machine</module>
1141+
<module>spring-static-resources</module>
11191142
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
11201143
<module>spring-threads</module>
11211144
<module>spring-vault</module>
11221145
<module>spring-web-modules</module>
11231146
<module>spring-websockets</module>
11241147
<module>tensorflow-java</module>
1148+
<module>testing-modules</module>
11251149
<module>timefold-solver</module>
11261150
<module>vavr-modules</module>
11271151
<module>vaadin</module>

‎quarkus-modules/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</parent>
1515

1616
<modules>
17-
<module>quarkus</module>
17+
<!-- <module>quarkus</module>--> <!-- failing after upgrade to jdk21 -->
1818
<module>quarkus-citrus</module>
1919
<module>quarkus-extension</module>
2020
<module>quarkus-elasticsearch</module>
@@ -23,7 +23,7 @@
2323
<module>quarkus-funqy</module>
2424
<module>quarkus-testcontainers</module>
2525
<module>consume-rest-api</module>
26-
<!-- requires Java 21 <module>quarkus-virtual-threads</module> -->
26+
<module>quarkus-virtual-threads</module>
2727
<module>quarkus-hibernate-reactive</module>
2828
</modules>
2929

‎spring-security-modules/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<module>spring-security-core</module>
2323
<module>spring-security-core-2</module>
2424
<module>spring-security-core-3</module>
25-
<!-- <module>spring-security-ldap</module>-->
26-
<module>spring-security-legacy-oidc</module> <!-- Ths module wasn't able to upgrade because is using Spring Security oauth2 which reached end of life. JAVA-29292-->
25+
<!-- <module>spring-security-ldap</module>-->
26+
<!-- <module>spring-security-legacy-oidc</module> --> <!-- failing after upgrade to jdk21 --> <!-- Ths module wasn't able to upgrade because is using Spring Security oauth2 which reached end of life. JAVA-29292-->
2727
<module>spring-security-oauth2</module> <!-- This module wasn't updated to spring boot 3 because of spring-oauth2 not supporting Jakarta and reaching end of life. JAVA-29293 -->
2828
<module>spring-security-oauth2-sso</module> <!-- This module wasn't able to update because Spring Security Oauth reach end of life and not compatible with spring boot 3. JAVA-29294 -->
2929
<module>spring-security-oidc</module>
3030
<module>spring-security-okta</module>
31-
<!-- <module>spring-security-saml</module>--> <!-- This module wasn't able to update to spring boot 3 because Jakarta clashes with javax -->
31+
<!-- <module>spring-security-saml</module>--> <!-- This module wasn't able to update to spring boot 3 because Jakarta clashes with javax -->
3232
<module>spring-security-social-login</module> <!-- spring-social-facebook is deprecated and not supported in latest version of spring security. JAVA-29302 -->
3333
<module>spring-security-web-angular</module>
3434
<module>spring-security-web-boot-1</module>

‎testing-modules/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
<module>hamcrest</module>
2727
<module>hamcrest-2</module>
2828
<module>instancio</module>
29-
<!-- <module>jmeter</module>--> <!-- Migrated to heavy profile -->
29+
<!-- <module>jmeter</module> --> <!-- Migrated to heavy profile -->
3030
<module>jqwik</module>
3131
<module>junit-4</module>
32-
<module>junit-5-advanced</module>
32+
<!-- <module>junit-5-advanced</module> --> <!-- failing after upgrade to jdk21 -->
3333
<module>junit-5-advanced-2</module>
3434
<module>junit-5-basics</module>
3535
<module>junit-5-basics-2</module>
@@ -51,11 +51,11 @@
5151
<module>selenium-2</module>
5252
<module>selenium-testng</module>
5353
<module>spring-mockito</module>
54-
<module>spring-testing-2</module>
55-
<module>spring-testing</module>
54+
<!-- <module>spring-testing-2</module> --> <!-- failing after upgrade to jdk21 -->
55+
<!-- <module>spring-testing</module> --> <!-- failing after upgrade to jdk21 -->
5656
<module>testing-assertions</module>
5757
<module>test-containers</module>
58-
<module>testing-libraries-2</module>
58+
<!-- <module>testing-libraries-2</module> --> <!-- failing after upgrade to jdk21 -->
5959
<module>testing-libraries</module>
6060
<module>testng</module>
6161
<module>testng-command-line</module>

0 commit comments

Comments
 (0)