Browse Source

Pull request #7455: REPORT-85397 更新j2v8本地库,v8版本10.9.0,依赖glibc2.17

Merge in CORE/base-third from ~VITO/base-third:release/11.0 to release/11.0

* commit '1f9faeeadd06c74556d0e3d089904d6c43d19330':
  REPORT-85397 fine-j2v8加入thrid
  REPORT-85397 先更新本地库
release/11.0
vito-刘恒霖 2 years ago
parent
commit
52f3c1e089
  1. 2
      base-third-project/base-third-step1/pom.xml
  2. 6
      build.third_step1-jdk11.gradle
  3. 6
      build.third_step1.gradle
  4. BIN
      fine-j2v8/src/main/resources/libj2v8-linux-x86_64.so

2
base-third-project/base-third-step1/pom.xml

@ -26,7 +26,7 @@
<module>../../fine-iconloader</module>
<module>../../fine-icu4j</module>
<module>../../fine-imageJ</module>
<!-- <module>../../fine-j2v8</module> -->
<module>../../fine-j2v8</module>
<!-- <module>../../fine-jai</module>-->
<module>../../fine-jboss-transaction-api</module>
<module>../../fine-jgit</module>

6
build.third_step1-jdk11.gradle

@ -43,7 +43,7 @@ sourceSets{
"${srcDir}/fine-hsqldb/src/main/java",
"${srcDir}/fine-iconloader/src/main/java",
"${srcDir}/fine-icu4j/src/main/java",
// "${srcDir}/fine-j2v8/src/main/java",
"${srcDir}/fine-j2v8/src/main/java",
// "${srcDir}/fine-jai/src/main/java",
"${srcDir}/fine-jboss-transaction-api/src/main/java",
"${srcDir}/fine-jgit/src/main/java",
@ -95,8 +95,8 @@ def resourceDirs = [
"${srcDir}/fine-iconloader/src/main/resources",
"${srcDir}/fine-icu4j/src/main/java",
"${srcDir}/fine-icu4j/src/main/resources",
// "${srcDir}/fine-j2v8/src/main/java",
// "${srcDir}/fine-j2v8/src/main/resources",
"${srcDir}/fine-j2v8/src/main/java",
"${srcDir}/fine-j2v8/src/main/resources",
// "${srcDir}/fine-jai/src/main/java",
"${srcDir}/fine-jboss-transaction-api/src/main/java",
"${srcDir}/fine-jboss-transaction-api/src/main/resources",

6
build.third_step1.gradle

@ -44,7 +44,7 @@ sourceSets{
"${srcDir}/fine-hsqldb/src/main/java",
"${srcDir}/fine-iconloader/src/main/java",
"${srcDir}/fine-icu4j/src/main/java",
// "${srcDir}/fine-j2v8/src/main/java",
"${srcDir}/fine-j2v8/src/main/java",
// "${srcDir}/fine-jai/src/main/java",
"${srcDir}/fine-jboss-transaction-api/src/main/java",
"${srcDir}/fine-jgit/src/main/java",
@ -143,8 +143,8 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-hsqldb/src/main/resources")
with dataContent.call("${srcDir}/fine-icu4j/src/main/java")
with dataContent.call("${srcDir}/fine-icu4j/src/main/resources")
// with dataContent.call("${srcDir}/fine-j2v8/src/main/java")
// with dataContent.call("${srcDir}/fine-j2v8/src/main/resources")
with dataContent.call("${srcDir}/fine-j2v8/src/main/java")
with dataContent.call("${srcDir}/fine-j2v8/src/main/resources")
// with dataContent.call("${srcDir}/fine-jai/src/main/java")
with dataContent.call("${srcDir}/fine-jboss-transaction-api/src/main/java")
with dataContent.call("${srcDir}/fine-jboss-transaction-api/src/main/resources")

BIN
fine-j2v8/src/main/resources/libj2v8-linux-x86_64.so

Binary file not shown.
Loading…
Cancel
Save