Skip to content

Commit 64fa94e

Browse files
ngmrngmr
authored
Merge pull request #25418 from joe-chacko/update-yoko-idl-string-fix
Update yoko to allow IDL string chars > 127
2 parents 260253a + 08308e1 commit 64fa94e

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎dev/cnf/oss_ibm.maven‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ com.ibm.ws.org.apache.el:jasper-el:2.2
3434
com.ibm.ws.org.apache.geronimo.specs:geronimo-annotation_1.1_spec:1.0.1
3535
com.ibm.ws.org.apache.geronimo.specs:geronimo-interceptor_1.1_spec:1.0
3636
com.ibm.ws.org.apache.geronimo.specs:geronimo-jpa_2.0_spec:1.1
37-
com.ibm.ws.org.apache.yoko:yoko-core:1.5.0.f9f1087fe1
38-
com.ibm.ws.org.apache.yoko:yoko-osgi:1.5.0.f9f1087fe1
39-
com.ibm.ws.org.apache.yoko:yoko-rmi-impl:1.5.0.f9f1087fe1
40-
com.ibm.ws.org.apache.yoko:yoko-rmi-spec:1.5.0.f9f1087fe1
41-
com.ibm.ws.org.apache.yoko:yoko-spec-corba:1.5.0.f9f1087fe1
42-
com.ibm.ws.org.apache.yoko:yoko-util:1.5.0.f9f1087fe1
4337
com.ibm.ws.org.apache:xalan:2.7.2
4438
com.ibm.ws.org.codehaus.jackson:jackson-core-asl:1.6.2.1
4539
com.ibm.ws.org.codehaus.jackson:jackson-jaxrs:1.6.2.1
@@ -59,6 +53,12 @@ io.openliberty.org.codehaus.jackson:jackson-core-asl:1.9.13.1
5953
io.openliberty.org.codehaus.jackson:jackson-jaxrs:1.9.13.1
6054
io.openliberty.org.codehaus.jackson:jackson-mapper-asl:1.9.13.1
6155
io.openliberty.org.codehaus.jackson:jackson-xc:1.9.13.1
56+
io.openliberty.yoko:yoko-core:1.5.0.db1c134d1f
57+
io.openliberty.yoko:yoko-osgi:1.5.0.db1c134d1f
58+
io.openliberty.yoko:yoko-rmi-impl:1.5.0.db1c134d1f
59+
io.openliberty.yoko:yoko-rmi-spec:1.5.0.db1c134d1f
60+
io.openliberty.yoko:yoko-spec-corba:1.5.0.db1c134d1f
61+
io.openliberty.yoko:yoko-util:1.5.0.db1c134d1f
6262
net.sf.jtidy:jtidy:9.3.8
6363
org.apache.aries.blueprint:org.apache.aries.blueprint:1.3.0-ibm-s20170710-0926
6464
org.apache.geronimo.specs:geronimo-ejb_3.1_spec-alt:1.0.0

‎dev/com.ibm.ws.org.apache.yoko.corba.spec/bnd.bnd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
# IBM Corporation - initial API and implementation
1212
#*******************************************************************************
1313

14-
-include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-spec-corba;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
14+
-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-spec-corba;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
1515

16-
-includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-spec-corba;1.5.0.f9f1087fe1}!/!META-INF/maven/*
16+
-includeresource: @${repo;io.openliberty.yoko:yoko-spec-corba;1.5.0.db1c134d1f}!/!META-INF/maven/*
1717

18-
-buildpath: com.ibm.ws.org.apache.yoko:yoko-spec-corba;version=1.5.0.f9f1087fe1, \
18+
-buildpath: io.openliberty.yoko:yoko-spec-corba;version=1.5.0.db1c134d1f, \
1919
com.ibm.ws.internal.prereq.java:java.ibmorbapi;strategy=exact;version=1.8.0

‎dev/com.ibm.ws.org.apache.yoko.core/bnd.bnd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# IBM Corporation - initial API and implementation
1212
#*******************************************************************************
1313

14-
-include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-core;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
14+
-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-core;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
1515

16-
-includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-core;1.5.0.f9f1087fe1}!/!META-INF/maven/*
16+
-includeresource: @${repo;io.openliberty.yoko:yoko-core;1.5.0.db1c134d1f}!/!META-INF/maven/*
1717

18-
-buildpath: com.ibm.ws.org.apache.yoko:yoko-core;version=1.5.0.f9f1087fe1
18+
-buildpath: io.openliberty.yoko:yoko-core;version=1.5.0.db1c134d1f

‎dev/com.ibm.ws.org.apache.yoko.osgi/bnd.bnd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# IBM Corporation - initial API and implementation
1212
#*******************************************************************************
1313

14-
-include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-osgi;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
14+
-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-osgi;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
1515

16-
-includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-osgi;1.5.0.f9f1087fe1}!/!META-INF/maven/*
16+
-includeresource: @${repo;io.openliberty.yoko:yoko-osgi;1.5.0.db1c134d1f}!/!META-INF/maven/*
1717

18-
-buildpath: com.ibm.ws.org.apache.yoko:yoko-osgi;version=1.5.0.f9f1087fe1
18+
-buildpath: io.openliberty.yoko:yoko-osgi;version=1.5.0.db1c134d1f

‎dev/com.ibm.ws.org.apache.yoko.rmi.impl/bnd.bnd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# IBM Corporation - initial API and implementation
1212
#*******************************************************************************
1313

14-
-include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-rmi-impl;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
14+
-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-rmi-impl;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
1515

16-
-includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-rmi-impl;1.5.0.f9f1087fe1}!/!META-INF/maven/*
16+
-includeresource: @${repo;io.openliberty.yoko:yoko-rmi-impl;1.5.0.db1c134d1f}!/!META-INF/maven/*
1717

18-
-buildpath: com.ibm.ws.org.apache.yoko:yoko-rmi-impl;version=1.5.0.f9f1087fe1
18+
-buildpath: io.openliberty.yoko:yoko-rmi-impl;version=1.5.0.db1c134d1f

‎dev/com.ibm.ws.org.apache.yoko.rmi.spec/bnd.bnd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# IBM Corporation - initial API and implementation
1212
#*******************************************************************************
1313

14-
-include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-rmi-spec;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
14+
-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-rmi-spec;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
1515

16-
-includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-rmi-spec;1.5.0.f9f1087fe1}!/!META-INF/maven/*
16+
-includeresource: @${repo;io.openliberty.yoko:yoko-rmi-spec;1.5.0.db1c134d1f}!/!META-INF/maven/*
1717

18-
-buildpath: com.ibm.ws.org.apache.yoko:yoko-rmi-spec;version=1.5.0.f9f1087fe1
18+
-buildpath: io.openliberty.yoko:yoko-rmi-spec;version=1.5.0.db1c134d1f

‎dev/com.ibm.ws.org.apache.yoko.util/bnd.bnd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# IBM Corporation - initial API and implementation
1212
#*******************************************************************************
1313

14-
-include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-util;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
14+
-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-util;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
1515

16-
-includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-util;1.5.0.f9f1087fe1}!/!META-INF/maven/*
16+
-includeresource: @${repo;io.openliberty.yoko:yoko-util;1.5.0.db1c134d1f}!/!META-INF/maven/*
1717

18-
-buildpath: com.ibm.ws.org.apache.yoko:yoko-util;version=1.5.0.f9f1087fe1
18+
-buildpath: io.openliberty.yoko:yoko-util;version=1.5.0.db1c134d1f

0 commit comments

Comments
 (0)