From 17fe45e9f24ac315b61ef2e5e15aedd938a39aec Mon Sep 17 00:00:00 2001 From: Zed Date: Mon, 2 Mar 2020 11:10:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?DEC-12256=20=E3=80=90=E5=86=92=E7=83=9F?= =?UTF-8?q?=E3=80=91=E5=85=A8=E6=96=B0=E5=B7=A5=E7=A8=8B=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/third/alibaba/druid/pool/DruidDataSource.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java b/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java index ef1481c9d..301f2391f 100644 --- a/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java +++ b/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java @@ -953,21 +953,21 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat return; } - String errorMessage = ""; + String infoMessage = ""; if (isTestOnBorrow()) { - errorMessage += "testOnBorrow is true, "; + infoMessage += "testOnBorrow is true, "; } if (isTestOnReturn()) { - errorMessage += "testOnReturn is true, "; + infoMessage += "testOnReturn is true, "; } if (isTestWhileIdle()) { - errorMessage += "testWhileIdle is true, "; + infoMessage += "testWhileIdle is true, "; } - LOG.error(errorMessage + "validationQuery not set"); + LOG.error(infoMessage + "validationQuery not set"); } protected void initCheck() throws SQLException { From 1b0f322d29a4d9e6071d13759ff0526b0e3734c2 Mon Sep 17 00:00:00 2001 From: Zed Date: Mon, 2 Mar 2020 11:12:32 +0800 Subject: [PATCH 2/5] fix --- .../src/com/fr/third/alibaba/druid/pool/DruidDataSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java b/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java index 301f2391f..26793c544 100644 --- a/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java +++ b/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidDataSource.java @@ -967,7 +967,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat infoMessage += "testWhileIdle is true, "; } - LOG.error(infoMessage + "validationQuery not set"); + LOG.info(infoMessage + "validationQuery not set"); } protected void initCheck() throws SQLException { From b7a8919a6c5705d15d82d56ed4ced0112eff163c Mon Sep 17 00:00:00 2001 From: Zed Date: Wed, 4 Mar 2020 14:43:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-27588=20jackson-databind=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsontype/impl/SubTypeValidator.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/fine-jackson/src/com/fr/third/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java b/fine-jackson/src/com/fr/third/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java index 970c29171..e2e52655b 100644 --- a/fine-jackson/src/com/fr/third/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java +++ b/fine-jackson/src/com/fr/third/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java @@ -88,6 +88,55 @@ public class SubTypeValidator // [databind#2341]: jdom/jdom2 (2.9.9.1) s.add("org.jdom.transform.XSLTransformer"); s.add("org.jdom2.transform.XSLTransformer"); + + // [databind#2387], [databind#2460]: EHCache + s.add("net.sf.ehcache.transaction.manager.DefaultTransactionManagerLookup"); + s.add("net.sf.ehcache.hibernate.EhcacheJtaTransactionManagerLookup"); + + // [databind#2389]: logback/jndi + s.add("ch.qos.logback.core.db.JNDIConnectionSource"); + + // [databind#2410]: HikariCP/metricRegistry config + s.add("com.zaxxer.hikari.HikariConfig"); + // [databind#2449]: and sub-class thereof + s.add("com.zaxxer.hikari.HikariDataSource"); + + // [databind#2420]: CXF/JAX-RS provider/XSLT + s.add("org.apache.cxf.jaxrs.provider.XSLTJaxbProvider"); + + // [databind#2462]: commons-configuration / -2 + s.add("org.apache.commons.configuration.JNDIConfiguration"); + s.add("org.apache.commons.configuration2.JNDIConfiguration"); + + // [databind#2469]: xalan2 + s.add("org.apache.xalan.lib.sql.JNDIConnectionPool"); + + // [databind#2478]: comons-dbcp, p6spy + s.add("org.apache.commons.dbcp.datasources.PerUserPoolDataSource"); + s.add("org.apache.commons.dbcp.datasources.SharedPoolDataSource"); + s.add("com.p6spy.engine.spy.P6DataSource"); + + // [databind#2498]: log4j-extras (1.2) + s.add("org.apache.log4j.receivers.db.DriverManagerConnectionSource"); + s.add("org.apache.log4j.receivers.db.JNDIConnectionSource"); + + // [databind#2526]: some more ehcache + s.add("net.sf.ehcache.transaction.manager.selector.GenericJndiSelector"); + s.add("net.sf.ehcache.transaction.manager.selector.GlassfishSelector"); + + // [databind#2620]: xbean-reflect + s.add("org.apache.xbean.propertyeditor.JndiConverter"); + + // [databind#2631]: shaded hikari-config + s.add("org.apache.hadoop.shaded.com.zaxxer.hikari.HikariConfig"); + + // [databind#2634]: ibatis-sqlmap, anteros-core + s.add("com.ibatis.sqlmap.engine.transaction.jta.JtaTransactionConfig"); + s.add("br.com.anteros.dbcp.AnterosDBCPConfig"); + + // [databind#2642]: javax.swing (jdk) + s.add("javax.swing.JEditorPane"); + DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s); } From 4e831051b9b005a3bc94069b22f678d371ba6843 Mon Sep 17 00:00:00 2001 From: Zed Date: Mon, 9 Mar 2020 15:50:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?DEC-12348=20=E5=A4=96=E7=BD=AE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/third/org/hibernate/dialect/DB2Dialect.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/dialect/DB2Dialect.java b/fine-hibernate/src/com/fr/third/org/hibernate/dialect/DB2Dialect.java index 5f5fc4476..7c3433709 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/dialect/DB2Dialect.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/dialect/DB2Dialect.java @@ -93,6 +93,8 @@ public class DB2Dialect extends Dialect { registerColumnType( Types.INTEGER, "integer" ); registerColumnType( Types.CHAR, "char(1)" ); registerColumnType( Types.VARCHAR, "varchar($l)" ); + // DEC-12348 db2数据库9.7版本不会自动将nvarchar转varchar，需要在方言内处理 + registerColumnType( Types.NVARCHAR, "varchar($l)" ); registerColumnType( Types.FLOAT, "float" ); registerColumnType( Types.DOUBLE, "double" ); registerColumnType( Types.DATE, "date" ); From f068030caf86c87e4b6a4c359c9a347920562ab0 Mon Sep 17 00:00:00 2001 From: zhouping Date: Tue, 10 Mar 2020 18:14:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-27578=20=E3=80=9010.0=E5=9B=9E?= =?UTF-8?q?=E5=BD=92=E3=80=91=E6=A8=A1=E7=89=88=E5=AF=BC=E5=87=BAsvg=200kb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step2-jdk11.gradle | 3 ++- build.third_step2.gradle | 1 + .../third/alibaba/druid/pool/DruidAbstractDataSource.java | 2 +- .../META-INF/services/javax.xml.transform.URIResolver | 1 + ...org.apache.xmlgraphics.image.loader.spi.ImageConverter | 4 ++++ ...apache.xmlgraphics.image.loader.spi.ImageLoaderFactory | 6 ++++++ ...org.apache.xmlgraphics.image.loader.spi.ImagePreloader | 8 ++++++++ .../org.apache.xmlgraphics.image.writer.ImageWriter | 5 +++++ 8 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader create mode 100644 fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter diff --git a/build.third_step2-jdk11.gradle b/build.third_step2-jdk11.gradle index b7e7c1092..d0eadb737 100644 --- a/build.third_step2-jdk11.gradle +++ b/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') diff --git a/build.third_step2.gradle b/build.third_step2.gradle index 2bd6311c5..bb1206816 100644 --- a/build.third_step2.gradle +++ b/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}" } } diff --git a/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java b/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java index b905427db..d1e669618 100644 --- a/fine-druid/src/com/fr/third/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/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) { diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver new file mode 100644 index 000000000..9202f619a --- /dev/null +++ b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/javax.xml.transform.URIResolver @@ -0,0 +1 @@ +org.apache.xmlgraphics.util.uri.DataURIResolver diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter new file mode 100644 index 000000000..24b0d8b04 --- /dev/null +++ b/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 diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory new file mode 100644 index 000000000..e1efed257 --- /dev/null +++ b/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 diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader new file mode 100644 index 000000000..e2c8c004b --- /dev/null +++ b/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 \ No newline at end of file diff --git a/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter b/fine-xmlgraphics/xmlgraphics-commons/src/main/resources/META-INF/services/org.apache.xmlgraphics.image.writer.ImageWriter new file mode 100644 index 000000000..9f67d4a6c --- /dev/null +++ b/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