Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unify metadata and configcenter implementations #4360

Merged
merged 52 commits into from
Jun 26, 2019
Merged

unify metadata and configcenter implementations #4360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
9a42780
Polish apache/incubator-dubbo/#4096 : To add new module for Dubbo Event
mercyblitz May 20, 2019
77d802e
Polish apache/incubator-dubbo#3942 : Dubbo Cloud Native: To Add Servi…
mercyblitz May 20, 2019
5c73899
Polish apache/incubator-dubbo#3946 : Dubbo Cloud Native : To Add Dubb…
mercyblitz May 20, 2019
b2dbff3
Polish apache/incubator-dubbo#4093 : To add exported and unexported e…
mercyblitz May 20, 2019
737da2b
Polish apache/incubator-dubbo#3984 : Add Service registration and dis…
mercyblitz May 20, 2019
839f7a3
Polish apache/incubator-dubbo#4104 : To add initialized and destroyed…
mercyblitz May 21, 2019
bc41e2d
Polish apache/incubator-dubbo#3946 : Refactor Dubbo metadata service
mercyblitz May 21, 2019
4c8516c
Polish apache/incubator-dubbo#3946 : To Add MetadataServiceExporter i…
mercyblitz May 21, 2019
ab6a818
Update ${project.parent.version}
mercyblitz May 21, 2019
beb570d
Polish apache/incubator-dubbo#3946 : Refactor Dubbo metadata service
mercyblitz May 21, 2019
f4a5490
Polish apache/incubator-dubbo/#4096 : Remove the duplicated word
mercyblitz May 22, 2019
a5da695
Polish apache/incubator-dubbo#4119 : DynamicConfiguration adds the pu…
mercyblitz May 23, 2019
3894142
Polish apache/incubator-dubbo#4120 : To add DynamicConfiguration impl…
mercyblitz May 23, 2019
d450c7d
Polish apache/incubator-dubbo#4121 : Add the mapping from service met…
mercyblitz May 23, 2019
21c97c8
Polish apache/incubator-dubbo/#3790 : Dependencies with no license
mercyblitz May 23, 2019
fd1150f
Polish apache/incubator-dubbo#4071 : @Reference can't match the local…
mercyblitz May 23, 2019
e5a9d39
Merge branch 'bootstrap' into 2.7.x
mercyblitz May 23, 2019
cc4411b
Merge pull request #27 from mercyblitz/2.7.x
mercyblitz May 23, 2019
fc0b29d
Update version to be 2.7.3
mercyblitz May 29, 2019
1814cf1
Polish apache/incubator-dubbo#3946 : Add thread-safe and performance …
mercyblitz May 31, 2019
574e1b1
Polish apache/incubator-dubbo#3946 : Add thread-safe and performance …
mercyblitz May 31, 2019
07d7ebf
Polish apache/incubator-dubbo#3946 : Add thread-safe and performance …
mercyblitz May 31, 2019
83b2324
Update 2.7.3
mercyblitz May 31, 2019
572b256
Polish apache/incubator-dubbo#4104 : To add more events for dubbo-con…
mercyblitz May 31, 2019
9975f82
Polish apache/incubator-dubbo#3942 : Dubbo Cloud Native: To Add Servi…
mercyblitz May 31, 2019
1df1d1a
Polish apache/incubator-dubbo#3984 : Add Service registration and dis…
mercyblitz May 31, 2019
71a902d
Add Bootstrap
mercyblitz May 31, 2019
2340a1e
Merge remote-tracking branch 'upstream/cloud-native' into cloud-nativ…
mercyblitz May 31, 2019
e9eadba
Merge pull request #28 from mercyblitz/cloud-native-new
mercyblitz May 31, 2019
9208a34
Polish GA
mercyblitz Jun 3, 2019
9702156
Polish apache/incubator-dubbo#4050 : Dubbo Cloud Native : Add a mecha…
mercyblitz Jun 4, 2019
4c10a83
Polish apache/incubator-dubbo#4093 : To add DubboServiceDestroyedEvent
mercyblitz Jun 4, 2019
cafba86
Polish apache/incubator-dubbo#4050 : Dubbo Cloud Native : Reactor
mercyblitz Jun 4, 2019
18b69f2
Polish apache/incubator-dubbo#3946 : Remove SPI
mercyblitz Jun 6, 2019
0dcd960
Polish apache/incubator-dubbo#4265 : [Feature] Dubbo Cloud Native - A…
mercyblitz Jun 6, 2019
7c0eb3d
Polish apache/incubator-dubbo#4265 : [Feature] Dubbo Cloud Native - A…
mercyblitz Jun 6, 2019
3ac778c
Polish apache/dubbo#4265 : Add test dependencies
mercyblitz Jun 7, 2019
a8526da
Polish /apache/dubbo#3942 : Refactor implementation
mercyblitz Jun 7, 2019
1a3ee8f
Polish apache/incubator-dubbo#3984 : Refactor
mercyblitz Jun 7, 2019
f39906a
Add Nacos implementation
mercyblitz Jun 7, 2019
f8d029b
Merge branch 'cloud-native' of https://github.com/mercyblitz/incubato…
mercyblitz Jun 7, 2019
41c25bb
Polish apache/incubator-dubbo#3984 : Add Nacos implementation
mercyblitz Jun 7, 2019
de63bdb
Polish apache/incubator-dubbo#4268 : Dubbo Event - To support Generic…
mercyblitz Jun 8, 2019
4673c3b
Polish apache/incubator-dubbo#4268 : Update JavaDoc
mercyblitz Jun 8, 2019
f516ca4
Polish apache/incubator-dubbo#4268 : Add GenericEventListener impleme…
mercyblitz Jun 8, 2019
0d746f2
add cache for MetadataServiceProxy
chickenlj Jun 14, 2019
6bfe881
support multiple metadata and configcenter
chickenlj Jun 14, 2019
3fd05f7
unify metadata implementation
chickenlj Jun 20, 2019
e828be7
add missed files
chickenlj Jun 20, 2019
bb071a3
Merge branch 'cloud-native' into local/chickenlj/cloud-native
chickenlj Jun 20, 2019
633c070
remove duplicated files
chickenlj Jun 20, 2019
f66226d
add new SPIs and modules to dubbo-all pom.
chickenlj Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 17 additions & 25 deletions dubbo-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,13 +408,6 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
Expand Down Expand Up @@ -466,7 +459,7 @@
<!-- metadata -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-api</artifactId>
<artifactId>dubbo-metadata-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
Expand Down Expand Up @@ -516,14 +509,6 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>

