Skip to content

Commit

Permalink
build: add xerces.xercesImpl to castor-xml
Browse files Browse the repository at this point in the history
ING-3837
  • Loading branch information
kapil-agnihotri authored and stempler committed May 5, 2023
1 parent 74ccc4c commit df4ed08
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ build/
*~
.project
*.sublime-workspace
.idea/*
.idea*
10 changes: 2 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(',')
}
}

Expand Down
10 changes: 4 additions & 6 deletions version-history.json
Original file line number Diff line number Diff line change
Expand Up @@ -2226,7 +2226,7 @@
},
"org.apache.commons.commons-text": {
"1.10.0": {
"i20230427": "ZgSN6w"
"i20230505": "ZgSN6w"
},
"1.6.0": {
"i20200622": "XwZGgA",
Expand Down Expand Up @@ -2567,7 +2567,7 @@
},
"1.4.1": {
"i20221102": "t6TWww",
"i20221111": "tHrnLg"
"i20230505": "NjuLg"
}
},
"org.codehaus.groovy.modules.http-builder": {
Expand Down Expand Up @@ -4330,9 +4330,7 @@
"i20220909": "Yg7LsQ",
"i20221013": "9WDrEw",
"i20221102": "HL7mg",
"i20221111": "HT7mg",
"i20230427": "S9D8GA",
"i20230503": "S9L8GA"
"i20230505": "25P8Gg"
}
},
"eu.esdihumboldt.hale.platform.cs3d-map": {
Expand Down Expand Up @@ -4466,7 +4464,7 @@
"i20200622": "PnCdmQ",
"i20221013": "LkqdwA",
"i20221102": "BXm1ig",
"i20230427": "RM21vw"
"i20230505": "NXC1vA"
}
},
"platform.shared.groovy-all": {
Expand Down

0 comments on commit df4ed08

Please sign in to comment.