Browse Source

Pull request #456: 无JIRA任务 删除资源模块

Merge in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0

* commit '4defe4be1fcf738bf8567e1d559f24f5212cac6c':
  无JIRA任务 删除资源模块
release/10.0
Lanlan 5 years ago
parent
commit
f9ac2fad00
  1. 1
      base-third-project/base-third-step1/pom.xml
  2. 2
      build.third_step1-jdk11.gradle
  3. 2
      build.third_step1.gradle
  4. 6
      fine-resources/.gitignore
  5. 16
      fine-resources/pom.xml
  6. BIN
      fine-resources/src/main/resources/update.zip

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

@ -49,7 +49,6 @@
<module>../../fine-lz4</module> <module>../../fine-lz4</module>
<module>../../fine-objenesis</module> <module>../../fine-objenesis</module>
<module>../../fine-org-dom4j</module> <module>../../fine-org-dom4j</module>
<module>../../fine-resources</module>
<module>../../fine-roaringbitmap</module> <module>../../fine-roaringbitmap</module>
<module>../../fine-sense4</module> <module>../../fine-sense4</module>
<module>../../fine-deprecated-utils</module> <module>../../fine-deprecated-utils</module>

2
build.third_step1-jdk11.gradle

@ -161,8 +161,6 @@ def resourceDirs = [
"${srcDir}/fine-objenesis/src/main/resources", "${srcDir}/fine-objenesis/src/main/resources",
"${srcDir}/fine-org-dom4j/src/main/java", "${srcDir}/fine-org-dom4j/src/main/java",
"${srcDir}/fine-org-dom4j/src/main/resources", "${srcDir}/fine-org-dom4j/src/main/resources",
"${srcDir}/fine-resources/src/main/java",
"${srcDir}/fine-resources/src/main/resources",
"${srcDir}/fine-roaringbitmap/src/main/java", "${srcDir}/fine-roaringbitmap/src/main/java",
"${srcDir}/fine-roaringbitmap/src/main/resources", "${srcDir}/fine-roaringbitmap/src/main/resources",
"${srcDir}/fine-sense4/src/main/java", "${srcDir}/fine-sense4/src/main/java",

2
build.third_step1.gradle

@ -208,8 +208,6 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-objenesis/src/main/resources") with dataContent.call("${srcDir}/fine-objenesis/src/main/resources")
with dataContent.call("${srcDir}/fine-org-dom4j/src/main/java") with dataContent.call("${srcDir}/fine-org-dom4j/src/main/java")
with dataContent.call("${srcDir}/fine-org-dom4j/src/main/resources") with dataContent.call("${srcDir}/fine-org-dom4j/src/main/resources")
with dataContent.call("${srcDir}/fine-resources/src/main/java")
with dataContent.call("${srcDir}/fine-resources/src/main/resources")
with dataContent.call("${srcDir}/fine-roaringbitmap/src/main/java") with dataContent.call("${srcDir}/fine-roaringbitmap/src/main/java")
with dataContent.call("${srcDir}/fine-roaringbitmap/src/main/resources") with dataContent.call("${srcDir}/fine-roaringbitmap/src/main/resources")
with dataContent.call("${srcDir}/fine-sense4/src/main/java") with dataContent.call("${srcDir}/fine-sense4/src/main/java")

6
fine-resources/.gitignore vendored

@ -1,6 +0,0 @@
*.iml
.idea/
.DS_Store
.project
.classpath
*.gradle

16
fine-resources/pom.xml

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.third</groupId>
<artifactId>step1</artifactId>
<version>${revision}</version>
<relativePath>../base-third-project/base-third-step1</relativePath>
</parent>
<artifactId>fine-resources</artifactId>
<version>${revision}</version>
</project>

BIN
fine-resources/src/main/resources/update.zip

Binary file not shown.
Loading…
Cancel
Save