opensource
/
fine-third
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #7373 in CORE/base-third from final/11.0 to release/11.0 

* commit '28d901d94c4d5d5af366f2c00007d4828b9e559f':
  REPORT-84661 暂时保留v8插件的使用
release/11.0
superman 2 years ago
parent
ec09661eba 28d901d94c
commit
b60dc6250e
3 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      base-third-project/base-third-step1/pom.xml
  2. 6
      build.third_step1-jdk11.gradle
  3. 6
      build.third_step1.gradle

2
base-third-project/base-third-step1/pom.xml
Unescape View File

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

6
build.third_step1-jdk11.gradle
Unescape View File

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

6
build.third_step1.gradle
Unescape View File

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

Write Preview
Loading…
Cancel
Save