Skip to content

Commit 2031e69

Browse files
pepnesspepness
committed
Fix mismatch when using MavenProjectSupport.getProfileFromPOM() to
retrieve the correct Profile.
1 parent 5390a9f commit 2031e69

File tree

1 file changed

+62
-33
lines changed

1 file changed

+62
-33
lines changed

‎enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/utils/MavenProjectSupport.java‎

Lines changed: 62 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,11 @@ public static Profile getProfileFromPOM(final Project project) {
568568
* In more detail:
569569
* <ul>
570570
* GlassFish:
571+
* <li>5.0 supports Java EE 8</li>
571572
* <li>5.1 supports Jakarta EE 8</li>
573+
* <li>6.0 supports Jakarta EE 9</li>
572574
* <li>6.1 supports Jakarta EE 9.1</li>
575+
* <li>6.2 supports Jakarta EE 9.1</li>
573576
* <li>7.X supports Jakarta EE 10</li>
574577
* <li>8.X supports Jakarta EE 11</li>
575578
* WebLogic:
@@ -598,6 +601,12 @@ public static Profile getProfileFromPOM(final Project project) {
598601
List<DependencyDesc> jakartaEE10Full = new ArrayList<>();
599602
List<DependencyDesc> jakartaEE11Web = new ArrayList<>();
600603
List<DependencyDesc> jakartaEE11Full = new ArrayList<>();
604+
605+
// The version field from the DependencyDesc Java Record will be
606+
// matched with a String.startsWith(...) method, hence the version
607+
// should be declared at is minimum expression. e.g
608+
// GlassFish 7.0.24 will be matched to 7.0 and return true for
609+
// Profile.JakartaEE_10
601610

602611
// Java/Jakarta EE specification
603612
javaEE5.add(new DependencyDesc("javaee", "javaee-api", "5.0"));
@@ -616,51 +625,71 @@ public static Profile getProfileFromPOM(final Project project) {
616625
jakartaEE91Full.add(new DependencyDesc("jakarta.platform","jakarta.jakartaee-api","9.1.0"));
617626
jakartaEE10Web.add(new DependencyDesc("jakarta.platform","jakarta.jakartaee-web-api","10.0.0"));
618627
jakartaEE10Full.add(new DependencyDesc("jakarta.platform","jakarta.jakartaee-api","10.0.0"));
619-
jakartaEE11Web.add(new DependencyDesc("jakarta.platform","jakarta.jakartaee-web-api","11.0.0-RC1"));
620-
jakartaEE11Full.add(new DependencyDesc("jakarta.platform","jakarta.jakartaee-api","11.0.0-RC1"));
628+
jakartaEE11Web.add(new DependencyDesc("jakarta.platform","jakarta.jakartaee-web-api","11.0.0"));
629+
jakartaEE11Full.add(new DependencyDesc("jakarta.platform","jakarta.jakartaee-api","11.0.0"));
621630

622631
// GlassFish implementations
623632
javaEE5.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "2"));
624633
javaEE5.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "2"));
625634
javaEE6Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "3"));
626635
javaEE6Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "3"));
627636
javaEE7Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "4.0"));
628-
javaEE7Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "4.0.1"));
629-
javaEE7Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "4.1.2"));
630-
javaEE7Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "4.1.2"));
631-
javaEE8Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "5.1.0"));
632-
javaEE8Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "5.1.0"));
633-
jakartaEE8Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "5.1.0"));
634-
jakartaEE8Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "5.1.0"));
635-
jakartaEE9Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "6.0.0"));
636-
jakartaEE9Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "6.0.0"));
637-
jakartaEE91Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "6.2.5"));
638-
jakartaEE91Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "6.2.5"));
639-
jakartaEE10Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "7.0.24"));
640-
jakartaEE10Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "7.0.24"));
641-
jakartaEE11Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "8.0.0-M11"));
642-
jakartaEE11Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "8.0.0-M11"));
637+
javaEE7Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "4.0"));
638+
javaEE7Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "4.1"));
639+
javaEE7Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "4.1"));
640+
javaEE8Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "5.0"));
641+
javaEE8Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "5.0"));
642+
jakartaEE8Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "5.1"));
643+
jakartaEE8Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "5.1"));
644+
jakartaEE9Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "6.0"));
645+
jakartaEE9Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "6.0"));
646+
jakartaEE91Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "6.1"));
647+
jakartaEE91Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "6.1"));
648+
jakartaEE91Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "6.2"));
649+
jakartaEE91Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "6.2"));
650+
jakartaEE10Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "7.0"));
651+
jakartaEE10Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "7.0"));
652+
jakartaEE11Full.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-all", "8.0"));
653+
jakartaEE11Web.add(new DependencyDesc("org.glassfish.main.extras", "glassfish-embedded-web", "8.0"));
654+
655+
// Tomcat implementations
656+
javaEE6Web.add(new DependencyDesc("org.apache.tomcat.embed", "tomcat-embed-core", "7"));
657+
javaEE7Web.add(new DependencyDesc("org.apache.tomcat.embed", "tomcat-embed-core", "8"));
658+
javaEE8Web.add(new DependencyDesc("org.apache.tomcat.embed", "tomcat-embed-core", "9"));
659+
jakartaEE8Web.add(new DependencyDesc("org.apache.tomcat.embed", "tomcat-embed-core", "9"));
660+
jakartaEE91Web.add(new DependencyDesc("org.apache.tomcat.embed", "tomcat-embed-core", "10.0"));
661+
jakartaEE10Web.add(new DependencyDesc("org.apache.tomcat.embed", "tomcat-embed-core", "10.1"));
662+
jakartaEE11Web.add(new DependencyDesc("org.apache.tomcat.embed", "tomcat-embed-core", "11"));
663+
643664

