From df4ed08180e0314813852b811805860fe7442f27 Mon Sep 17 00:00:00 2001 From: kapil-agnihotri Date: Thu, 4 May 2023 22:08:25 +0200 Subject: [PATCH] build: add xerces.xercesImpl to castor-xml ING-3837 --- .gitignore | 2 +- build.gradle | 10 ++-------- version-history.json | 10 ++++------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6e7579a..9a9c9e4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ build/ *~ .project *.sublime-workspace -.idea/* \ No newline at end of file +.idea* diff --git a/build.gradle b/build.gradle index 3f0a346..d51c154 100644 --- a/build.gradle +++ b/build.gradle @@ -227,7 +227,6 @@ platform { // uncomment and update with eclipse directory only during development // eclipseHome = new File('/Users/kapil/eclipse/eclipse-4.24-rcp-for-hale-studio-java17/Eclipse-for-hale-studio-5.0.0.app/Contents/Eclipse') - // override behavior for all bundles to prevent package uses conflicts for packages provided by the JRE override { // ensure javax.annotation imports are w/o version @@ -332,16 +331,11 @@ platform { bundle 'org.apache.ws.commons.schema:XmlSchema:1.4.7' bundle 'org.codehaus.castor:castor-xml:1.4.1', { bnd { -// def buddies = ['org.codehaus.castor.core', 'org.apache.commons.lang3'] instruction 'Import-Package', 'org.springframework.*' instruction 'Import-Package', 'org.apache.commons.lang3.*' - instruction 'Require-Bundle', 'org.codehaus.castor.core' -// instruction 'Require-Bundle', 'org.apache.commons.lang3' + // required to run unit tests involving codehaus xml + instruction 'Require-Bundle', "org.codehaus.castor.core,xerces.xercesImpl" addQualifier = true -// add as optional required bundle -// instruction 'Require-Bundle', buddies.collect{ -// it -// }.join(',') } } diff --git a/version-history.json b/version-history.json index 566767d..1cd54dd 100644 --- a/version-history.json +++ b/version-history.json @@ -2226,7 +2226,7 @@ }, "org.apache.commons.commons-text": { "1.10.0": { - "i20230427": "ZgSN6w" + "i20230505": "ZgSN6w" }, "1.6.0": { "i20200622": "XwZGgA", @@ -2567,7 +2567,7 @@ }, "1.4.1": { "i20221102": "t6TWww", - "i20221111": "tHrnLg" + "i20230505": "NjuLg" } }, "org.codehaus.groovy.modules.http-builder": { @@ -4330,9 +4330,7 @@ "i20220909": "Yg7LsQ", "i20221013": "9WDrEw", "i20221102": "HL7mg", - "i20221111": "HT7mg", - "i20230427": "S9D8GA", - "i20230503": "S9L8GA" + "i20230505": "25P8Gg" } }, "eu.esdihumboldt.hale.platform.cs3d-map": { @@ -4466,7 +4464,7 @@ "i20200622": "PnCdmQ", "i20221013": "LkqdwA", "i20221102": "BXm1ig", - "i20230427": "RM21vw" + "i20230505": "NXC1vA" } }, "platform.shared.groovy-all": {