Skip to content

Commit 9eafe85

Browse files
committed
FISH-7526 Include jakarta.* for Enterprise
1 parent 9c3f37a commit 9eafe85

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

  • bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/internal

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/internal/SystemLibraries.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -58,15 +58,15 @@ public class SystemLibraries {
5858
"glassfish/modules/weld-osgi-bundle.jar",
5959
"glassfish/modules/bean-validator.jar",
6060
"glassfish/modules/jersey-*.jar",
61-
"glassfish/modules/grizzly-comet.jar", //
62-
"glassfish/modules/grizzly-websockets.jar", //
61+
"glassfish/modules/grizzly-comet.jar",
62+
"glassfish/modules/grizzly-websockets.jar",
6363
"glassfish/modules/glassfish-api.jar",
6464
"glassfish/modules/ha-api.jar",
6565
"glassfish/modules/endorsed/*.jar",
6666
"glassfish/modules/org.eclipse.persistence*.jar",
6767
"glassfish/modules/jaxb*.jar",
6868
"glassfish/modules/webservices*.jar",
69-
"glassfish/modules/woodstox-osgi*.jar", //
69+
"glassfish/modules/woodstox-osgi*.jar",
7070
"mq/lib/jaxm-api*.jar"
7171
};
7272

@@ -81,13 +81,11 @@ public class SystemLibraries {
8181
"glassfish/modules/org.eclipse.persistence*.jar",
8282
"glassfish/modules/jaxb*.jar",
8383
"glassfish/modules/webservices*.jar",
84-
"glassfish/modules/cdi-api.jar", // +
84+
"glassfish/modules/cdi-api.jar",
8585
"mq/lib/jaxm-api.jar"
8686
};
8787

88-
private static final String[] LIBRARIES_5 = LIBRARIES_4;
89-
90-
private static final String[] LIBRARIES_5_191 = {
88+
private static final String[] LIBRARIES_5 = {
9189
"glassfish/modules/javax.*.jar",
9290
"glassfish/modules/jakarta.*.jar",
9391
"glassfish/modules/weld-osgi-bundle.jar",
@@ -99,7 +97,7 @@ public class SystemLibraries {
9997
"glassfish/modules/org.eclipse.persistence*.jar",
10098
"glassfish/modules/jaxb*.jar",
10199
"glassfish/modules/webservices*.jar",
102-
"glassfish/modules/cdi-api.jar", // +
100+
"glassfish/modules/cdi-api.jar",
103101
"mq/lib/jaxm-api.jar"
104102
};
105103

@@ -122,10 +120,6 @@ public static String[] getLibraryIncludesByVersion(Version version) {
122120
return LIBRARIES_6;
123121
}
124122

125-
if (version.matches("[5.191")) {
126-
return LIBRARIES_5_191;
127-
}
128-
129123
if (version.matches("[5")) {
130124
return LIBRARIES_5;
131125
}

0 commit comments

Comments
 (0)