Merge pull request OpenLiberty#25418 from joe-chacko/update-yoko-idl-…

…string-fix Update yoko to allow IDL string chars > 127
pmd1nh · Jun 12, 2023 · a5178c7 · a5178c7
2 parents 260253a + 08308e1
commit a5178c7
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 24 deletions.
diff --git a/dev/cnf/oss_ibm.maven b/dev/cnf/oss_ibm.maven
@@ -34,12 +34,6 @@ com.ibm.ws.org.apache.el:jasper-el:2.2
 com.ibm.ws.org.apache.geronimo.specs:geronimo-annotation_1.1_spec:1.0.1
 com.ibm.ws.org.apache.geronimo.specs:geronimo-interceptor_1.1_spec:1.0
 com.ibm.ws.org.apache.geronimo.specs:geronimo-jpa_2.0_spec:1.1
-com.ibm.ws.org.apache.yoko:yoko-core:1.5.0.f9f1087fe1
-com.ibm.ws.org.apache.yoko:yoko-osgi:1.5.0.f9f1087fe1
-com.ibm.ws.org.apache.yoko:yoko-rmi-impl:1.5.0.f9f1087fe1
-com.ibm.ws.org.apache.yoko:yoko-rmi-spec:1.5.0.f9f1087fe1
-com.ibm.ws.org.apache.yoko:yoko-spec-corba:1.5.0.f9f1087fe1
-com.ibm.ws.org.apache.yoko:yoko-util:1.5.0.f9f1087fe1
 com.ibm.ws.org.apache:xalan:2.7.2
 com.ibm.ws.org.codehaus.jackson:jackson-core-asl:1.6.2.1
 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
 io.openliberty.org.codehaus.jackson:jackson-jaxrs:1.9.13.1
 io.openliberty.org.codehaus.jackson:jackson-mapper-asl:1.9.13.1
 io.openliberty.org.codehaus.jackson:jackson-xc:1.9.13.1
+io.openliberty.yoko:yoko-core:1.5.0.db1c134d1f
+io.openliberty.yoko:yoko-osgi:1.5.0.db1c134d1f
+io.openliberty.yoko:yoko-rmi-impl:1.5.0.db1c134d1f
+io.openliberty.yoko:yoko-rmi-spec:1.5.0.db1c134d1f
+io.openliberty.yoko:yoko-spec-corba:1.5.0.db1c134d1f
+io.openliberty.yoko:yoko-util:1.5.0.db1c134d1f
 net.sf.jtidy:jtidy:9.3.8
 org.apache.aries.blueprint:org.apache.aries.blueprint:1.3.0-ibm-s20170710-0926
 org.apache.geronimo.specs:geronimo-ejb_3.1_spec-alt:1.0.0

diff --git a/dev/com.ibm.ws.org.apache.yoko.corba.spec/bnd.bnd b/dev/com.ibm.ws.org.apache.yoko.corba.spec/bnd.bnd
@@ -11,9 +11,9 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 
--include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-spec-corba;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
+-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-spec-corba;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
 
--includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-spec-corba;1.5.0.f9f1087fe1}!/!META-INF/maven/*
+-includeresource: @${repo;io.openliberty.yoko:yoko-spec-corba;1.5.0.db1c134d1f}!/!META-INF/maven/*
 
--buildpath: com.ibm.ws.org.apache.yoko:yoko-spec-corba;version=1.5.0.f9f1087fe1, \
+-buildpath: io.openliberty.yoko:yoko-spec-corba;version=1.5.0.db1c134d1f, \
   com.ibm.ws.internal.prereq.java:java.ibmorbapi;strategy=exact;version=1.8.0
diff --git a/dev/com.ibm.ws.org.apache.yoko.core/bnd.bnd b/dev/com.ibm.ws.org.apache.yoko.core/bnd.bnd
@@ -11,8 +11,8 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 
--include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-core;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
+-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-core;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
 
--includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-core;1.5.0.f9f1087fe1}!/!META-INF/maven/*
+-includeresource: @${repo;io.openliberty.yoko:yoko-core;1.5.0.db1c134d1f}!/!META-INF/maven/*
 
--buildpath: com.ibm.ws.org.apache.yoko:yoko-core;version=1.5.0.f9f1087fe1
+-buildpath: io.openliberty.yoko:yoko-core;version=1.5.0.db1c134d1f
diff --git a/dev/com.ibm.ws.org.apache.yoko.osgi/bnd.bnd b/dev/com.ibm.ws.org.apache.yoko.osgi/bnd.bnd
@@ -11,8 +11,8 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 
--include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-osgi;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
+-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-osgi;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
 
--includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-osgi;1.5.0.f9f1087fe1}!/!META-INF/maven/*
+-includeresource: @${repo;io.openliberty.yoko:yoko-osgi;1.5.0.db1c134d1f}!/!META-INF/maven/*
 
--buildpath: com.ibm.ws.org.apache.yoko:yoko-osgi;version=1.5.0.f9f1087fe1
+-buildpath: io.openliberty.yoko:yoko-osgi;version=1.5.0.db1c134d1f
diff --git a/dev/com.ibm.ws.org.apache.yoko.rmi.impl/bnd.bnd b/dev/com.ibm.ws.org.apache.yoko.rmi.impl/bnd.bnd
@@ -11,8 +11,8 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 
--include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-rmi-impl;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
+-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-rmi-impl;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
 
--includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-rmi-impl;1.5.0.f9f1087fe1}!/!META-INF/maven/*
+-includeresource: @${repo;io.openliberty.yoko:yoko-rmi-impl;1.5.0.db1c134d1f}!/!META-INF/maven/*
 
--buildpath: com.ibm.ws.org.apache.yoko:yoko-rmi-impl;version=1.5.0.f9f1087fe1
+-buildpath: io.openliberty.yoko:yoko-rmi-impl;version=1.5.0.db1c134d1f
diff --git a/dev/com.ibm.ws.org.apache.yoko.rmi.spec/bnd.bnd b/dev/com.ibm.ws.org.apache.yoko.rmi.spec/bnd.bnd
@@ -11,8 +11,8 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 
--include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-rmi-spec;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
+-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-rmi-spec;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
 
--includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-rmi-spec;1.5.0.f9f1087fe1}!/!META-INF/maven/*
+-includeresource: @${repo;io.openliberty.yoko:yoko-rmi-spec;1.5.0.db1c134d1f}!/!META-INF/maven/*
 
--buildpath: com.ibm.ws.org.apache.yoko:yoko-rmi-spec;version=1.5.0.f9f1087fe1
+-buildpath: io.openliberty.yoko:yoko-rmi-spec;version=1.5.0.db1c134d1f
diff --git a/dev/com.ibm.ws.org.apache.yoko.util/bnd.bnd b/dev/com.ibm.ws.org.apache.yoko.util/bnd.bnd
@@ -11,8 +11,8 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 
--include= jar:${fileuri;${repo;com.ibm.ws.org.apache.yoko:yoko-util;1.5.0.f9f1087fe1}}!/META-INF/MANIFEST.MF,bnd.overrides
+-include= jar:${fileuri;${repo;io.openliberty.yoko:yoko-util;1.5.0.db1c134d1f}}!/META-INF/MANIFEST.MF,bnd.overrides
 
--includeresource: @${repo;com.ibm.ws.org.apache.yoko:yoko-util;1.5.0.f9f1087fe1}!/!META-INF/maven/*
+-includeresource: @${repo;io.openliberty.yoko:yoko-util;1.5.0.db1c134d1f}!/!META-INF/maven/*
 
--buildpath: com.ibm.ws.org.apache.yoko:yoko-util;version=1.5.0.f9f1087fe1
+-buildpath: io.openliberty.yoko:yoko-util;version=1.5.0.db1c134d1f