Browse Source

支持 java 17

main
wangshaoping 5 months ago
parent
commit
76f56213ad
  1. 17
      build.gradle
  2. 1
      io.sc.engine.rule.core/build.gradle
  3. 6
      io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/MathFormula.java
  4. 8
      io.sc.platform.core/build.gradle
  5. 1
      io.sc.platform.ws.cxf/build.gradle

17
build.gradle

@ -55,11 +55,14 @@ subprojects {
// exclude group: "org.slf4j", module: "slf4j-jdk14" // exclude group: "org.slf4j", module: "slf4j-jdk14"
exclude group: "org.slf4j", module: "slf4j-nop" exclude group: "org.slf4j", module: "slf4j-nop"
resolutionStrategy.eachDependency { DependencyResolveDetails detail -> if(PlatformDependencyVersions!=null && PlatformDependencyVersions.size()>0) {
def requested =detail.requested; resolutionStrategy.eachDependency { DependencyResolveDetails detail ->
def groupAndName =requested.group + ":" + requested.name; def requested = detail.requested;
if(PlatformDependencyVersions[groupAndName]!=null){ def groupAndName = requested.group + ":" + requested.name;
detail.useVersion(PlatformDependencyVersions[groupAndName]); String version = PlatformDependencyVersions[groupAndName];
if (version != null) {
detail.useVersion(version);
}
} }
} }
} }
@ -86,7 +89,7 @@ subprojects {
if(repo instanceof MavenArtifactRepository){ if(repo instanceof MavenArtifactRepository){
def url = repo.url.toString() def url = repo.url.toString()
if ( if (
url.startsWith('https://repo1.maven.org/maven2') url.startsWith('https://repo1.maven.org/maven2')
|| url.startsWith('https://jcenter.bintray.com/') || url.startsWith('https://jcenter.bintray.com/')
|| url.startsWith('https://maven.aliyun.com') || url.startsWith('https://maven.aliyun.com')
) { ) {
@ -117,7 +120,7 @@ subprojects {
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
group ="${platform_group}" group ="${platform_group}"
version ="${platform_version}" version ="${platform_version}"
if(file('package.json').exists()){ if(file('package.json').exists()){
mkdir 'java-src/main/java'; mkdir 'java-src/main/java';
mkdir 'java-src/main/resources'; mkdir 'java-src/main/resources';

1
io.sc.engine.rule.core/build.gradle

@ -1,6 +1,7 @@
dependencies { dependencies {
api( api(
"org.springframework:spring-core", "org.springframework:spring-core",
"jakarta.xml.bind:jakarta.xml.bind-api",
"com.fasterxml.jackson.core:jackson-annotations", "com.fasterxml.jackson.core:jackson-annotations",
"com.fasterxml.jackson.core:jackson-core", "com.fasterxml.jackson.core:jackson-core",
"com.fasterxml.jackson.core:jackson-databind", "com.fasterxml.jackson.core:jackson-databind",

6
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; package io.sc.engine.rule.core.code.impl.support.processor;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 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.Indicator;
import io.sc.engine.rule.core.po.lib.processor.MathFormulaIndicatorProcessor; 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.Parameter;
import io.sc.engine.rule.core.po.model.processor.MathFormulaParameterProcessor; 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 io.sc.engine.rule.core.util.ExpressionReplacer;
import org.springframework.util.StringUtils; 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.XMLEventReader;
import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.events.Characters; import javax.xml.stream.events.Characters;
import javax.xml.stream.events.StartElement; import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent; import javax.xml.stream.events.XMLEvent;

8
io.sc.platform.core/build.gradle

@ -11,6 +11,7 @@ dependencies {
"com.fasterxml.jackson.dataformat:jackson-dataformat-xml", "com.fasterxml.jackson.dataformat:jackson-dataformat-xml",
"jakarta.servlet:jakarta.servlet-api", "jakarta.servlet:jakarta.servlet-api",
"jakarta.xml.bind:jakarta.xml.bind-api",
"org.apache.commons:commons-lang3", "org.apache.commons:commons-lang3",
"org.apache.commons:commons-text:${commons_text_version}", "org.apache.commons:commons-text:${commons_text_version}",
@ -20,11 +21,4 @@ dependencies {
"com.github.seancfoley:ipaddress:${ipaddress_version}", "com.github.seancfoley:ipaddress:${ipaddress_version}",
"com.belerweb:pinyin4j:${pinyin4j_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",
)
} }

1
io.sc.platform.ws.cxf/build.gradle

@ -1,6 +1,7 @@
dependencies { dependencies {
api( api(
"org.apache.cxf:cxf-spring-boot-starter-jaxws:${cxf_version}", "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.core"),
project(":io.sc.platform.mvc"), project(":io.sc.platform.mvc"),

Loading…
Cancel
Save