natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2.0-beta.5-release' into apache-3.2

This commit is contained in:
Albumen Kevin 2023-02-16 14:18:22 +08:00
parent 6c062586b4 3ad532fa0c
commit 5c0ed0c1da
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dubbo-dependencies-bom/pom.xml
View File

@ -187,7 +187,7 @@
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
<commons_compress_version>1.22</commons_compress_version>
<revision>3.2.0-beta.5-SNAPSHOT</revision>
<revision>3.2.0-beta.5</revision>
</properties>
<dependencyManagement>

2
dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
View File

@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
<revision>3.2.0-beta.5-SNAPSHOT</revision>
<revision>3.2.0-beta.5</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
<curator5_version>5.1.0</curator5_version>
<zookeeper_version>3.7.0</zookeeper_version>

2
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
View File

@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
<revision>3.2.0-beta.5-SNAPSHOT</revision>
<revision>3.2.0-beta.5</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
<curator_version>4.3.0</curator_version>
<zookeeper_version>3.4.14</zookeeper_version>

2
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/filter/observation/ObservationReceiverFilter.java
View File

@ -33,7 +33,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
/**
* A {@link Filter} that creates an {@link Observation} around the incoming message.
*/
@Activate(group = PROVIDER, order = -1)
@Activate(group = PROVIDER, order = -1,onClass = "io.micrometer.observation.NoopObservationRegistry")
public class ObservationReceiverFilter implements Filter, BaseFilter.Listener, ScopeModelAware {
private final ObservationRegistry observationRegistry;

2
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/filter/observation/ObservationSenderFilter.java
View File

@ -34,7 +34,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
/**
* A {@link Filter} that creates an {@link Observation} around the outgoing message.
*/
@Activate(group = CONSUMER, order = -1)
@Activate(group = CONSUMER, order = -1,onClass = "io.micrometer.observation.NoopObservationRegistry")
public class ObservationSenderFilter implements ClusterFilter, BaseFilter.Listener, ScopeModelAware {
private final ObservationRegistry observationRegistry;

3
pom.xml
View File

@ -129,7 +129,7 @@
<checkstyle_unix.skip>true</checkstyle_unix.skip>
<rat.skip>true</rat.skip>
<jacoco.skip>true</jacoco.skip>
<revision>3.2.0-beta.5-SNAPSHOT</revision>
<revision>3.2.0-beta.5</revision>
</properties>
<modules>
@ -441,6 +441,7 @@
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<source>${maven_source_version}</source>
<links>
<link>http://docs.oracle.com/javase/8/docs/api</link>
</links>