Browse Source

Merge pull request #1 in ~ZHOUPING/base-third from release/10.0 to feature/10.0

* commit '55827b4375a15d972f25dced1e216ac6f53c93d5':
  REPORT-27578 【10.0回归】模版导出svg 0kb
  DEC-12348 外置数据库导入数据失败
  REPORT-27588 jackson-databind安全漏洞
  fix
  DEC-12256 【冒烟】全新工程启动报错
research/11.0
zhouping 5 years ago
parent
commit
412afe4a8a
  1. 3
      build.third_step2-jdk11.gradle
  2. 1
      build.third_step2.gradle
  3. 2
      fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java
  4. 1
      fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver
  5. 4
      fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
  6. 6
      fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
  7. 8
      fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
  8. 5
      fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter

3
build.third_step2-jdk11.gradle

@ -85,7 +85,8 @@ def resourceDirs = [
"${srcDir}/fine-redisson/src",
"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/java",
"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/resources",
"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java"
"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java",
"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/resources"
]
sourceSets.main.java.outputDir = file('build/classes/2')

1
build.third_step2.gradle

@ -123,6 +123,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/java")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/resources")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/resources")
into "${classesDir}"
}
}

2
fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java

@ -1361,7 +1361,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
return true;
} catch (Exception ex) {
// skip
LOG.debug(ex.getMessage(), ex);
return false;
} finally {
if (sqlFile != null) {

1
fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver

@ -0,0 +1 @@
org.apache.xmlgraphics.util.uri.DataURIResolver

4
fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter

@ -0,0 +1,4 @@
org.apache.xmlgraphics.image.loader.impl.ImageConverterBuffered2Rendered
org.apache.xmlgraphics.image.loader.impl.ImageConverterG2D2Bitmap
org.apache.xmlgraphics.image.loader.impl.ImageConverterBitmap2G2D
org.apache.xmlgraphics.image.loader.impl.ImageConverterRendered2PNG

6
fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory

@ -0,0 +1,6 @@
org.apache.xmlgraphics.image.loader.impl.imageio.ImageLoaderFactoryImageIO
org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryRaw
org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryRawCCITTFax
org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryEPS
org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryInternalTIFF
org.apache.xmlgraphics.image.loader.impl.ImageLoaderFactoryPNG

8
fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader

@ -0,0 +1,8 @@
org.apache.xmlgraphics.image.loader.impl.PreloaderTIFF
org.apache.xmlgraphics.image.loader.impl.PreloaderGIF
org.apache.xmlgraphics.image.loader.impl.PreloaderJPEG
org.apache.xmlgraphics.image.loader.impl.PreloaderBMP
org.apache.xmlgraphics.image.loader.impl.PreloaderEMF
org.apache.xmlgraphics.image.loader.impl.PreloaderEPS
org.apache.xmlgraphics.image.loader.impl.imageio.PreloaderImageIO
org.apache.xmlgraphics.image.loader.impl.PreloaderRawPNG

5
fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter

@ -0,0 +1,5 @@
org.apache.xmlgraphics.image.writer.internal.PNGImageWriter
org.apache.xmlgraphics.image.writer.internal.TIFFImageWriter
org.apache.xmlgraphics.image.writer.imageio.ImageIOPNGImageWriter
org.apache.xmlgraphics.image.writer.imageio.ImageIOTIFFImageWriter
org.apache.xmlgraphics.image.writer.imageio.ImageIOJPEGImageWriter
Loading…
Cancel
Save