Skip to content

Commit f3d39a6

Browse files
jhanders34jhanders34
authored
Merge pull request #27676 from jhanders34/branch2
Create Jakarta EE 11 packages
2 parents a0f3c28 + 62ec4de commit f3d39a6

File tree

8 files changed

+178
-6
lines changed

8 files changed

+178
-6
lines changed

‎dev/build.image/build.gradle‎

Lines changed: 83 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2023 IBM Corporation and others.
2+
* Copyright (c) 2017, 2024 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -369,8 +369,10 @@ def gaAndBetaAndNoShipPublicFeatures() {
369369

370370
def webProfile8Features() { project.file("profiles/webProfile8/features.xml").readLines() }
371371
def webProfile10Features() { project.file("profiles/webProfile10/features.xml").readLines() }
372+
def webProfile11Features() { project.file("profiles/webProfile11/features.xml").readLines() }
372373
def javaee8Features() { project.file("profiles/javaee8/features.xml").readLines() }
373374
def jakartaee10Features() { project.file("profiles/jakartaee10/features.xml").readLines() }
375+
def jakartaee11Features() { project.file("profiles/jakartaee11/features.xml").readLines() }
374376
def microProfile4Features() { project.file("profiles/microProfile4/features.xml").readLines() }
375377
def microProfile6Features() { project.file("profiles/microProfile6/features.xml").readLines() }
376378

@@ -559,6 +561,44 @@ if (isAutomatedBuild && !isIFIXBuild) {
559561
}
560562
}
561563

