Skip to content

Commit 1f844fb

Browse files
KyleAureKyleAure
authored
Merge pull request #32173 from KyleAure/CVE-2025-36097-glassfish-internal
2 parents 44f4e46 + b9d2a6b commit 1f844fb

File tree

51 files changed

+585
-625
lines changed
  • dev
    • cnf
    • com.ibm.ws.clientcontainer.json_fat
    • com.ibm.ws.jdbc_fat_v41
    • com.ibm.ws.jsonb_fat
    • com.ibm.ws.microprofile.config.1.1
    • com.ibm.ws.microprofile.config.1.2
    • com.ibm.ws.microprofile.config.1.3
    • com.ibm.ws.microprofile.config.1.4
    • com.ibm.ws.microprofile.health.2.0_fat
    • com.ibm.ws.microprofile.health.2.0
    • com.ibm.ws.microprofile.health_fat
    • com.ibm.ws.microprofile.health
    • com.ibm.ws.microprofile.openapi
    • com.ibm.ws.microprofile.opentracing.jaeger_fat
    • com.ibm.ws.microprofile.reactive.streams.operators
    • com.ibm.ws.opentracing.1.x_fat
    • com.ibm.ws.opentracing_fat
    • com.ibm.ws.security.fat.common.SSO.clientTests
    • com.ibm.ws.security.fat.common.backchannelLogout
    • com.ibm.ws.security.fat.common.jwt
    • com.ibm.ws.security.fat.common.mp.jwt
    • com.ibm.ws.security.fat.common.social
    • com.ibm.ws.security.fat.common
    • com.ibm.ws.security.jwt_fat.builder
    • com.ibm.ws.security.oidc.client_fat.backchannelLogout.1
    • com.ibm.ws.security.oidc.client_fat.backchannelLogout.2
    • com.ibm.ws.security.oidc.client_fat.backchannelLogout.saml.1
    • com.ibm.ws.security.oidc.client_fat.backchannelLogout.saml.2
    • com.ibm.ws.security.oidc.client_fat.jaxrs
    • com.ibm.ws.security.oidc.server_fat.backchannelLogout
    • com.ibm.ws.security.social_fat.LibertyOP.backchannelLogout.1
    • com.ibm.ws.security.social_fat.LibertyOP.backchannelLogout.2
    • com.ibm.ws.security.social
    • io.openliberty.checkpoint_fat_mp
    • io.openliberty.checkpoint_fat
    • io.openliberty.microprofile.health.3.0.internal_fat
    • io.openliberty.microprofile.health.3.0.internal
    • io.openliberty.microprofile.health.3.1.internal_fat
    • io.openliberty.microprofile.health.3.1.internal
    • io.openliberty.microprofile.health.4.0.internal
    • io.openliberty.microprofile.openapi.2.0.internal
    • io.openliberty.microprofile.opentracing.2.0.internal.jaeger_fat
    • io.openliberty.microprofile.reactive.streams.operators30.internal
    • io.openliberty.opentracing.2.x_fat
    • io.openliberty.opentracing.3.x_fat
    • io.openliberty.reporting.internal_fat
    • io.openliberty.security.jakartasec.3.0.internal_fat.config.1
    • io.openliberty.security.jakartasec.3.0.internal_fat.config.2
    • io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest

Some content is hidden

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

51 files changed

+585
-625
lines changed

