Browse Source

Merge pull request #4500 in CORE/base-third from feature/x to release/11.0

* commit 'c5964c824c4f87410e4d21e637353c42e6283e56':
  KERNEL-9861 feat: 适配slf4j&&pom修复
  KERNEL-9861 feat: 适配slf4j&&pom修复
  KERNEL-9835	fix: Apache HttpClient 安全漏洞, 升级到4.5.13
  无jira任务 fix: pom报错修复
  无jira任务 fix: pom报错修复
  KERNEL-9685 fix: log4j 版本升级
  KERNEL-9861 fix: pom修复
  KERNEL-9862 fix: druid对接slf4j
  DEC-21348 fix: java security适配
  无jira任务 fix: druid log4j适配
  KERNEL-9685 refactor: log4j 版本升级
  KERNEL-9862 补上被误删的代码
  KERNEL-9862 druid log4j2的适配
  KERNEL-9836 update: alibaba druid 版本升级
  KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
bugfix/KERNEL-11409-jackson
superman 3 years ago
parent
commit
2b62487e3c
  1. 2
      base-third-project/base-third-step8/pom.xml
  2. 11
      fine-byte-buddy/src/main/java/com/fr/third/net/bytebuddy/dynamic/NexusAccessor.java
  3. BIN
      fine-druid/lib/HikariCP-2.6.1.jar
  4. BIN
      fine-druid/lib/HikariCP-java7-2.4.13.jar
  5. BIN
      fine-druid/lib/accessors-smart-1.2.jar
  6. BIN
      fine-druid/lib/aggdesigner-algorithm-6.0.jar
  7. BIN
      fine-druid/lib/aircompressor-0.10.jar
  8. BIN
      fine-druid/lib/ant-1.9.1.jar
  9. BIN
      fine-druid/lib/ant-launcher-1.9.1.jar
  10. BIN
      fine-druid/lib/antlr-2.7.7.jar
  11. BIN
      fine-druid/lib/antlr-runtime-3.1.3.jar
  12. BIN
      fine-druid/lib/antlr-runtime-3.5.2.jar
  13. BIN
      fine-druid/lib/aopalliance-repackaged-2.5.0-b32.jar
  14. BIN
      fine-druid/lib/apache-jsp-9.3.20.v20170531.jar
  15. BIN
      fine-druid/lib/apache-jstl-9.3.20.v20170531.jar
  16. BIN
      fine-druid/lib/apacheds-i18n-2.0.0-M15.jar
  17. BIN
      fine-druid/lib/apacheds-kerberos-codec-2.0.0-M15.jar
  18. BIN
      fine-druid/lib/api-asn1-api-1.0.0-M20.jar
  19. BIN
      fine-druid/lib/api-util-1.0.0-M20.jar
  20. BIN
      fine-druid/lib/apiguardian-api-1.1.0.jar
  21. BIN
      fine-druid/lib/arrow-format-0.8.0.jar
  22. BIN
      fine-druid/lib/arrow-memory-0.8.0.jar
  23. BIN
      fine-druid/lib/arrow-vector-0.8.0.jar
  24. BIN
      fine-druid/lib/asm-3.1.jar
  25. BIN
      fine-druid/lib/asm-5.0.4.jar
  26. BIN
      fine-druid/lib/asm-commons-5.0.1.jar
  27. BIN
      fine-druid/lib/asm-tree-5.0.1.jar
  28. BIN
      fine-druid/lib/aspectjrt-1.8.2.jar
  29. BIN
      fine-druid/lib/aspectjrt-1.8.9.jar
  30. BIN
      fine-druid/lib/audience-annotations-0.5.0.jar
  31. BIN
      fine-druid/lib/avatica-core-1.9.0.jar
  32. BIN
      fine-druid/lib/avatica-metrics-1.9.0.jar
  33. BIN
      fine-druid/lib/avro-1.7.7.jar
  34. BIN
      fine-druid/lib/bcprov-jdk15on-1.52.jar
  35. BIN
      fine-druid/lib/bonecp-spring-0.8.0.RELEASE.jar
  36. BIN
      fine-druid/lib/buildnumber-maven-plugin-1.1.jar
  37. BIN
      fine-druid/lib/c3p0-0.9.1.2.jar
  38. BIN
      fine-druid/lib/c3p0-0.9.2.1.jar
  39. BIN
      fine-druid/lib/c3p0-0.9.5.4.jar
  40. BIN
      fine-druid/lib/calcite-core-1.26.0.jar
  41. BIN
      fine-druid/lib/calcite-linq4j-1.26.0.jar
  42. BIN
      fine-druid/lib/checker-qual-3.5.0.jar
  43. BIN
      fine-druid/lib/classmate-1.3.0.jar
  44. BIN
      fine-druid/lib/classworlds-1.1.jar
  45. BIN
      fine-druid/lib/clickhouse-jdbc-0.2.4.jar
  46. BIN
      fine-druid/lib/commons-beanutils-1.7.0.jar
  47. BIN
      fine-druid/lib/commons-beanutils-core-1.8.0.jar
  48. BIN
      fine-druid/lib/commons-cli-1.0.jar
  49. BIN
      fine-druid/lib/commons-cli-1.2.jar
  50. BIN
      fine-druid/lib/commons-codec-1.12.jar
  51. BIN
      fine-druid/lib/commons-codec-1.9.jar
  52. BIN
      fine-druid/lib/commons-collections-3.2.1.jar
  53. BIN
      fine-druid/lib/commons-collections4-4.1.jar
  54. BIN
      fine-druid/lib/commons-compiler-3.0.11.jar
  55. BIN
      fine-druid/lib/commons-compress-1.9.jar
  56. BIN
      fine-druid/lib/commons-configuration-1.6.jar
  57. BIN
      fine-druid/lib/commons-crypto-1.0.0.jar
  58. BIN
      fine-druid/lib/commons-daemon-1.0.13.jar
  59. BIN
      fine-druid/lib/commons-dbcp2-2.1.1.jar
  60. BIN
      fine-druid/lib/commons-dbcp2-2.6.0.jar
  61. BIN
      fine-druid/lib/commons-digester-1.8.jar
  62. BIN
      fine-druid/lib/commons-el-1.0.jar
  63. BIN
      fine-druid/lib/commons-httpclient-2.0.2.jar
  64. BIN
      fine-druid/lib/commons-httpclient-3.1.jar
  65. BIN
      fine-druid/lib/commons-lang-2.6.jar
  66. BIN
      fine-druid/lib/commons-lang3-3.1.jar
  67. BIN
      fine-druid/lib/commons-lang3-3.8.jar
  68. BIN
      fine-druid/lib/commons-logging-1.0.4.jar
  69. BIN
      fine-druid/lib/commons-logging-api-1.1.jar
  70. BIN
      fine-druid/lib/commons-math3-3.1.1.jar
  71. BIN
      fine-druid/lib/commons-net-3.1.jar
  72. BIN
      fine-druid/lib/commons-pool2-2.4.2.jar
  73. BIN
      fine-druid/lib/commons-pool2-2.6.1.jar
  74. BIN
      fine-druid/lib/curator-client-4.2.0.jar
  75. BIN
      fine-druid/lib/curator-framework-4.2.0.jar
  76. BIN
      fine-druid/lib/curator-recipes-4.2.0.jar
  77. BIN
      fine-druid/lib/datanucleus-api-jdo-4.2.4.jar
  78. BIN
      fine-druid/lib/datanucleus-core-4.1.17.jar
  79. BIN
      fine-druid/lib/datanucleus-rdbms-4.1.19.jar
  80. BIN
      fine-druid/lib/derby-10.12.1.1.jar
  81. BIN
      fine-druid/lib/derby-10.14.1.0.jar
  82. BIN
      fine-druid/lib/disruptor-3.3.6.jar
  83. BIN
      fine-druid/lib/dnsjava-2.1.7.jar
  84. BIN
      fine-druid/lib/dom4j-1.6.1.jar
  85. BIN
      fine-druid/lib/doxia-sink-api-1.0-alpha-7.jar
  86. BIN
      fine-druid/lib/dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
  87. BIN
      fine-druid/lib/dubbo-2.5.3.jar
  88. BIN
      fine-druid/lib/ecj-4.4.2.jar
  89. BIN
      fine-druid/lib/ehcache-3.3.1.jar
  90. BIN
      fine-druid/lib/error_prone_annotations-2.3.4.jar
  91. BIN
      fine-druid/lib/esri-geometry-api-2.2.0.jar
  92. BIN
      fine-druid/lib/failureaccess-1.0.1.jar
  93. BIN
      fine-druid/lib/fastjson-1.2.6.jar
  94. BIN
      fine-druid/lib/fastjson-1.2.73.jar
  95. BIN
      fine-druid/lib/fastutil-6.5.6.jar
  96. BIN
      fine-druid/lib/findbugs-annotations-1.3.9-1.jar
  97. BIN
      fine-druid/lib/flatbuffers-1.2.0-3f79e055.jar
  98. BIN
      fine-druid/lib/fst-2.50.jar
  99. BIN
      fine-druid/lib/geronimo-jcache_1.0_spec-1.0-alpha-1.jar
  100. BIN
      fine-druid/lib/geronimo-jta_1.1_spec-1.1.1.jar
  101. Some files were not shown because too many files have changed in this diff Show More