665+
// TomEE implementations
666+
javaEE7Web.add(new DependencyDesc("org.apache.tomee", "tomee-embedded", "7"));
667+
javaEE7Full.add(new DependencyDesc("org.apache.tomee", "tomee-embedded", "7"));
668+
jakartaEE8Web.add(new DependencyDesc("org.apache.tomee", "tomee-embedded", "8"));
669+
jakartaEE91Full.add(new DependencyDesc("org.apache.tomee", "tomee-embedded", "9"));
670+
jakartaEE91Web.add(new DependencyDesc("org.apache.tomee", "tomee-embedded", "9"));
671+
jakartaEE10Full.add(new DependencyDesc("org.apache.tomee", "tomee-embedded", "10"));
672+
jakartaEE10Web.add(new DependencyDesc("org.apache.tomee", "tomee-embedded", "10"));
644673

645674
// WebLogic implementations
646-
// javaEE5.add(new DependencyDesc("weblogic", "weblogic", "10"));
647-
// javaEE6Full.add(new DependencyDesc("weblogic", "weblogic", "12"));
675+
javaEE5.add(new DependencyDesc("weblogic", "weblogic", "10"));
676+
javaEE6Full.add(new DependencyDesc("weblogic", "weblogic", "12"));
648677

649678
// JBoss implementations
650-
javaEE5.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-5.0", "1.0.0.GA"));
651-
javaEE5.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-all-5.0", "1.0.0.GA"));
652-
javaEE6Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-6.0", "3.0.3.Final"));
653-
javaEE6Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-all-6.0", "3.0.3.Final"));
654-
javaEE6Web.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-web-6.0", "3.0.3.Final"));
655-
javaEE7Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-7.0", "1.1.1.Final"));
656-
javaEE7Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-all-7.0", "1.1.1.Final"));
657-
javaEE7Web.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-web-7.0", "1.1.1.Final"));
658-
javaEE8Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-8.0", "1.0.4.Final"));
659-
javaEE8Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-all-8.0", "1.0.4.Final"));
660-
javaEE8Web.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-web-8.0", "1.0.4.Final"));
661-
jakartaEE8Full.add(new DependencyDesc("org.jboss.spec", "jboss-jakartaee-8.0", "1.0.1.Final"));
662-
jakartaEE8Full.add(new DependencyDesc("org.jboss.spec", "jboss-jakartaee-all-8.0", "1.0.0.Final"));
663-
jakartaEE8Web.add(new DependencyDesc("org.jboss.spec", "jboss-jakartaee-web-8.0", "1.0.0.Final"));
679+
javaEE5.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-5.0", null));
680+
javaEE5.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-all-5.0", null));
681+
javaEE6Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-6.0", null));
682+
javaEE6Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-all-6.0", null));
683+
javaEE6Web.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-web-6.0", null));
684+
javaEE7Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-7.0", null));
685+
javaEE7Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-all-7.0", null));
686+
javaEE7Web.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-web-7.0", null));
687+
javaEE8Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-8.0", null));
688+
javaEE8Full.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-all-8.0", null));
689+
javaEE8Web.add(new DependencyDesc("org.jboss.spec", "jboss-javaee-web-8.0", null));
690+
jakartaEE8Full.add(new DependencyDesc("org.jboss.spec", "jboss-jakartaee-8.0", null));
691+
jakartaEE8Full.add(new DependencyDesc("org.jboss.spec", "jboss-jakartaee-all-8.0", null));
692+
jakartaEE8Web.add(new DependencyDesc("org.jboss.spec", "jboss-jakartaee-web-8.0", null));
664693

665694
JAKARTA_EE_MAP.put(Profile.JAKARTA_EE_11_FULL, jakartaEE11Full);
666695
JAKARTA_EE_MAP.put(Profile.JAKARTA_EE_11_WEB, jakartaEE11Web);

0 commit comments

Comments
 (0)