Skip to content

Commit af8cbe5

Browse files
beiwei30chickenlj
beiwei30
authored and
chickenlj
committed
Merge pul request #3607, introduce dubbo-dependencies-zookeeper.
1 parent 1420698 commit af8cbe5

File tree

4 files changed

+153
-1
lines changed

4 files changed

+153
-1
lines changed

‎dubbo-dependencies-bom/pom.xml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
321
<modelVersion>4.0.0</modelVersion>
422

523
<parent>
@@ -180,11 +198,23 @@
180198
<groupId>org.apache.zookeeper</groupId>
181199
<artifactId>zookeeper</artifactId>
182200
<version>${zookeeper_version}</version>
201+
<exclusions>
202+
<exclusion>
203+
<groupId>io.netty</groupId>
204+
<artifactId>netty</artifactId>
205+
</exclusion>
206+
</exclusions>
183207
</dependency>
184208
<dependency>
185209
<groupId>com.101tec</groupId>
186210
<artifactId>zkclient</artifactId>
187211
<version>${zkclient_version}</version>
212+
<exclusions>
213+
<exclusion>
214+
<groupId>org.apache.zookeeper</groupId>
215+
<artifactId>zookeeper</artifactId>
216+
</exclusion>
217+
</exclusions>
188218
</dependency>
189219
<dependency>
190220
<groupId>org.apache.curator</groupId>

‎dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<modelVersion>4.0.0</modelVersion>
23+
24+
<parent>
25+
<groupId>org.apache</groupId>
26+
<artifactId>apache</artifactId>
27+
<version>21</version>
28+
<relativePath></relativePath>
29+
</parent>
30+
31+
<groupId>org.apache.dubbo</groupId>
32+
<artifactId>dubbo-dependencies-zookeeper</artifactId>
33+
<version>2.7.1-SNAPSHOT</version>
34+
<packaging>pom</packaging>
35+
36+
<dependencyManagement>
37+
<dependencies>
38+
<dependency>
39+
<groupId>org.apache.dubbo</groupId>
40+
<artifactId>dubbo-dependencies-bom</artifactId>
41+
<version>2.7.1-SNAPSHOT</version>
42+
<type>pom</type>
43+
<scope>import</scope>
44+
</dependency>
45+
</dependencies>
46+
</dependencyManagement>
47+
48+
<dependencies>
49+
<dependency>
50+
<groupId>org.apache.curator</groupId>
51+
<artifactId>curator-recipes</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.101tec</groupId>
55+
<artifactId>zkclient</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.apache.zookeeper</groupId>
59+
<artifactId>zookeeper</artifactId>
60+
</dependency>
61+
</dependencies>
62+
63+
<profiles>
64+
<profile>
65+
<id>release</id>
66+
<build>
67+
<plugins>
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-gpg-plugin</artifactId>
71+
<executions>
72+
<execution>
73+
<phase>verify</phase>
74+
<goals>
75+
<goal>sign</goal>
76+
</goals>
77+
</execution>
78+
</executions>
79+
</plugin>
80+
</plugins>
81+
</build>
82+
</profile>
83+
</profiles>
84+
85+
</project>

‎dubbo-dependencies/pom.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<parent>
23+
<artifactId>dubbo-parent</artifactId>
24+
<groupId>org.apache.dubbo</groupId>
25+
<version>2.7.1-SNAPSHOT</version>
26+
</parent>
27+
<modelVersion>4.0.0</modelVersion>
28+
29+
<artifactId>dubbo-dependencies</artifactId>
30+
<packaging>pom</packaging>
31+
<modules>
32+
<module>dubbo-dependencies-zookeeper</module>
33+
</modules>
34+
35+
36+
</project>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<module>dubbo-distribution</module>
148148
<module>dubbo-metadata-report</module>
149149
<module>dubbo-configcenter</module>
150+
<module>dubbo-dependencies</module>
150151
</modules>
151152

152153
<dependencyManagement>

0 commit comments

Comments
 (0)
⚡