564+
//GA
565+
task packageOpenLibertyWebProfile11(type: PackageLibertyWithFeatures) {
566+
dependsOn parent.subprojects.assemble
567+
dependsOn ':com.ibm.websphere.appserver.features:publishFeatureResources'
568+
withFeatures this.&webProfile11Features
569+
packageServerConflict = "com.ibm.websphere.appserver.sessionStore,com.ibm.websphere.appserver.jdbc"
570+
outputTo new File(packageDir, "webProfile11")
571+
doLast {
572+
copy {
573+
from "$packageDir/webProfile11/wlp/templates/servers/webProfile11/server.xml"
574+
into "$packageDir/webProfile11/wlp/templates/servers/defaultServer"
575+
}
576+
copy {
577+
from "$packageDir/webProfile11/wlp/templates/clients/jakartaeeClient11/client.xml"
578+
into "$packageDir/webProfile11/wlp/templates/clients/defaultClient"
579+
}
580+
}
581+
}
582+
583+
//GA
584+
task packageOpenLibertyJakartaee11(type: PackageLibertyWithFeatures) {
585+
dependsOn parent.subprojects.assemble
586+
dependsOn ':com.ibm.websphere.appserver.features:publishFeatureResources'
587+
withFeatures this.&jakartaee11Features
588+
packageServerConflict = "com.ibm.websphere.appserver.sessionStore,com.ibm.websphere.appserver.jdbc"
589+
outputTo new File(packageDir, "jakartaee11")
590+
doLast {
591+
copy {
592+
from "$packageDir/jakartaee11/wlp/templates/servers/jakartaee11/server.xml"
593+
into "$packageDir/jakartaee11/wlp/templates/servers/defaultServer"
594+
}
595+
copy {
596+
from "$packageDir/jakartaee11/wlp/templates/clients/jakartaeeClient11/client.xml"
597+
into "$packageDir/jakartaee11/wlp/templates/clients/defaultClient"
598+
}
599+
}
600+
}
601+
562602
//GA
563603
task packageOpenLibertyMicroProfile4(type: PackageLibertyWithFeatures) {
564604
doFirst {
@@ -765,6 +805,46 @@ if (isAutomatedBuild && !isIFIXBuild) {
765805
}
766806
publish.dependsOn cleanupOpenLibertyJakartaee10Package
767807

808+
// GA: Includes only features listed in profiles/webProfile11/features.xml
809+
task zipOpenLibertyWebProfile11(type: Zip) {
810+
dependsOn packageOpenLibertyWebProfile11
811+
dependsOn genChecksums
812+
archiveBaseName = 'openliberty-webProfile11'
813+
from(packageOpenLibertyWebProfile11)
814+
destinationDirectory = distsDirectory
815+
archiveVersion = releaseVersion
816+
doLast {
817+
rootProject.userProps.setProperty('zipopenliberty.webprofile11.archivename', archivePath.toString())
818+
rootProject.storeProps()
819+
}
820+
}
821+
822+
task cleanupOpenLibertyWebProfile11Package(type: Delete) {
823+
dependsOn zipOpenLibertyWebProfile11
824+
delete(packageOpenLibertyWebProfile11)
825+
}
826+
publish.dependsOn cleanupOpenLibertyWebProfile11Package
827+
828+
// GA: Includes only features listed in profiles/jakartaee11/features.xml
829+
task zipOpenLibertyJakartaee11(type: Zip) {
830+
dependsOn packageOpenLibertyJakartaee11
831+
dependsOn genChecksums
832+
archiveBaseName = 'openliberty-jakartaee11'
833+
from(packageOpenLibertyJakartaee11)
834+
destinationDirectory = distsDirectory
835+
archiveVersion = releaseVersion
836+
doLast {
837+
rootProject.userProps.setProperty('zipopenliberty.jakartaee11.archivename', archivePath.toString())
838+
rootProject.storeProps()
839+
}
840+
}
841+
842+
task cleanupOpenLibertyJakartaee11Package(type: Delete) {
843+
dependsOn zipOpenLibertyJakartaee11
844+
delete(packageOpenLibertyJakartaee11)
845+
}
846+
publish.dependsOn cleanupOpenLibertyJakartaee11Package
847+
768848
// GA: Includes only features listed in profiles/microProfile4/features.xml
769849
task zipOpenLibertyMicroProfile4(type: Zip) {
770850
dependsOn packageOpenLibertyMicroProfile4
@@ -835,6 +915,8 @@ if (isAutomatedBuild && !isIFIXBuild) {
835915
dependsOn cleanupOpenLibertyJavaee8Package
836916
dependsOn cleanupOpenLibertyJakartaee10Package
837917
dependsOn cleanupOpenLibertyWebProfile10Package
918+
dependsOn cleanupOpenLibertyJakartaee11Package
919+
dependsOn cleanupOpenLibertyWebProfile11Package
838920
dependsOn cleanupOpenLibertyMicroProfile4Package
839921
dependsOn cleanupOpenLibertyMicroProfile6Package
840922
dependsOn cleanupOpenLibertyBetaPackage

‎dev/build.image/profiles/jakartaee11/features.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<feature>jakartaee-11.0</feature>
2+
<feature>jakartaeeClient-11.0</feature>
3+
<feature>enterpriseBeans-4.0</feature>
4+
<feature>xmlBinding-4.0</feature>
5+
<feature>xmlWS-4.0</feature>
6+
<feature>jdbc-4.2</feature>
7+
<feature>jdbc-4.3</feature>
8+
<feature>appSecurityClient-1.0</feature>
9+
<feature>monitor-1.0</feature>
10+
<feature>ldapRegistry-3.0</feature>
11+
<feature>localConnector-1.0</feature>
12+
<feature>restConnector-2.0</feature>
13+
<feature>transportSecurity-1.0</feature>
14+
<feature>sessionCache-1.0</feature>
15+
<feature>sessionDatabase-1.0</feature>
16+
<feature>webCache-1.0</feature>
17+
<feature>requestTiming-1.0</feature>

‎dev/build.image/profiles/webProfile11/features.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<feature>webProfile-11.0</feature>
2+
<feature>jdbc-4.2</feature>
3+
<feature>jdbc-4.3</feature>
4+
<feature>monitor-1.0</feature>
5+
<feature>ldapRegistry-3.0</feature>
6+
<feature>localConnector-1.0</feature>
7+
<feature>restConnector-2.0</feature>
8+
<feature>transportSecurity-1.0</feature>
9+
<feature>sessionCache-1.0</feature>
10+
<feature>sessionDatabase-1.0</feature>
11+
<feature>webCache-1.0</feature>
12+
<feature>requestTiming-1.0</feature>

‎dev/build.image/publish/wlp/templates/clients/jakartaeeClient11/client.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<client description="new client">
3+
<featureManager>
4+
<feature>jakartaeeClient-11.0</feature>
5+
</featureManager>
6+
</client>

‎dev/build.image/publish/wlp/templates/servers/jakartaee11/server.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<server description="new server">
3+
4+
<!-- Enable features -->
5+
<featureManager>
6+
<feature>jakartaee-11.0</feature>
7+
</featureManager>
8+
9+
<!-- This template enables security. To get the full use of all the capabilities, a keystore and user registry are required. -->
10+
11+
<!-- For the keystore, default keys are generated and stored in a keystore. To provide the keystore password, generate an
12+
encoded password using bin/securityUtility encode and add it below in the password attribute of the keyStore element.
13+
Then uncomment the keyStore element. -->
14+
<!--
15+
<keyStore password=""/>
16+
-->
17+
18+
<!--For a user registry configuration, configure your user registry. For example, configure a basic user registry using the
19+
basicRegistry element. Specify your own user name below in the name attribute of the user element. For the password,
20+
generate an encoded password using bin/securityUtility encode and add it in the password attribute of the user element.
21+
Then uncomment the user element. -->
22+
<basicRegistry id="basic" realm="BasicRealm">
23+
<!-- <user name="yourUserName" password="" /> -->
24+
</basicRegistry>
25+
26+
<!-- To access this server from a remote client add a host attribute to the following element, e.g. host="*" -->
27+
<httpEndpoint id="defaultHttpEndpoint"
28+
httpPort="9080"
29+
httpsPort="9443" />
30+
31+
<!-- Automatically expand WAR files and EAR files -->
32+
<applicationManager autoExpand="true"/>
33+
34+
<!-- Default SSL configuration enables trust for default certificates from the Java runtime -->
35+
<ssl id="defaultSSLConfig" trustDefaultCerts="true" />
36+
37+
</server>

‎dev/build.image/publish/wlp/templates/servers/webProfile11/server.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<server description="new server">
3+
4+
<!-- Enable features -->
5+
<featureManager>
6+
<feature>webProfile-11.0</feature>
7+
</featureManager>
8+
9+
<!-- To access this server from a remote client add a host attribute to the following element, e.g. host="*" -->
10+
<httpEndpoint id="defaultHttpEndpoint"
11+
httpPort="9080"
12+
httpsPort="9443" />
13+
14+
<!-- Automatically expand WAR files and EAR files -->
15+
<applicationManager autoExpand="true"/>
16+
17+
<!-- Default SSL configuration enables trust for default certificates from the Java runtime -->
18+
<ssl id="defaultSSLConfig" trustDefaultCerts="true" />
19+
20+
</server>

‎dev/com.ibm.websphere.appserver.features/visibility/public/jakartaee-11.0/io.openliberty.jakartaee-11.0.feature‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ Subsystem-Name: Jakarta EE Platform 11.0
1414
io.openliberty.batch-2.1, \
1515
io.openliberty.cdi-4.1, \
1616
io.openliberty.webProfile-11.0, \
17-
io.openliberty.xmlBinding-4.0, \
1817
io.openliberty.messagingSecurity-3.0, \
1918
io.openliberty.appAuthorization-3.0, \
20-
io.openliberty.xmlWS-4.0, \
2119
io.openliberty.appClientSupport-2.0, \
22-
io.openliberty.enterpriseBeans-4.0, \
20+
io.openliberty.enterpriseBeansRemote-4.0, \
21+
io.openliberty.enterpriseBeansPersistentTimer-4.0, \
22+
io.openliberty.mdb-4.0, \
2323
io.openliberty.messaging-3.1, \
2424
io.openliberty.messagingServer-3.0, \
2525
com.ibm.websphere.appserver.transaction-2.0

‎dev/com.ibm.websphere.appserver.features/visibility/public/jakartaeeClient-11.0/io.openliberty.jakartaeeClient-11.0.feature‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,9 @@ Subsystem-Name: Jakarta EE 11.0 Application Client
101101
io.openliberty.jsonb-3.0, \
102102
com.ibm.websphere.appserver.jdbc-4.2; ibm.tolerates:="4.3", \
103103
io.openliberty.persistence-3.2, \
104-
io.openliberty.xmlBinding-4.0, \
105104
io.openliberty.beanValidation-3.1, \
106105
com.ibm.websphere.appserver.eeCompatible-11.0, \
107106
io.openliberty.appclient.appClient-2.0, \
108-
io.openliberty.xmlWSClient-4.0, \
109107
com.ibm.websphere.appserver.transaction-2.0, \
110108
io.openliberty.jsonp-2.1
111109
-jars=io.openliberty.ejbcontainer; location:=dev/api/ibm/

0 commit comments

Comments
 (0)