From 016d6337fdab033f3aab4442d19cc17428075879 Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 23 Aug 2023 12:05:58 -0400 Subject: [PATCH 1/3] Swap out xpp3 dependency --- org.hl7.fhir.convertors/pom.xml | 7 +------ org.hl7.fhir.dstu2/pom.xml | 7 +------ org.hl7.fhir.dstu2016may/pom.xml | 8 +------- org.hl7.fhir.dstu3/pom.xml | 8 ++------ org.hl7.fhir.r4/pom.xml | 7 +------ org.hl7.fhir.r4b/pom.xml | 7 +------ org.hl7.fhir.r5/pom.xml | 8 ++------ org.hl7.fhir.utilities/pom.xml | 8 ++------ org.hl7.fhir.validation.cli/pom.xml | 7 ++----- org.hl7.fhir.validation/pom.xml | 6 +----- pom.xml | 5 +++++ 11 files changed, 19 insertions(+), 59 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 4256a48c5..9e979dc47 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -82,15 +82,10 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - org.apache.httpcomponents diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 89401a305..d8ecd7ea9 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -37,15 +37,10 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index b8b7b6e9e..624333a9d 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -37,14 +37,8 @@ - xpp3 + org.ogce xpp3 - true - - - xpp3 - xpp3_xpath - true diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 70fdca3af..b0c294ad0 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -37,15 +37,11 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - + diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 140359a01..9ea76e504 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -44,15 +44,10 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 6ad4d6fb5..c31a4503b 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -43,15 +43,10 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index d7347eed0..b92f3224b 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -44,15 +44,11 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - + diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index f0d8d3f15..7faa28821 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -84,15 +84,11 @@ true - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - + com.ibm.icu diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index c9372b39d..53c3db076 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -288,13 +288,10 @@ ucum - xpp3 + org.ogce xpp3 - - xpp3 - xpp3_xpath - + com.squareup.okhttp3 okhttp diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index cca41c5e8..6f4eabbb2 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -82,13 +82,9 @@ Saxon-HE - xpp3 + org.ogce xpp3 - - xpp3 - xpp3_xpath - diff --git a/pom.xml b/pom.xml index b5bf04abd..e6c49cd5b 100644 --- a/pom.xml +++ b/pom.xml @@ -278,6 +278,11 @@ thymeleaf 3.1.2.RELEASE + + org.ogce + xpp3 + 1.1.6 + From 490e57fa7cabd114c8b3401c388f3e8c957322dc Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 23 Aug 2023 12:05:58 -0400 Subject: [PATCH 2/3] Swap out xpp3 dependency --- org.hl7.fhir.convertors/pom.xml | 7 +------ org.hl7.fhir.dstu2/pom.xml | 7 +------ org.hl7.fhir.dstu2016may/pom.xml | 8 +------- org.hl7.fhir.dstu3/pom.xml | 8 ++------ org.hl7.fhir.r4/pom.xml | 7 +------ org.hl7.fhir.r4b/pom.xml | 7 +------ org.hl7.fhir.r5/pom.xml | 8 ++------ org.hl7.fhir.utilities/pom.xml | 8 ++------ org.hl7.fhir.validation.cli/pom.xml | 7 ++----- org.hl7.fhir.validation/pom.xml | 6 +----- pom.xml | 5 +++++ 11 files changed, 19 insertions(+), 59 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 4256a48c5..9e979dc47 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -82,15 +82,10 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - org.apache.httpcomponents diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 89401a305..d8ecd7ea9 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -37,15 +37,10 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index b8b7b6e9e..624333a9d 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -37,14 +37,8 @@ - xpp3 + org.ogce xpp3 - true - - - xpp3 - xpp3_xpath - true diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 70fdca3af..b0c294ad0 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -37,15 +37,11 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - + diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 140359a01..9ea76e504 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -44,15 +44,10 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 6ad4d6fb5..c31a4503b 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -43,15 +43,10 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index d7347eed0..b92f3224b 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -44,15 +44,11 @@ - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - + diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index f0d8d3f15..7faa28821 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -84,15 +84,11 @@ true - xpp3 + org.ogce xpp3 true - - xpp3 - xpp3_xpath - true - + com.ibm.icu diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index c9372b39d..53c3db076 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -288,13 +288,10 @@ ucum - xpp3 + org.ogce xpp3 - - xpp3 - xpp3_xpath - + com.squareup.okhttp3 okhttp diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index cca41c5e8..6f4eabbb2 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -82,13 +82,9 @@ Saxon-HE - xpp3 + org.ogce xpp3 - - xpp3 - xpp3_xpath - diff --git a/pom.xml b/pom.xml index b5bf04abd..e6c49cd5b 100644 --- a/pom.xml +++ b/pom.xml @@ -278,6 +278,11 @@ thymeleaf 3.1.2.RELEASE + + org.ogce + xpp3 + 1.1.6 + From 148fa492139e77e9d2910c7108d9d6c1ebbaf0ef Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 23 Aug 2023 16:27:04 -0400 Subject: [PATCH 3/3] Approve license --- .github/workflows/license-check/license-special-cases.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/license-check/license-special-cases.txt b/.github/workflows/license-check/license-special-cases.txt index 808275ef0..becde7051 100644 --- a/.github/workflows/license-check/license-special-cases.txt +++ b/.github/workflows/license-check/license-special-cases.txt @@ -16,4 +16,6 @@ # Actually a BSD license https://mvnrepository.com/artifact/org.antlr/ST4/4.1 (Unknown license) StringTemplate 4 (org.antlr:ST4:4.1 - http://nexus.sonatype.org/oss-repository-hosting.html/ST4) # without dependencies is incorrectly intepreted as a license name -(Apache License, Version 2.0) Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.12.14 - https://bytebuddy.net/byte-buddy) \ No newline at end of file +(Apache License, Version 2.0) Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.12.14 - https://bytebuddy.net/byte-buddy) +# Appears to be Apache 2.0: https://github.com/NCIP/lexevs/blob/master/lgSharedLibraries/apache/commons/jakarta-regexp-1.4.license.txt +(Unknown license) jakarta-regexp (jakarta-regexp:jakarta-regexp:1.4 - no url defined) \ No newline at end of file