<!-- Transitive dependencies -->
<dependency>
<groupId>org.springframework</groupId>
Expand Down Expand Up @@ -640,26 +625,21 @@
<include>org.apache.dubbo:dubbo-serialization-protostuff</include>
<include>org.apache.dubbo:dubbo-serialization-gson</include>
<include>org.apache.dubbo:dubbo-serialization-googlePb</include>
<include>org.apache.dubbo:dubbo-configcenter-api</include>
<include>org.apache.dubbo:dubbo-configcenter-definition</include>
<include>org.apache.dubbo:dubbo-configcenter-apollo</include>
<include>org.apache.dubbo:dubbo-configcenter-zookeeper</include>
<include>org.apache.dubbo:dubbo-configcenter-consul</include>
<include>org.apache.dubbo:dubbo-configcenter-etcd</include>
<include>org.apache.dubbo:dubbo-configcenter-nacos</include>
<include>org.apache.dubbo:dubbo-metadata-report-api</include>
<include>org.apache.dubbo:dubbo-metadata-definition</include>
<include>org.apache.dubbo:dubbo-metadata-api</include>
<include>org.apache.dubbo:dubbo-metadata-report-redis</include>
<include>org.apache.dubbo:dubbo-metadata-report-zookeeper</include>
<include>org.apache.dubbo:dubbo-metadata-report-consul</include>
<include>org.apache.dubbo:dubbo-metadata-report-etcd</include>
<include>org.apache.dubbo:dubbo-metadata-report-nacos</include>
<include>org.apache.dubbo:dubbo-serialization-native-hession</include>
<include>org.apache.dubbo:dubbo-rpc-native-thrift</include>

<!-- 2.7.3 new modules -->
<include>org.apache.dubbo:dubbo-event</include>
<include>org.apache.dubbo:dubbo-metadata</include>
</includes>
</artifactSet>
<transformers>
Expand Down Expand Up @@ -778,11 +758,11 @@
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.configcenter.DynamicConfigurationFactory
<resource>META-INF/dubbo/internal/org.apache.dubbo.common.config.configcenter.DynamicConfigurationFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.store.MetadataReportFactory
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
</resource>
</transformer>
<!-- @since 2.7.3 -->
Expand All @@ -795,7 +775,19 @@
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.LocalMetadataService
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.WritableMetadataService
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.ServiceNameMapping
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.registry.client.metadata.MetadataServiceProxyFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
</resource>
</transformer>
</transformers>
Expand Down
23 changes: 13 additions & 10 deletions dubbo-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,22 @@
<artifactId>dubbo-compatible</artifactId>
<version>${project.version}</version>
</dependency>
<!-- metadata -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-definition</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
Expand All @@ -392,11 +403,8 @@
<artifactId>dubbo-metadata-report-nacos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-api</artifactId>
<version>${project.version}</version>
</dependency>

<!-- config-center -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
Expand All @@ -422,11 +430,6 @@
<artifactId>dubbo-configcenter-nacos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-definition</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
13 changes: 7 additions & 6 deletions dubbo-bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId>
Expand Down Expand Up @@ -83,12 +90,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

</project>