Merge pull request #392 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0

* commit '412afe4a8a9fcc501f7786265b60d5a42c64ea09':
  REPORT-27578 【10.0回归】模版导出svg 0kb
  DEC-12348 外置数据库导入数据失败
  REPORT-27588 jackson-databind安全漏洞
  fix
  DEC-12256 【冒烟】全新工程启动报错

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')

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}"
 	}
 }

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) {

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

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

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

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

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

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