Clean up of deps and properties files

cqframework · Nov 1, 2023 · da066f5 · da066f5
1 parent 9ca20f8
commit da066f5
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 18 deletions.
diff --git a/Src/java/build.gradle b/Src/java/build.gradle
@@ -1,11 +1,6 @@
 plugins {
     id 'idea'
     id 'eclipse'
-    id 'maven-publish'
-}
-
-repositories {
-  mavenLocal()
 }
 
 idea {

diff --git a/Src/java/buildSrc/src/main/groovy/cql.java-conventions.gradle b/Src/java/buildSrc/src/main/groovy/cql.java-conventions.gradle
@@ -33,7 +33,8 @@ dependencies {
 
     // These are JAXB dependencies excluded because the libraries need to work
     // on Android. But for test purposes we use them pretty much everywhere.
-    testRuntimeOnly 'org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.7'
+    testRuntimeOnly 'org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.2'
+    testRuntimeOnly 'org.eclipse.parsson:parsson:1.1.5'
     testRuntimeOnly 'xpp3:xpp3:1.1.4c'
 }
 

diff --git a/Src/java/buildSrc/src/main/groovy/cql.xjc-conventions.gradle b/Src/java/buildSrc/src/main/groovy/cql.xjc-conventions.gradle
@@ -16,7 +16,7 @@ dependencies {
     xjc 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     xjc 'org.glassfish.jaxb:jaxb-xjc:3.0.2'
     xjc 'org.glassfish.jaxb:jaxb-runtime:4.0.3'
-    xjc 'org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.7'
+    xjc 'org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.2'
     xjc 'org.slf4j:slf4j-simple:1.7.36'
 
     api 'codes.rafael.jaxb2_commons:jaxb2-basics-runtime:3.0.0'

diff --git a/Src/java/cql-to-elm-cli/build.gradle b/Src/java/cql-to-elm-cli/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     implementation project(':model-jaxb')
     implementation project(':elm-jaxb')
     implementation 'net.sf.jopt-simple:jopt-simple:4.7'
-    runtimeOnly 'org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.7'
+    runtimeOnly 'org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.1'
     runtimeOnly 'xpp3:xpp3_min:1.1.4c'
     runtimeOnly 'xmlpull:xmlpull:1.1.3.1'
 

diff --git a/Src/java/elm-jaxb/build.gradle b/Src/java/elm-jaxb/build.gradle
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     api project(':elm')
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+    api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+    api 'jakarta.json:jakarta.json-api:2.1.3'
     implementation 'org.apache.commons:commons-text:1.10.0'
 }
diff --git a/...java/elm-jaxb/src/main/resources/org/cqframework/cql/elm/serializing/jaxb/jaxb.properties b/...java/elm-jaxb/src/main/resources/org/cqframework/cql/elm/serializing/jaxb/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
diff --git a/Src/java/elm-test/build.gradle b/Src/java/elm-test/build.gradle
@@ -3,7 +3,6 @@ plugins {
 }
 
 dependencies {
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     implementation project(':cql-to-elm')
     implementation project(':model-jaxb')
     implementation project(':elm-jackson')

diff --git a/Src/java/elm/src/main/resources/org/hl7/cql_annotations/r1/jaxb.properties b/Src/java/elm/src/main/resources/org/hl7/cql_annotations/r1/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
diff --git a/Src/java/elm/src/main/resources/org/hl7/elm/r1/jaxb.properties b/Src/java/elm/src/main/resources/org/hl7/elm/r1/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
diff --git a/Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/tests/jaxb.properties b/Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/tests/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
diff --git a/Src/java/model-jaxb/build.gradle b/Src/java/model-jaxb/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+    api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+    api 'jakarta.json:jakarta.json-api:2.1.3'
     implementation project(':model')
 }
diff --git a/...el-jaxb/src/main/resources/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/jaxb.properties b/...el-jaxb/src/main/resources/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
diff --git a/Src/java/model/src/main/resources/org/hl7/elm_modelinfo/r1/jaxb.properties b/Src/java/model/src/main/resources/org/hl7/elm_modelinfo/r1/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
diff --git a/...xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/ModelImporter.java b/...xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/ModelImporter.java
@@ -4,7 +4,7 @@
 import org.hl7.cql.model.*;
 import org.hl7.elm_modelinfo.r1.*;
 
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
 import javax.xml.namespace.QName;
 import java.io.IOException;
 import java.io.InputStream;