diff --git a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisDynamicTableSource.java b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisDynamicTableSource.java index 7f28fccdb52..277045eac22 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisDynamicTableSource.java +++ b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisDynamicTableSource.java @@ -37,7 +37,11 @@ import java.util.Map; -import static org.apache.flink.table.types.logical.LogicalTypeRoot.*; +import static org.apache.flink.table.types.logical.LogicalTypeRoot.BIGINT; +import static org.apache.flink.table.types.logical.LogicalTypeRoot.DOUBLE; +import static org.apache.flink.table.types.logical.LogicalTypeRoot.VARCHAR; + +//import static org.apache.flink.table.types.logical.LogicalTypeRoot.*; /** * Redis dynamic table source @@ -52,8 +56,13 @@ public class RedisDynamicTableSource implements LookupTableSource { private final RedisLookupOptions redisLookupOptions; private final Map properties; + private final String inlongMetric; + private final String auditHostAndPorts; + private final String auditKeys; + public RedisDynamicTableSource(Map properties, ResolvedSchema tableSchema, - ReadableConfig config, RedisLookupOptions redisLookupOptions) { + ReadableConfig config, RedisLookupOptions redisLookupOptions, String inlongMetric, String auditHostAndPorts, + String auditKeys) { this.properties = properties; Preconditions.checkNotNull(properties, "properties should not be null"); this.tableSchema = tableSchema; @@ -73,11 +82,15 @@ public RedisDynamicTableSource(Map properties, ResolvedSchema ta flinkJedisConfigBase = RedisHandlerServices .findRedisHandler(InlongJedisConfigHandler.class, properties).createFlinkJedisConfig(config); this.redisLookupOptions = redisLookupOptions; + this.inlongMetric = inlongMetric; + this.auditHostAndPorts = auditHostAndPorts; + this.auditKeys = auditKeys; } @Override public DynamicTableSource copy() { - return new RedisDynamicTableSource(properties, tableSchema, config, redisLookupOptions); + return new RedisDynamicTableSource(properties, tableSchema, config, redisLookupOptions, inlongMetric, + auditHostAndPorts, auditKeys); } @Override @@ -88,6 +101,7 @@ public String asSummaryString() { @Override public LookupRuntimeProvider getLookupRuntimeProvider(LookupContext context) { return TableFunctionProvider.of(new RedisRowDataLookupFunction( - redisMapper.getCommandDescription(), flinkJedisConfigBase, this.redisLookupOptions)); + redisMapper.getCommandDescription(), flinkJedisConfigBase, this.redisLookupOptions, inlongMetric, + auditHostAndPorts, auditKeys)); } } diff --git a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisRowDataLookupFunction.java b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisRowDataLookupFunction.java index 95c9acd41fd..821598d47a8 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisRowDataLookupFunction.java +++ b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisRowDataLookupFunction.java @@ -17,6 +17,8 @@ package org.apache.inlong.sort.redis.source; +import org.apache.inlong.sort.base.metric.MetricOption; +import org.apache.inlong.sort.base.metric.SourceMetricData; import org.apache.inlong.sort.redis.common.config.RedisLookupOptions; import org.apache.inlong.sort.redis.common.container.InlongRedisCommandsContainer; import org.apache.inlong.sort.redis.common.container.RedisCommandsContainerBuilder; @@ -55,14 +57,25 @@ public class RedisRowDataLookupFunction extends TableFunction { private transient Cache cache; private InlongRedisCommandsContainer redisCommandsContainer; + private SourceMetricData sourceMetricData; + RedisRowDataLookupFunction(RedisCommandDescription redisCommandDescription, - FlinkJedisConfigBase flinkJedisConfigBase, RedisLookupOptions redisLookupOptions) { + FlinkJedisConfigBase flinkJedisConfigBase, RedisLookupOptions redisLookupOptions, String inlongMetric, + String auditHostAndPorts, String auditKeys) { this.flinkJedisConfigBase = flinkJedisConfigBase; this.redisCommand = redisCommandDescription.getCommand(); this.additionalKey = redisCommandDescription.getAdditionalKey(); this.cacheMaxSize = redisLookupOptions.getCacheMaxSize(); this.cacheExpireMs = redisLookupOptions.getCacheExpireMs(); this.maxRetryTimes = redisLookupOptions.getMaxRetryTimes(); + MetricOption metricOption = MetricOption.builder() + .withInlongLabels(inlongMetric) + .withAuditAddress(auditHostAndPorts) + .withAuditKeys(auditKeys) + .build(); + if (metricOption != null) { + sourceMetricData = new SourceMetricData(metricOption); + } } /** @@ -107,6 +120,10 @@ public void eval(Object... keys) { throw new UnsupportedOperationException( String.format("Unsupported for redisCommand: %s", redisCommand)); } + if (sourceMetricData != null) { + sourceMetricData.outputMetricsWithEstimate(rowData, System.currentTimeMillis()); + } + LOG.info("Report audit: {} and time : {}", rowData, System.currentTimeMillis()); if (cache == null) { collect(rowData); } else { diff --git a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/table/RedisDynamicTableFactory.java b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/table/RedisDynamicTableFactory.java index ef6c778a982..54f907ece93 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/table/RedisDynamicTableFactory.java +++ b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/redis/src/main/java/org/apache/inlong/sort/redis/table/RedisDynamicTableFactory.java @@ -95,10 +95,15 @@ public class RedisDynamicTableFactory implements DynamicTableSourceFactory, Dyna public DynamicTableSource createDynamicTableSource(Context context) { FactoryUtil.TableFactoryHelper helper = FactoryUtil.createTableFactoryHelper(this, context); ReadableConfig config = helper.getOptions(); + helper.validate(); validateConfigOptions(config, SUPPORT_SOURCE_COMMANDS); + String inlongMetric = config.getOptional(INLONG_METRIC).orElse(null); + String auditHostAndPorts = config.get(INLONG_AUDIT); + String auditKeys = config.get(AUDIT_KEYS); return new RedisDynamicTableSource(context.getCatalogTable().getOptions(), - context.getCatalogTable().getResolvedSchema(), config, getJdbcLookupOptions(config)); + context.getCatalogTable().getResolvedSchema(), config, getJdbcLookupOptions(config), inlongMetric, + auditHostAndPorts, auditKeys); } @Override diff --git a/licenses/inlong-audit/LICENSE b/licenses/inlong-audit/LICENSE index 04ee912d7f8..7d71ea86714 100644 --- a/licenses/inlong-audit/LICENSE +++ b/licenses/inlong-audit/LICENSE @@ -480,14 +480,14 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3 - mybatis-spring-boot-autoconfigure (https://github.com/mybatis/spring-boot-starter/tree/mybatis-spring-boot-2.1.3/mybatis-spring-boot-autoconfigure), (The Apache Software License, Version 2.0) org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3 - mybatis-spring-boot-starter (https://github.com/mybatis/spring-boot-starter/tree/mybatis-spring-boot-2.1.3/mybatis-spring-boot-starter), (The Apache Software License, Version 2.0) org.apache.pulsar:pulsar-client:2.8.4 - Pulsar Client Java (https://github.com/apache/pulsar/tree/v2.8.4), (Apache License, Version 2.0) - org.springframework:spring-aop:5.3.32 - Spring AOP (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-beans:5.3.32 - Spring Beans (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-context:5.3.32 - Spring Context (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-core:5.3.32 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-expression:5.3.32 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jcl:5.3.32 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jdbc:5.3.32 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-tx:5.3.32 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-aop:5.3.34 - Spring AOP (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-beans:5.3.34 - Spring Beans (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-context:5.3.34 - Spring Context (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-core:5.3.34 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-expression:5.3.34 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jcl:5.3.34 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jdbc:5.3.34 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-tx:5.3.34 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) ru.yandex.clickhouse:clickhouse-jdbc:0.3.1 - clickhouse-jdbc (https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-jdbc), (The Apache Software License, Version 2.0) diff --git a/licenses/inlong-audit/NOTICE b/licenses/inlong-audit/NOTICE index c9b80cc5351..7b69bbed80f 100644 --- a/licenses/inlong-audit/NOTICE +++ b/licenses/inlong-audit/NOTICE @@ -786,7 +786,7 @@ Spring JDBC NOTICE Spring Transaction NOTICE ======================================================================== -Spring Framework 5.3.32 +Spring Framework 5.3.34 Copyright (c) 2002-2022 Pivotal, Inc. This product is licensed to you under the Apache License, Version 2.0 diff --git a/licenses/inlong-audit/licenses/LICENSE-spring-aop.txt b/licenses/inlong-audit/licenses/LICENSE-spring-aop.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-audit/licenses/LICENSE-spring-aop.txt +++ b/licenses/inlong-audit/licenses/LICENSE-spring-aop.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-audit/licenses/LICENSE-spring-beans.txt b/licenses/inlong-audit/licenses/LICENSE-spring-beans.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-audit/licenses/LICENSE-spring-beans.txt +++ b/licenses/inlong-audit/licenses/LICENSE-spring-beans.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-audit/licenses/LICENSE-spring-context.txt b/licenses/inlong-audit/licenses/LICENSE-spring-context.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-audit/licenses/LICENSE-spring-context.txt +++ b/licenses/inlong-audit/licenses/LICENSE-spring-context.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-audit/licenses/LICENSE-spring-core.txt b/licenses/inlong-audit/licenses/LICENSE-spring-core.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-audit/licenses/LICENSE-spring-core.txt +++ b/licenses/inlong-audit/licenses/LICENSE-spring-core.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-audit/licenses/LICENSE-spring-expression.txt b/licenses/inlong-audit/licenses/LICENSE-spring-expression.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-audit/licenses/LICENSE-spring-expression.txt +++ b/licenses/inlong-audit/licenses/LICENSE-spring-expression.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-audit/licenses/LICENSE-spring-jcl.txt b/licenses/inlong-audit/licenses/LICENSE-spring-jcl.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-audit/licenses/LICENSE-spring-jcl.txt +++ b/licenses/inlong-audit/licenses/LICENSE-spring-jcl.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-audit/licenses/LICENSE-spring-jdbc.txt b/licenses/inlong-audit/licenses/LICENSE-spring-jdbc.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-audit/licenses/LICENSE-spring-jdbc.txt +++ b/licenses/inlong-audit/licenses/LICENSE-spring-jdbc.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-audit/licenses/LICENSE-spring-tx.txt b/licenses/inlong-audit/licenses/LICENSE-spring-tx.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-audit/licenses/LICENSE-spring-tx.txt +++ b/licenses/inlong-audit/licenses/LICENSE-spring-tx.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/LICENSE b/licenses/inlong-manager/LICENSE index 89d64893108..42c2da7449b 100644 --- a/licenses/inlong-manager/LICENSE +++ b/licenses/inlong-manager/LICENSE @@ -662,19 +662,19 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.apache.pulsar:pulsar-client:2.8.4 - Pulsar Client Java (https://github.com/apache/pulsar/tree/v2.8.4), (Apache License, Version 2.0) org.roaringbitmap:RoaringBitmap:0.9.22 - org.roaringbitmap:RoaringBitmap (https://github.com/RoaringBitmap/RoaringBitmap/tree/0.9.22), (Apache 2) org.roaringbitmap:shims:0.9.22 - org.roaringbitmap:shims (https://github.com/RoaringBitmap/RoaringBitmap/tree/0.9.22/shims), (Apache 2) - org.springframework:spring-aop:5.3.32 - Spring AOP (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-beans:5.3.32 - Spring Beans (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-context:5.3.32 - Spring Context (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-context-support:5.3.32 - Spring Context Support (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-core:5.3.32 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-expression:5.3.32 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jcl:5.3.32 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jdbc:5.3.32 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-aop:5.3.34 - Spring AOP (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-beans:5.3.34 - Spring Beans (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-context:5.3.34 - Spring Context (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-context-support:5.3.34 - Spring Context Support (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-core:5.3.34 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-expression:5.3.34 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jcl:5.3.34 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jdbc:5.3.34 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE - Spring Plugin - Core (https://github.com/spring-projects/spring-plugin/tree/2.0.0.RELEASE), (Apache License, Version 2.0) org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE - Spring Plugin - Metadata Extension (https://github.com/spring-projects/spring-plugin/tree/2.0.0.RELEASE), (Apache License, Version 2.0) - org.springframework:spring-tx:5.3.32 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-web:5.3.32 - Spring Web (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-webmvc:5.3.32 - Spring Web MVC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-tx:5.3.34 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-web:5.3.34 - Spring Web (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-webmvc:5.3.34 - Spring Web MVC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) com.typesafe:ssl-config-core_2.11:0.3.7 - ssl-config-core (https://github.com/lightbend/ssl-config/tree/v0.3.7), (Apache-2.0) org.apache.tomcat.embed:tomcat-embed-core:9.0.60 - tomcat-embed-core (https://tomcat.apache.org/), (Apache License, Version 2.0) com.tencentcloudapi:tencentcloud-sdk-java-cls:3.1.830 - tencentcloud-sdk-java-cls (https://github.com/TencentCloud/tencentcloud-sdk-java-cls/tree/v3.1.830), (Apache License, Version 2.0) diff --git a/licenses/inlong-manager/NOTICE b/licenses/inlong-manager/NOTICE index 13fb77230ed..697edec7e30 100644 --- a/licenses/inlong-manager/NOTICE +++ b/licenses/inlong-manager/NOTICE @@ -2010,7 +2010,7 @@ Spring Expression Language (SpEL) NOTICE Spring Web MVC NOTICE ======================================================================== -Spring Framework 5.3.32 +Spring Framework 5.3.34 Copyright (c) 2002-2022 Pivotal, Inc. This product is licensed to you under the Apache License, Version 2.0 @@ -2043,7 +2043,7 @@ Spring Object/Relational Mapping NOTICE Spring Web NOTICE ======================================================================== -Spring Framework 5.3.32 +Spring Framework 5.3.34 Copyright (c) 2002-2022 Pivotal, Inc. This product is licensed to you under the Apache License, Version 2.0 diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-aop.txt b/licenses/inlong-manager/licenses/LICENSE-spring-aop.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-aop.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-aop.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-beans.txt b/licenses/inlong-manager/licenses/LICENSE-spring-beans.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-beans.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-beans.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-context-support.txt b/licenses/inlong-manager/licenses/LICENSE-spring-context-support.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-context-support.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-context-support.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-context.txt b/licenses/inlong-manager/licenses/LICENSE-spring-context.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-context.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-context.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-core.txt b/licenses/inlong-manager/licenses/LICENSE-spring-core.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-core.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-core.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-expression.txt b/licenses/inlong-manager/licenses/LICENSE-spring-expression.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-expression.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-expression.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-jcl.txt b/licenses/inlong-manager/licenses/LICENSE-spring-jcl.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-jcl.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-jcl.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-jdbc.txt b/licenses/inlong-manager/licenses/LICENSE-spring-jdbc.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-jdbc.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-jdbc.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-tx.txt b/licenses/inlong-manager/licenses/LICENSE-spring-tx.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-tx.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-tx.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-web.txt b/licenses/inlong-manager/licenses/LICENSE-spring-web.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-web.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-web.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-manager/licenses/LICENSE-spring-webmvc.txt b/licenses/inlong-manager/licenses/LICENSE-spring-webmvc.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-manager/licenses/LICENSE-spring-webmvc.txt +++ b/licenses/inlong-manager/licenses/LICENSE-spring-webmvc.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/LICENSE b/licenses/inlong-tubemq-manager/LICENSE index e87e5777c38..449352d54a4 100644 --- a/licenses/inlong-tubemq-manager/LICENSE +++ b/licenses/inlong-tubemq-manager/LICENSE @@ -434,23 +434,23 @@ The text of each license is also included at licenses/LICENSE-[project].txt. com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2 - Jackson datatype: JSR310 (https://github.com/FasterXML/jackson-modules-java8/tree/jackson-modules-java8-2.13.2), (The Apache Software License, Version 2.0) org.apache.logging.log4j:log4j-core:2.17.2 - Apache Log4j Core (https://logging.apache.org/log4j/2.x/log4j-core/), (Apache License, Version 2.0) org.mapstruct:mapstruct:1.3.1.Final - MapStruct Core (http://mapstruct.org), (The Apache Software License, Version 2.0) - org.springframework:spring-aop:5.3.32 - Spring AOP (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-aspects:5.3.32 - Spring Aspects (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-beans:5.3.32 - Spring Beans (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-context:5.3.32 - Spring Context (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-core:5.3.32 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-aop:5.3.34 - Spring AOP (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-aspects:5.3.34 - Spring Aspects (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-beans:5.3.34 - Spring Beans (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-context:5.3.34 - Spring Context (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-core:5.3.34 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework.data:spring-data-commons:2.6.3 - Spring Data Core (https://github.com/spring-projects/spring-data-commons), (Apache License, Version 2.0) org.springframework.data:spring-data-jpa:2.6.3 - Spring Data JPA (https://github.com/spring-projects/spring-data-jpa), (Apache License, Version 2.0) - org.springframework:spring-expression:5.3.32 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-expression:5.3.34 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework.hateoas:spring-hateoas:1.4.1 - Spring HATEOAS (https://github.com/spring-projects/spring-hateoas), (Apache License, Version 2.0) - org.springframework:spring-jcl:5.3.32 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jdbc:5.3.32 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-orm:5.3.32 - Spring Object/Relational Mapping (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jcl:5.3.34 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jdbc:5.3.34 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-orm:5.3.34 - Spring Object/Relational Mapping (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE - Spring Plugin - Core (https://github.com/spring-projects/spring-plugin/tree/2.0.0.RELEASE), (Apache License, Version 2.0) org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE - Spring Plugin - Metadata Extension (https://github.com/spring-projects/spring-plugin/tree/2.0.0.RELEASE), (Apache License, Version 2.0) - org.springframework:spring-tx:5.3.32 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-web:5.3.32 - Spring Web (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-webmvc:5.3.32 - Spring Web MVC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-tx:5.3.34 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-web:5.3.34 - Spring Web (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-webmvc:5.3.34 - Spring Web MVC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.apache.tomcat.embed:tomcat-embed-core:9.0.60 - tomcat-embed-core (https://tomcat.apache.org/), (Apache License, Version 2.0) diff --git a/licenses/inlong-tubemq-manager/NOTICE b/licenses/inlong-tubemq-manager/NOTICE index 63fce1b4d42..67187ecae98 100644 --- a/licenses/inlong-tubemq-manager/NOTICE +++ b/licenses/inlong-tubemq-manager/NOTICE @@ -243,7 +243,7 @@ Spring Expression Language (SpEL) NOTICE Spring Web MVC NOTICE ======================================================================== -Spring Framework 5.3.32 +Spring Framework 5.3.34 Copyright (c) 2002-2022 Pivotal, Inc. This product is licensed to you under the Apache License, Version 2.0 @@ -274,7 +274,7 @@ Spring Object/Relational Mapping NOTICE Spring Web NOTICE ======================================================================== -Spring Framework 5.3.32 +Spring Framework 5.3.34 Copyright (c) 2002-2022 Pivotal, Inc. This product is licensed to you under the Apache License, Version 2.0 @@ -293,7 +293,7 @@ subcomponent's license, as noted in the license.txt file. Spring Transaction NOTICE ======================================================================== -Spring Framework 5.3.32 +Spring Framework 5.3.34 Copyright (c) 2002-2022 Pivotal, Inc. This product is licensed to you under the Apache License, Version 2.0 diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-aop.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-aop.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-aop.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-aop.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-aspects.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-aspects.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-aspects.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-aspects.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-beans.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-beans.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-beans.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-beans.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-context.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-context.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-context.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-context.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-core.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-core.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-core.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-core.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-expression.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-expression.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-expression.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-expression.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-jcl.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-jcl.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-jcl.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-jcl.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-jdbc.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-jdbc.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-jdbc.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-jdbc.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-orm.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-orm.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-orm.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-orm.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-tx.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-tx.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-tx.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-tx.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-web.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-web.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-web.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-web.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-webmvc.txt b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-webmvc.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-webmvc.txt +++ b/licenses/inlong-tubemq-manager/licenses/LICENSE-spring-webmvc.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/LICENSE b/licenses/inlong-tubemq-server/LICENSE index 5771b85745c..379633f6ac6 100644 --- a/licenses/inlong-tubemq-server/LICENSE +++ b/licenses/inlong-tubemq-server/LICENSE @@ -426,15 +426,15 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.eclipse.jetty:jetty-servlet:9.4.48.v20220622 - Jetty :: Servlet Handling (http://www.eclipse.org/jetty), (Apache Software License - Version 2.0), (Apache 2.0 and EPL 1.0) org.eclipse.jetty:jetty-util:9.4.48.v20220622 - Jetty :: Utilities (http://www.eclipse.org/jetty), (Apache Software License - Version 2.0), (Apache 2.0 and EPL 1.0) org.eclipse.jetty:jetty-util-ajax:9.4.48.v20220622 - Jetty :: Utilities :: Ajax(JSON) (http://www.eclipse.org/jetty), (Apache Software License - Version 2.0), (Apache 2.0 and EPL 1.0) - org.springframework:spring-aop:5.3.32 - Spring AOP (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-beans:5.3.32 - Spring Beans (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-context:5.3.32 - Spring Context (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-core:5.3.32 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-expression:5.3.32 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jcl:5.3.32 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jdbc:5.3.32 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-orm:5.3.32 - Spring Object/Relational Mapping (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-tx:5.3.32 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-aop:5.3.34 - Spring AOP (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-beans:5.3.34 - Spring Beans (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-context:5.3.34 - Spring Context (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-core:5.3.34 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-expression:5.3.34 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jcl:5.3.34 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jdbc:5.3.34 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-orm:5.3.34 - Spring Object/Relational Mapping (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-tx:5.3.34 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) ======================================================================== diff --git a/licenses/inlong-tubemq-server/NOTICE b/licenses/inlong-tubemq-server/NOTICE index 1945ec1b5d5..bb921e87a00 100644 --- a/licenses/inlong-tubemq-server/NOTICE +++ b/licenses/inlong-tubemq-server/NOTICE @@ -316,7 +316,7 @@ Spring Object/Relational Mapping NOTICE Spring Transaction NOTICE ======================================================================== -Spring Framework 5.3.32 +Spring Framework 5.3.34 Copyright (c) 2002-2022 Pivotal, Inc. This product is licensed to you under the Apache License, Version 2.0 diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-aop.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-aop.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-aop.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-aop.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-beans.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-beans.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-beans.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-beans.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-context.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-context.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-context.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-context.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-core.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-core.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-core.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-core.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-expression.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-expression.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-expression.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-expression.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-jcl.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-jcl.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-jcl.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-jcl.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-jdbc.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-jdbc.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-jdbc.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-jdbc.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-orm.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-orm.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-orm.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-orm.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-tx.txt b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-tx.txt index f0fec6163e6..81af8e207d8 100644 --- a/licenses/inlong-tubemq-server/licenses/LICENSE-spring-tx.txt +++ b/licenses/inlong-tubemq-server/licenses/LICENSE-spring-tx.txt @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.3.32 SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.34 SUBCOMPONENTS: -Spring Framework 5.3.32 includes a number of subcomponents +Spring Framework 5.3.34 includes a number of subcomponents with separate copyright notices and license terms. The product that includes this file does not necessarily use all the open source subcomponents referred to below. Your use of the source diff --git a/pom.xml b/pom.xml index fd9f683a6f5..c8defe2e47f 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 2.9.0 2.6.15 - 5.3.32 + 5.3.34 2.4.3 2.6.6 3.0.0