‎dev/cnf/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ dependencies {
3030
binaries "com.ibm.ws.javax.j2ee:servlet:3.1"
3131
binaries "org.jmockit:jmockit:1.25"
3232
binaries "org.apache.maven:maven-model:3.5.0"
33-
binaries "javax.json:javax.json-api:1.1.2"
34-
binaries "org.glassfish:javax.json:1.1.2"
33+
binaries "javax.json:javax.json-api:1.1.4"
34+
binaries "org.glassfish:javax.json:1.1.4" //TODO update to 1.1.5.ibm from DHE
3535
binaries "org.codehaus.plexus:plexus-utils:3.0.24"
3636
binaries "org.apache.ant:ant:1.10.10"
3737
binaries "com.github.mwiede:jsch:2.27.0"

‎dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3696,26 +3696,11 @@
36963696
<artifactId>jakarta.faces</artifactId>
36973697
<version>3.0.1</version>
36983698
</dependency>
3699-
<dependency>
3700-
<groupId>org.glassfish</groupId>
3701-
<artifactId>jakarta.json</artifactId>
3702-
<version>2.0.1</version>
3703-
</dependency>
37043699
<dependency>
37053700
<groupId>org.glassfish</groupId>
37063701
<artifactId>javax.faces</artifactId>
37073702
<version>2.3.9</version>
37083703
</dependency>
3709-
<dependency>
3710-
<groupId>org.glassfish</groupId>
3711-
<artifactId>javax.json</artifactId>
3712-
<version>1.0.4</version>
3713-
</dependency>
3714-
<dependency>
3715-
<groupId>org.glassfish</groupId>
3716-
<artifactId>javax.json</artifactId>
3717-
<version>1.1.4</version>
3718-
</dependency>
37193704
<dependency>
37203705
<groupId>org.hamcrest</groupId>
37213706
<artifactId>hamcrest-all</artifactId>

‎dev/cnf/oss_dependencies.maven‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -735,10 +735,7 @@ org.glassfish.jersey.inject:jersey-hk2:2.26
735735
org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0
736736
org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1
737737
org.glassfish:jakarta.faces:3.0.1
738-
org.glassfish:jakarta.json:2.0.1
739738
org.glassfish:javax.faces:2.3.9
740-
org.glassfish:javax.json:1.0.4
741-
org.glassfish:javax.json:1.1.4
742739
org.hamcrest:hamcrest-all:1.3
743740
org.hdrhistogram:HdrHistogram:2.1.12
744741
org.hibernate.common:hibernate-commons-annotations:5.1.0.Final

‎dev/com.ibm.ws.clientcontainer.json_fat/bnd.bnd‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2018 IBM Corporation and others.
2+
# Copyright (c) 2018, 2025 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
@@ -15,23 +15,18 @@ bVersion=1.0
1515

1616

1717
src: \
18-
fat/src,\
19-
test-applications/JsonbAppClient.jar/src,\
20-
test-applications/JsonpAppClient.jar/src
18+
fat/src,\
19+
test-applications/JsonbAppClient.jar/src,\
20+
test-applications/JsonpAppClient.jar/src
2121

2222
fat.project: true
2323

2424
# Dependencies may be local bundles (e.g. com.ibm.websphere.javaee.servlet.3.1)
2525
# or binaries from Artifactory (e.g. commons-logging:commons-logging)
2626
-buildpath: \
27-
com.ibm.websphere.javaee.annotation.1.1;version=latest,\
28-
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
29-
com.ibm.websphere.javaee.jsonb.1.0;version=latest,\
30-
com.ibm.websphere.javaee.jsonp.1.1;version=latest,\
31-
org.apache.johnzon:johnzon-core;version=1.1.0,\
32-
org.apache.johnzon:johnzon-jsonb;version=1.1.0,\
33-
org.apache.johnzon:johnzon-mapper;version=1.1.0,\
34-
org.eclipse:yasson;version=1.0.8,\
35-
org.glassfish:javax.json;version=1.1
27+
com.ibm.websphere.javaee.annotation.1.1;version=latest,\
28+
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
29+
com.ibm.websphere.javaee.jsonb.1.0;version=latest,\
30+
com.ibm.websphere.javaee.jsonp.1.1;version=latest
3631

3732

‎dev/com.ibm.ws.jdbc_fat_v41/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017,2024 IBM Corporation and others.
2+
* Copyright (c) 2017, 2025 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
@@ -20,8 +20,7 @@ configurations {
2020
}
2121

2222
dependencies {
23-
requiredLibs 'org.glassfish:javax.json:1.0.4',
24-
project(':com.ibm.ws.jca.cm')
23+
requiredLibs project(':com.ibm.ws.jca.cm')
2524
derby40 'org.apache.derby:derby:10.7.1.1'
2625
}
2726

‎dev/com.ibm.ws.jsonb_fat/bnd.bnd‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2017, 2022 IBM Corporation and others.
2+
# Copyright (c) 2017, 2025 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
@@ -15,41 +15,36 @@ bVersion=1.0
1515

1616

1717
src: \
18-
fat/src,\
19-
test-applications/jsonbapp/src,\
20-
test-applications/jsonbCDIapp/src,\
21-
test-bundles/TestBundleUsingJsonb/src,\
22-
test-bundles/TestBundleUsingJsonp/src,\
23-
test-providers/fake-json-p/src
18+
fat/src,\
19+
test-applications/jsonbapp/src,\
20+
test-applications/jsonbCDIapp/src,\
21+
test-bundles/TestBundleUsingJsonb/src,\
22+
test-bundles/TestBundleUsingJsonp/src,\
23+
test-providers/fake-json-p/src
2424

2525
fat.project: true
2626

2727
-sub: *.bnd
2828

2929
tested.features: servlet-5.0,\
3030
servlet-6.0,\
31-
jsonpContainer-2.0,\
32-
jsonpContainer-2.1,\
33-
jsonbContainer-2.0,\
34-
jsonbContainer-3.0,\
35-
jsonp-2.0,\
36-
jsonp-2.1,\
37-
jsonb-2.0,\
38-
jsonb-3.0,\
39-
cdi-3.0,\
40-
cdi-4.0
31+
jsonpContainer-2.0,\
32+
jsonpContainer-2.1,\
33+
jsonbContainer-2.0,\
34+
jsonbContainer-3.0,\
35+
jsonp-2.0,\
36+
jsonp-2.1,\
37+
jsonb-2.0,\
38+
jsonb-3.0,\
39+
cdi-3.0,\
40+
cdi-4.0
4141

4242
-buildpath: \
43-
com.ibm.wsspi.org.osgi.core;version=latest,\
44-
com.ibm.wsspi.org.osgi.service.component;version=latest,\
45-
com.ibm.wsspi.org.osgi.service.component.annotations;version=latest,\
46-
org.apache.johnzon:johnzon-core;version='1.1.0',\
47-
org.apache.johnzon:johnzon-jsonb;version='1.1.0',\
48-
org.apache.johnzon:johnzon-mapper;version='1.1.0',\
49-
org.eclipse:yasson;version='1.0.8',\
50-
org.glassfish:javax.json;version='1.1',\
51-
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
52-
com.ibm.websphere.javaee.jsonb.1.0;version=latest,\
53-
com.ibm.websphere.javaee.jsonp.1.1;version=latest,\
54-
com.ibm.websphere.javaee.servlet.4.0;version=latest,\
55-
io.openliberty.jakarta.jsonp.2.1;version=latest
43+
com.ibm.wsspi.org.osgi.core;version=latest,\
44+
com.ibm.wsspi.org.osgi.service.component;version=latest,\
45+
com.ibm.wsspi.org.osgi.service.component.annotations;version=latest,\
46+
com.ibm.websphere.javaee.cdi.2.0;version=latest,\
47+
com.ibm.websphere.javaee.jsonb.1.0;version=latest,\
48+
com.ibm.websphere.javaee.jsonp.1.1;version=latest,\
49+
com.ibm.websphere.javaee.servlet.4.0;version=latest,\
50+
io.openliberty.jakarta.jsonp.2.1;version=latest

‎dev/com.ibm.ws.microprofile.config.1.1/bnd.bnd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2017, 2024 IBM Corporation and others.
2+
# Copyright (c) 2017, 2025 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
@@ -62,7 +62,7 @@ WS-TraceGroup: APPCONFIG
6262
org.hamcrest:hamcrest-all;version=1.3, \
6363
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
6464
org.jmock:jmock;strategy=exact;version=2.5.1, \
65-
org.glassfish:javax.json;strategy=exact;version=1.0.4, \
65+
com.ibm.ws.org.glassfish.json.1.0;version=latest, \
6666
com.ibm.websphere.javaee.jsonp.1.0;version=latest, \
6767
com.ibm.websphere.javaee.jaxb.2.2;version=latest,\
6868
com.ibm.ws.jaxb.tools;version=latest,\

‎dev/com.ibm.ws.microprofile.config.1.2/bnd.bnd‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2018, 2024 IBM Corporation and others.
2+
# Copyright (c) 2018, 2025 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
@@ -38,30 +38,30 @@ WS-TraceGroup: APPCONFIG
3838

3939
-buildpath: \
4040
io.openliberty.microprofile.config.internal.common;version=latest, \
41-
com.ibm.ws.org.apache.commons.lang3;version=latest, \
42-
com.ibm.ws.logging;version=latest, \
43-
org.eclipse.osgi;version=latest, \
44-
com.ibm.websphere.org.osgi.core;version=latest, \
45-
com.ibm.websphere.org.osgi.service.component;version=latest, \
46-
com.ibm.wsspi.org.osgi.service.component.annotations;version=latest, \
41+
com.ibm.ws.org.apache.commons.lang3;version=latest, \
42+
com.ibm.ws.logging;version=latest, \
43+
org.eclipse.osgi;version=latest, \
44+
com.ibm.websphere.org.osgi.core;version=latest, \
45+
com.ibm.websphere.org.osgi.service.component;version=latest, \
46+
com.ibm.wsspi.org.osgi.service.component.annotations;version=latest, \
4747
com.ibm.ws.microprofile.config.1.1;version=latest, \
48-
com.ibm.websphere.org.eclipse.microprofile.config.1.2.1;version=latest, \
49-
com.ibm.ws.kernel.service;version=latest, \
50-
com.ibm.websphere.javaee.annotation.1.2;version=latest, \
51-
com.ibm.ws.org.osgi.annotation.versioning;version=latest, \
52-
com.ibm.ws.adaptable.module;version=latest,\
48+
com.ibm.websphere.org.eclipse.microprofile.config.1.2.1;version=latest, \
49+
com.ibm.ws.kernel.service;version=latest, \
50+
com.ibm.websphere.javaee.annotation.1.2;version=latest, \
51+
com.ibm.ws.org.osgi.annotation.versioning;version=latest, \
52+
com.ibm.ws.adaptable.module;version=latest,\
5353
com.ibm.ws.container.service;version=latest
5454

5555
-testpath: \
56-
../build.sharedResources/lib/junit/old/junit.jar;version=file, \
57-
com.ibm.ws.junit.extensions;version=latest, \
58-
org.hamcrest:hamcrest-all;version=1.3, \
59-
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
60-
org.jmock:jmock;strategy=exact;version=2.5.1, \
61-
org.glassfish:javax.json;strategy=exact;version=1.0.4, \
56+
../build.sharedResources/lib/junit/old/junit.jar;version=file, \
57+
com.ibm.ws.junit.extensions;version=latest, \
58+
org.hamcrest:hamcrest-all;version=1.3, \
59+
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
60+
org.jmock:jmock;strategy=exact;version=2.5.1, \
61+
com.ibm.ws.org.glassfish.json.1.0;version=latest, \
6262
com.ibm.websphere.javaee.jsonp.1.0;version=latest, \
6363
com.ibm.websphere.javaee.jaxb.2.2;version=latest,\
64-
com.ibm.ws.jaxb.tools;version=latest,\
64+
com.ibm.ws.jaxb.tools;version=latest,\
6565
org.apache.commons:commons-lang3;version=3.8, \
6666
./resources/;version=file, \
6767
./test/resources/;version=file

‎dev/com.ibm.ws.microprofile.config.1.3/bnd.bnd‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2018, 2024 IBM Corporation and others.
2+
# Copyright (c) 2018, 2025 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
@@ -41,35 +41,35 @@ WS-TraceGroup: APPCONFIG
4141
-buildpath: \
4242
io.openliberty.microprofile.config.internal.common;version=latest, \
4343
io.openliberty.microprofile.config.internal.serverxml;version=latest, \
44-
com.ibm.ws.org.apache.commons.lang3;version=latest, \
45-
com.ibm.ws.logging;version=latest, \
46-
org.eclipse.osgi;version=latest, \
47-
com.ibm.websphere.org.osgi.core;version=latest, \
48-
com.ibm.websphere.org.osgi.service.component;version=latest, \
49-
com.ibm.wsspi.org.osgi.service.component.annotations;version=latest, \
50-
com.ibm.ws.microprofile.config.1.1;version=latest, \
44+
com.ibm.ws.org.apache.commons.lang3;version=latest, \
45+
com.ibm.ws.logging;version=latest, \
46+
org.eclipse.osgi;version=latest, \
47+
com.ibm.websphere.org.osgi.core;version=latest, \
48+
com.ibm.websphere.org.osgi.service.component;version=latest, \
49+
com.ibm.wsspi.org.osgi.service.component.annotations;version=latest, \
50+
com.ibm.ws.microprofile.config.1.1;version=latest, \
5151
com.ibm.ws.microprofile.config.1.2;version=latest, \
52-
com.ibm.websphere.org.eclipse.microprofile.config.1.3;version=latest, \
53-
com.ibm.ws.kernel.service;version=latest, \
54-
com.ibm.websphere.javaee.annotation.1.2;version=latest, \
55-
com.ibm.ws.org.osgi.annotation.versioning;version=latest, \
56-
com.ibm.websphere.org.osgi.service.cm;version=latest,\
57-
com.ibm.ws.cdi.interfaces;version=latest,\
58-
com.ibm.ws.container.service;version=latest,\
59-
com.ibm.ws.app.manager;version=latest,\
60-
com.ibm.ws.config;version=latest, \
52+
com.ibm.websphere.org.eclipse.microprofile.config.1.3;version=latest, \
53+
com.ibm.ws.kernel.service;version=latest, \
54+
com.ibm.websphere.javaee.annotation.1.2;version=latest, \
55+
com.ibm.ws.org.osgi.annotation.versioning;version=latest, \
56+
com.ibm.websphere.org.osgi.service.cm;version=latest,\
57+
com.ibm.ws.cdi.interfaces;version=latest,\
58+
com.ibm.ws.container.service;version=latest,\
59+
com.ibm.ws.app.manager;version=latest,\
60+
com.ibm.ws.config;version=latest, \
6161
com.ibm.ws.adaptable.module;version=latest
6262

6363
-testpath: \
64-
../build.sharedResources/lib/junit/old/junit.jar;version=file, \
65-
com.ibm.ws.junit.extensions;version=latest, \
66-
org.hamcrest:hamcrest-all;version=1.3, \
67-
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
68-
org.jmock:jmock;strategy=exact;version=2.5.1, \
69-
org.glassfish:javax.json;strategy=exact;version=1.0.4, \
64+
../build.sharedResources/lib/junit/old/junit.jar;version=file, \
65+
com.ibm.ws.junit.extensions;version=latest, \
66+
org.hamcrest:hamcrest-all;version=1.3, \
67+
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
68+
org.jmock:jmock;strategy=exact;version=2.5.1, \
69+
com.ibm.ws.org.glassfish.json.1.0;version=latest, \
7070
com.ibm.websphere.javaee.jsonp.1.0;version=latest, \
7171
com.ibm.websphere.javaee.jaxb.2.2;version=latest,\
72-
com.ibm.ws.jaxb.tools;version=latest,\
72+
com.ibm.ws.jaxb.tools;version=latest,\
7373
org.apache.commons:commons-lang3;version=3.8, \
7474
./resources/;version=file, \
7575
./test/resources/;version=file

‎dev/com.ibm.ws.microprofile.config.1.4/bnd.bnd‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#*******************************************************************************
2-
# Copyright (c) 2018, 2023 IBM Corporation and others.
2+
# Copyright (c) 2018, 2025 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
@@ -41,34 +41,34 @@ WS-TraceGroup: APPCONFIG
4141
-buildpath: \
4242
io.openliberty.microprofile.config.internal.common;version=latest, \
4343
io.openliberty.microprofile.config.internal.serverxml;version=latest, \
44-
com.ibm.websphere.org.eclipse.microprofile.config.1.4;version=latest, \
45-
com.ibm.ws.org.apache.commons.lang3;version=latest, \
46-
com.ibm.ws.logging;version=latest, \
47-
org.eclipse.osgi;version=latest, \
48-
com.ibm.websphere.org.osgi.core;version=latest, \
49-
com.ibm.websphere.org.osgi.service.component;version=latest, \
50-
com.ibm.wsspi.org.osgi.service.component.annotations;version=latest, \
44+
com.ibm.websphere.org.eclipse.microprofile.config.1.4;version=latest, \
45+
com.ibm.ws.org.apache.commons.lang3;version=latest, \
46+
com.ibm.ws.logging;version=latest, \
47+
org.eclipse.osgi;version=latest, \
48+
com.ibm.websphere.org.osgi.core;version=latest, \
49+
com.ibm.websphere.org.osgi.service.component;version=latest, \
50+
com.ibm.wsspi.org.osgi.service.component.annotations;version=latest, \
5151
com.ibm.ws.microprofile.config.1.3;version=latest, \
5252
com.ibm.ws.microprofile.config.1.2;version=latest, \
5353
com.ibm.ws.microprofile.config.1.1;version=latest, \
54-
com.ibm.ws.kernel.service;version=latest, \
55-
com.ibm.websphere.javaee.annotation.1.2;version=latest, \
56-
com.ibm.ws.org.osgi.annotation.versioning;version=latest, \
57-
com.ibm.websphere.org.osgi.service.cm;version=latest,\
58-
com.ibm.ws.cdi.interfaces;version=latest,\
59-
com.ibm.ws.container.service;version=latest,\
60-
com.ibm.ws.app.manager;version=latest,\
61-
com.ibm.ws.config;version=latest
54+
com.ibm.ws.kernel.service;version=latest, \
55+
com.ibm.websphere.javaee.annotation.1.2;version=latest, \
56+
com.ibm.ws.org.osgi.annotation.versioning;version=latest, \
57+
com.ibm.websphere.org.osgi.service.cm;version=latest,\
58+
com.ibm.ws.cdi.interfaces;version=latest,\
59+
com.ibm.ws.container.service;version=latest,\
60+
com.ibm.ws.app.manager;version=latest,\
61+
com.ibm.ws.config;version=latest
6262

6363
-testpath: \
64-
../build.sharedResources/lib/junit/old/junit.jar;version=file, \
65-
com.ibm.ws.junit.extensions;version=latest, \
66-
org.hamcrest:hamcrest-all;version=1.3, \
67-
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
68-
org.jmock:jmock;strategy=exact;version=2.5.1, \
69-
org.glassfish:javax.json;strategy=exact;version=1.0.4, \
64+
../build.sharedResources/lib/junit/old/junit.jar;version=file, \
65+
com.ibm.ws.junit.extensions;version=latest, \
66+
org.hamcrest:hamcrest-all;version=1.3, \
67+
org.jmock:jmock-junit4;strategy=exact;version=2.5.1, \
68+
org.jmock:jmock;strategy=exact;version=2.5.1, \
69+
com.ibm.ws.org.glassfish.json.1.0;version=latest, \
7070
com.ibm.websphere.javaee.jsonp.1.0;version=latest, \
7171
com.ibm.websphere.javaee.jaxb.2.2;version=latest,\
72-
com.ibm.ws.jaxb.tools;version=latest,\
72+
com.ibm.ws.jaxb.tools;version=latest,\
7373
org.apache.commons:commons-lang3;version=3.8, \
7474
./resources/;version=file

0 commit comments

Comments
 (0)