diff --git a/build.gradle b/build.gradle index 8e3609f8..db48ceb6 100644 --- a/build.gradle +++ b/build.gradle @@ -55,11 +55,14 @@ subprojects { // exclude group: "org.slf4j", module: "slf4j-jdk14" exclude group: "org.slf4j", module: "slf4j-nop" - resolutionStrategy.eachDependency { DependencyResolveDetails detail -> - def requested =detail.requested; - def groupAndName =requested.group + ":" + requested.name; - if(PlatformDependencyVersions[groupAndName]!=null){ - detail.useVersion(PlatformDependencyVersions[groupAndName]); + if(PlatformDependencyVersions!=null && PlatformDependencyVersions.size()>0) { + resolutionStrategy.eachDependency { DependencyResolveDetails detail -> + def requested = detail.requested; + def groupAndName = requested.group + ":" + requested.name; + String version = PlatformDependencyVersions[groupAndName]; + if (version != null) { + detail.useVersion(version); + } } } } @@ -86,7 +89,7 @@ subprojects { if(repo instanceof MavenArtifactRepository){ def url = repo.url.toString() if ( - url.startsWith('https://repo1.maven.org/maven2') + url.startsWith('https://repo1.maven.org/maven2') || url.startsWith('https://jcenter.bintray.com/') || url.startsWith('https://maven.aliyun.com') ) { @@ -117,7 +120,7 @@ subprojects { *----------------------------------------------------------------*/ group ="${platform_group}" version ="${platform_version}" - + if(file('package.json').exists()){ mkdir 'java-src/main/java'; mkdir 'java-src/main/resources'; diff --git a/io.sc.engine.rule.core/build.gradle b/io.sc.engine.rule.core/build.gradle index 28625cdb..2cf337e8 100644 --- a/io.sc.engine.rule.core/build.gradle +++ b/io.sc.engine.rule.core/build.gradle @@ -1,6 +1,7 @@ dependencies { api( "org.springframework:spring-core", + "jakarta.xml.bind:jakarta.xml.bind-api", "com.fasterxml.jackson.core:jackson-annotations", "com.fasterxml.jackson.core:jackson-core", "com.fasterxml.jackson.core:jackson-databind", diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/MathFormula.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/MathFormula.java index 47ff1d0c..ccbeebee 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/MathFormula.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/MathFormula.java @@ -1,21 +1,15 @@ package io.sc.engine.rule.core.code.impl.support.processor; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import io.sc.engine.rule.core.math.MathType; import io.sc.engine.rule.core.po.lib.Indicator; import io.sc.engine.rule.core.po.lib.processor.MathFormulaIndicatorProcessor; import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.po.model.processor.MathFormulaParameterProcessor; -import io.sc.engine.rule.core.util.CodeReplacer; import io.sc.engine.rule.core.util.ExpressionReplacer; import org.springframework.util.StringUtils; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.Unmarshaller; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; import javax.xml.stream.events.Characters; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; diff --git a/io.sc.platform.core/build.gradle b/io.sc.platform.core/build.gradle index 640a255f..5736ecf1 100644 --- a/io.sc.platform.core/build.gradle +++ b/io.sc.platform.core/build.gradle @@ -11,6 +11,7 @@ dependencies { "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", "jakarta.servlet:jakarta.servlet-api", + "jakarta.xml.bind:jakarta.xml.bind-api", "org.apache.commons:commons-lang3", "org.apache.commons:commons-text:${commons_text_version}", @@ -20,11 +21,4 @@ dependencies { "com.github.seancfoley:ipaddress:${ipaddress_version}", "com.belerweb:pinyin4j:${pinyin4j_version}", ) - - implementation( - "javax.xml.bind:jaxb-api:2.2.11", - "com.sun.xml.bind:jaxb-core:2.2.11", - "com.sun.xml.bind:jaxb-impl:2.2.11", - "javax.activation:activation:1.1.1", - ) } diff --git a/io.sc.platform.ws.cxf/build.gradle b/io.sc.platform.ws.cxf/build.gradle index ea724780..f0f2429b 100644 --- a/io.sc.platform.ws.cxf/build.gradle +++ b/io.sc.platform.ws.cxf/build.gradle @@ -1,6 +1,7 @@ dependencies { api( "org.apache.cxf:cxf-spring-boot-starter-jaxws:${cxf_version}", + "jakarta.xml.ws:jakarta.xml.ws-api", project(":io.sc.platform.core"), project(":io.sc.platform.mvc"),