2
base-third-project/base-third-step8/pom.xml

@ -7,7 +7,7 @@
<parent>
<groupId>com.fr.third</groupId>
<artifactId>base-third</artifactId>
<version>10.0-FEATURE-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>step8</artifactId>

11
fine-byte-buddy/src/main/java/com/fr/third/net/bytebuddy/dynamic/NexusAccessor.java

@ -19,20 +19,19 @@ import com.fr.third.net.bytebuddy.build.HashCodeAndEqualsPlugin;
import com.fr.third.net.bytebuddy.description.method.MethodDescription;
import com.fr.third.net.bytebuddy.description.type.TypeDescription;
import com.fr.third.net.bytebuddy.dynamic.loading.ClassInjector;
import com.fr.third.net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
import com.fr.third.net.bytebuddy.implementation.Implementation;
import com.fr.third.net.bytebuddy.implementation.LoadedTypeInitializer;
import com.fr.third.net.bytebuddy.implementation.bytecode.ByteCodeAppender;
import com.fr.third.net.bytebuddy.implementation.bytecode.Removal;
import com.fr.third.net.bytebuddy.implementation.bytecode.StackManipulation;
import com.fr.third.net.bytebuddy.implementation.bytecode.member.MethodInvocation;
import com.fr.third.research.annotations.SuppressFBWarnings;
import com.fr.third.net.bytebuddy.implementation.bytecode.collection.ArrayFactory;
import com.fr.third.net.bytebuddy.implementation.bytecode.constant.ClassConstant;
import com.fr.third.net.bytebuddy.implementation.bytecode.constant.IntegerConstant;
import com.fr.third.net.bytebuddy.implementation.bytecode.constant.NullConstant;
import com.fr.third.net.bytebuddy.implementation.bytecode.constant.TextConstant;
import com.fr.third.net.bytebuddy.implementation.bytecode.member.MethodInvocation;
import com.fr.third.org.objectweb.asm.MethodVisitor;
import com.fr.third.research.annotations.SuppressFBWarnings;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
@ -223,7 +222,11 @@ public class NexusAccessor {
return new Unavailable("Nexus injection was explicitly disabled");
} else {
try {
Class<?> nexusType = new ClassInjector.UsingReflection(ClassLoader.getSystemClassLoader(), ClassLoadingStrategy.NO_PROTECTION_DOMAIN)
/*
* 实例化UsingReflection时要指定非null的ProtectionDomain否则开启-security后经由这里调用具体方法时会校验权限失败
* 这里指定为NexusAccessor的ProtectionDomain即fine-third jar
*/
Class<?> nexusType = new ClassInjector.UsingReflection(ClassLoader.getSystemClassLoader(), getClass().getProtectionDomain())
.inject(Collections.singletonMap(TypeDescription.ForLoadedType.of(Nexus.class), ClassFileLocator.ForClassLoader.read(Nexus.class)))
.get(TypeDescription.ForLoadedType.of(Nexus.class));
return new Dispatcher.Available(nexusType.getMethod("register", String.class, ClassLoader.class, ReferenceQueue.class, int.class, Object.class),

BIN
fine-druid/lib/HikariCP-2.6.1.jar

Binary file not shown.

BIN
fine-druid/lib/HikariCP-java7-2.4.13.jar

Binary file not shown.

BIN
fine-druid/lib/accessors-smart-1.2.jar

Binary file not shown.

BIN
fine-druid/lib/aggdesigner-algorithm-6.0.jar

Binary file not shown.

BIN
fine-druid/lib/aircompressor-0.10.jar

Binary file not shown.

BIN
fine-druid/lib/ant-1.9.1.jar

Binary file not shown.

BIN
fine-druid/lib/ant-launcher-1.9.1.jar

Binary file not shown.

BIN
fine-druid/lib/antlr-2.7.7.jar

Binary file not shown.

BIN
fine-druid/lib/antlr-runtime-3.1.3.jar

Binary file not shown.

BIN
fine-druid/lib/antlr-runtime-3.5.2.jar

Binary file not shown.

BIN
fine-druid/lib/aopalliance-repackaged-2.5.0-b32.jar

Binary file not shown.

BIN
fine-druid/lib/apache-jsp-9.3.20.v20170531.jar

Binary file not shown.

BIN
fine-druid/lib/apache-jstl-9.3.20.v20170531.jar

Binary file not shown.

BIN
fine-druid/lib/apacheds-i18n-2.0.0-M15.jar

Binary file not shown.

BIN
fine-druid/lib/apacheds-kerberos-codec-2.0.0-M15.jar

Binary file not shown.

BIN
fine-druid/lib/api-asn1-api-1.0.0-M20.jar

Binary file not shown.

BIN
fine-druid/lib/api-util-1.0.0-M20.jar

Binary file not shown.

BIN
fine-druid/lib/apiguardian-api-1.1.0.jar

Binary file not shown.

BIN
fine-druid/lib/arrow-format-0.8.0.jar

Binary file not shown.

BIN
fine-druid/lib/arrow-memory-0.8.0.jar

Binary file not shown.

BIN
fine-druid/lib/arrow-vector-0.8.0.jar

Binary file not shown.

BIN
fine-druid/lib/asm-3.1.jar

Binary file not shown.

BIN
fine-druid/lib/asm-5.0.4.jar

Binary file not shown.

BIN
fine-druid/lib/asm-commons-5.0.1.jar

Binary file not shown.

BIN
fine-druid/lib/asm-tree-5.0.1.jar

Binary file not shown.

BIN
fine-druid/lib/aspectjrt-1.8.2.jar

Binary file not shown.

BIN
fine-druid/lib/aspectjrt-1.8.9.jar

Binary file not shown.

BIN
fine-druid/lib/audience-annotations-0.5.0.jar

Binary file not shown.

BIN
fine-druid/lib/avatica-core-1.9.0.jar

Binary file not shown.

BIN
fine-druid/lib/avatica-metrics-1.9.0.jar

Binary file not shown.

BIN
fine-druid/lib/avro-1.7.7.jar

Binary file not shown.

BIN
fine-druid/lib/bcprov-jdk15on-1.52.jar

Binary file not shown.

BIN
fine-druid/lib/bonecp-spring-0.8.0.RELEASE.jar

Binary file not shown.

BIN
fine-druid/lib/buildnumber-maven-plugin-1.1.jar

Binary file not shown.

BIN
fine-druid/lib/c3p0-0.9.1.2.jar

Binary file not shown.

BIN
fine-druid/lib/c3p0-0.9.2.1.jar

Binary file not shown.

BIN
fine-druid/lib/c3p0-0.9.5.4.jar

Binary file not shown.

BIN
fine-druid/lib/calcite-core-1.26.0.jar

Binary file not shown.

BIN
fine-druid/lib/calcite-linq4j-1.26.0.jar

Binary file not shown.

BIN
fine-druid/lib/checker-qual-3.5.0.jar

Binary file not shown.

BIN
fine-druid/lib/classmate-1.3.0.jar

Binary file not shown.

BIN
fine-druid/lib/classworlds-1.1.jar

Binary file not shown.

BIN
fine-druid/lib/clickhouse-jdbc-0.2.4.jar

Binary file not shown.

BIN
fine-druid/lib/commons-beanutils-1.7.0.jar

Binary file not shown.

BIN
fine-druid/lib/commons-beanutils-core-1.8.0.jar

Binary file not shown.

BIN
fine-druid/lib/commons-cli-1.0.jar

Binary file not shown.

BIN
fine-druid/lib/commons-cli-1.2.jar

Binary file not shown.

BIN
fine-druid/lib/commons-codec-1.12.jar

Binary file not shown.

BIN
fine-druid/lib/commons-codec-1.9.jar

Binary file not shown.

BIN
fine-druid/lib/commons-collections-3.2.1.jar

Binary file not shown.

BIN
fine-druid/lib/commons-collections4-4.1.jar

Binary file not shown.

BIN
fine-druid/lib/commons-compiler-3.0.11.jar

Binary file not shown.

BIN
fine-druid/lib/commons-compress-1.9.jar

Binary file not shown.

BIN
fine-druid/lib/commons-configuration-1.6.jar

Binary file not shown.

BIN
fine-druid/lib/commons-crypto-1.0.0.jar

Binary file not shown.

BIN
fine-druid/lib/commons-daemon-1.0.13.jar

Binary file not shown.

BIN
fine-druid/lib/commons-dbcp2-2.1.1.jar

Binary file not shown.

BIN
fine-druid/lib/commons-dbcp2-2.6.0.jar

Binary file not shown.

BIN
fine-druid/lib/commons-digester-1.8.jar

Binary file not shown.

BIN
fine-druid/lib/commons-el-1.0.jar

Binary file not shown.

BIN
fine-druid/lib/commons-httpclient-2.0.2.jar

Binary file not shown.

BIN
fine-druid/lib/commons-httpclient-3.1.jar

Binary file not shown.

BIN
fine-druid/lib/commons-lang-2.6.jar

Binary file not shown.

BIN
fine-druid/lib/commons-lang3-3.1.jar

Binary file not shown.

BIN
fine-druid/lib/commons-lang3-3.8.jar

Binary file not shown.

BIN
fine-druid/lib/commons-logging-1.0.4.jar

Binary file not shown.

BIN
fine-druid/lib/commons-logging-api-1.1.jar

Binary file not shown.

BIN
fine-druid/lib/commons-math3-3.1.1.jar

Binary file not shown.

BIN
fine-druid/lib/commons-net-3.1.jar

Binary file not shown.

BIN
fine-druid/lib/commons-pool2-2.4.2.jar

Binary file not shown.

BIN
fine-druid/lib/commons-pool2-2.6.1.jar

Binary file not shown.

BIN
fine-druid/lib/curator-client-4.2.0.jar

Binary file not shown.

BIN
fine-druid/lib/curator-framework-4.2.0.jar

Binary file not shown.

BIN
fine-druid/lib/curator-recipes-4.2.0.jar

Binary file not shown.

BIN
fine-druid/lib/datanucleus-api-jdo-4.2.4.jar

Binary file not shown.

BIN
fine-druid/lib/datanucleus-core-4.1.17.jar

Binary file not shown.

BIN
fine-druid/lib/datanucleus-rdbms-4.1.19.jar

Binary file not shown.

BIN
fine-druid/lib/derby-10.12.1.1.jar

Binary file not shown.

BIN
fine-druid/lib/derby-10.14.1.0.jar

Binary file not shown.

BIN
fine-druid/lib/disruptor-3.3.6.jar

Binary file not shown.

BIN
fine-druid/lib/dnsjava-2.1.7.jar

Binary file not shown.

BIN
fine-druid/lib/dom4j-1.6.1.jar

Binary file not shown.

BIN
fine-druid/lib/doxia-sink-api-1.0-alpha-7.jar

Binary file not shown.

BIN
fine-druid/lib/dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar

Binary file not shown.

BIN
fine-druid/lib/dubbo-2.5.3.jar

Binary file not shown.

BIN
fine-druid/lib/ecj-4.4.2.jar

Binary file not shown.

BIN
fine-druid/lib/ehcache-3.3.1.jar

Binary file not shown.

BIN
fine-druid/lib/error_prone_annotations-2.3.4.jar

Binary file not shown.

BIN
fine-druid/lib/esri-geometry-api-2.2.0.jar

Binary file not shown.

BIN
fine-druid/lib/failureaccess-1.0.1.jar

Binary file not shown.

BIN
fine-druid/lib/fastjson-1.2.6.jar

Binary file not shown.

BIN
fine-druid/lib/fastjson-1.2.73.jar

Binary file not shown.

BIN
fine-druid/lib/fastutil-6.5.6.jar

Binary file not shown.

BIN
fine-druid/lib/findbugs-annotations-1.3.9-1.jar

Binary file not shown.

BIN
fine-druid/lib/flatbuffers-1.2.0-3f79e055.jar

Binary file not shown.

BIN
fine-druid/lib/fst-2.50.jar

Binary file not shown.

BIN
fine-druid/lib/geronimo-jcache_1.0_spec-1.0-alpha-1.jar

Binary file not shown.

BIN
fine-druid/lib/geronimo-jta_1.1_spec-1.1.1.jar

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save