Skip to content

Commit 2f54a85

Browse files
authored
Merge branch 'OpenLiberty:integration' into issue24584
2 parents c720f04 + eb6a319 commit 2f54a85

File tree

75 files changed

+1965
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1965
-234
lines changed

.ci-orchestrator/compilePersonal.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ebc.shortlist=parentbuild-personal.yml
2121
enable.predelivery.checking=true
2222
fail.gradle.on.error=false
2323
# Simple ant exclude pattern, takes only a single value
24-
fat.buckets.to.exclude=com.ibm.ws.ui*fat.gui*,com.ibm.ws.os.packaging_fat
24+
fat.buckets.to.exclude=
2525
# all, auto, none, or a comma-separated list of FAT project names.
2626
fat.buckets.to.run=auto
2727
# Do not change, if you need to run full fat buckets please use the spawn.fullfat.buckets property instead

.ci-orchestrator/personalbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ steps:
6868

6969
- stepName: compile
7070
workType: RTC
71-
projectName: "Liberty Personal Build CI Orchestrator - EBC"
71+
projectName: "Open Liberty Personal Build CI Orchestrator - EBC"
7272
dependsOn:
7373
- stepName: pr-changes
7474
awaitOutputProperties: true

.ci-orchestrator/scheduledPersonalBuilds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ steps:
153153

154154
- stepName: compile
155155
workType: RTC
156-
projectName: "Liberty Personal Build CI Orchestrator - EBC"
156+
projectName: "Open Liberty Personal Build CI Orchestrator - EBC"
157157
dependsOn:
158158
- stepName: pr-changes
159159
awaitOutputProperties: true

dev/build.image/profiles/jakartaee10/features.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<feature>monitor-1.0</feature>
55
<feature>ldapRegistry-3.0</feature>
66
<feature>localConnector-1.0</feature>
7+
<feature>restConnector-2.0</feature>
78
<feature>transportSecurity-1.0</feature>
89
<feature>sessionCache-1.0</feature>
910
<feature>sessionDatabase-1.0</feature>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
<feature>microProfile-4.0</feature>
22
<feature>microProfile-4.1</feature>
3+
<feature>localConnector-1.0</feature>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
<feature>microProfile-5.0</feature>
2+
<feature>localConnector-1.0</feature>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
<feature>microProfile-6.0</feature>
2+
<feature>localConnector-1.0</feature>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ IBM-ShortName: jakartaee-10.0
77
Subsystem-Version: 10.0.0
88
Subsystem-Name: Jakarta EE Platform 10.0
99
-features=io.openliberty.mail-2.1, \
10-
com.ibm.websphere.appserver.restConnector-2.0, \
1110
io.openliberty.messagingClient-3.0, \
1211
io.openliberty.connectors-2.1, \
1312
com.ibm.websphere.appserver.jdbc-4.2; ibm.tolerates:="4.3", \

dev/com.ibm.websphere.appserver.features/visibility/public/mpOpenTracing-1.0/com.ibm.websphere.appserver.mpOpenTracing-1.0.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ IBM-API-Package: \
1919
kind=ga
2020
edition=core
2121
WLP-Activation-Type: parallel
22-
superseded-by=mpTelemetry-1.0

dev/com.ibm.websphere.appserver.features/visibility/public/mpOpenTracing-1.1/com.ibm.websphere.appserver.mpOpenTracing-1.1.feature

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ IBM-API-Package: \
1919
kind=ga
2020
edition=core
2121
WLP-Activation-Type: parallel
22-
superseded-by=mpTelemetry-1.0

0 commit comments

Comments
 (0)