Skip to content

Commit eea7608

Browse files
CritasWangCritasWang
authored
Revert "Release timecho 3.2.0"
1 parent e0ce756 commit eea7608

24 files changed

Lines changed: 265 additions & 476 deletions

File tree

‎pom.xml‎

Lines changed: 48 additions & 103 deletions
Large diffs are not rendered by default.

‎ratis-assembly/pom.xml‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License. See accompanying LICENSE file.
1414
-->
15-
<project xmlns="http://maven.apache.org/POM/4.0.0"
16-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
15+
<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">
1816
<modelVersion>4.0.0</modelVersion>
1917
<parent>
2018
<artifactId>ratis</artifactId>
21-
<groupId>com.timecho.ratis</groupId>
22-
<version>3.2.0</version>
19+
<groupId>org.apache.ratis</groupId>
20+
<version>3.2.0-SNAPSHOT</version>
2321
</parent>
2422

2523
<artifactId>ratis-assembly</artifactId>
26-
<name>Timecho Ratis based on Apache Project Assembly</name>
24+
<name>Apache Ratis Project Assembly</name>
2725

2826
<packaging>pom</packaging>
2927

@@ -41,7 +39,7 @@
4139

4240
<build>
4341
<plugins>
44-
<!-- licensing info from our dependencies -->
42+
<!-- licensing info from our dependencies -->
4543
<plugin>
4644
<groupId>org.apache.maven.plugins</groupId>
4745
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -189,116 +187,116 @@
189187
<artifactId>ratis-thirdparty-misc</artifactId>
190188
</dependency>
191189
<dependency>
192-
<groupId>com.timecho.ratis</groupId>
190+
<groupId>org.apache.ratis</groupId>
193191
<artifactId>ratis-resource-bundle</artifactId>
194192
<version>${project.version}</version>
195193
<optional>true</optional>
196-
</dependency>
194+
</dependency>
197195
<dependency>
198196
<artifactId>ratis-docs</artifactId>
199-
<groupId>com.timecho.ratis</groupId>
197+
<groupId>org.apache.ratis</groupId>
200198
</dependency>
201199
<dependency>
202200
<artifactId>ratis-proto</artifactId>
203-
<groupId>com.timecho.ratis</groupId>
201+
<groupId>org.apache.ratis</groupId>
204202
</dependency>
205203
<dependency>
206204
<artifactId>ratis-common</artifactId>
207-
<groupId>com.timecho.ratis</groupId>
205+
<groupId>org.apache.ratis</groupId>
208206
</dependency>
209207
<dependency>
210208
<artifactId>ratis-common</artifactId>
211-
<groupId>com.timecho.ratis</groupId>
209+
<groupId>org.apache.ratis</groupId>
212210
<type>test-jar</type>
213211
</dependency>
214212

215213
<dependency>
216214
<artifactId>ratis-client</artifactId>
217-
<groupId>com.timecho.ratis</groupId>
215+
<groupId>org.apache.ratis</groupId>
218216
</dependency>
219217
<dependency>
220218
<artifactId>ratis-client</artifactId>
221-
<groupId>com.timecho.ratis</groupId>
219+
<groupId>org.apache.ratis</groupId>
222220
<type>test-jar</type>
223221
</dependency>
224222
<dependency>
225223
<artifactId>ratis-server-api</artifactId>
226-
<groupId>com.timecho.ratis</groupId>
224+
<groupId>org.apache.ratis</groupId>
227225
</dependency>
228226
<dependency>
229227
<artifactId>ratis-server</artifactId>
230-
<groupId>com.timecho.ratis</groupId>
228+
<groupId>org.apache.ratis</groupId>
231229
</dependency>
232230
<dependency>
233231
<artifactId>ratis-server</artifactId>
234-
<groupId>com.timecho.ratis</groupId>
232+
<groupId>org.apache.ratis</groupId>
235233
<type>test-jar</type>
236234
</dependency>
237235

238236
<dependency>
239237
<artifactId>ratis-grpc</artifactId>
240-
<groupId>com.timecho.ratis</groupId>
238+
<groupId>org.apache.ratis</groupId>
241239
</dependency>
242240
<dependency>
243241
<artifactId>ratis-grpc</artifactId>
244-
<groupId>com.timecho.ratis</groupId>
242+
<groupId>org.apache.ratis</groupId>
245243
<type>test-jar</type>
246244
</dependency>
247245

248246
<dependency>
249247
<artifactId>ratis-netty</artifactId>
250-
<groupId>com.timecho.ratis</groupId>
248+
<groupId>org.apache.ratis</groupId>
251249
</dependency>
252250
<dependency>
253251
<artifactId>ratis-netty</artifactId>
254-
<groupId>com.timecho.ratis</groupId>
252+
<groupId>org.apache.ratis</groupId>
255253
<type>test-jar</type>
256254
</dependency>
257255

258256
<dependency>
259257
<artifactId>ratis-test</artifactId>
260-
<groupId>com.timecho.ratis</groupId>
258+
<groupId>org.apache.ratis</groupId>
261259
</dependency>
262260
<dependency>
263261
<artifactId>ratis-test</artifactId>
264-
<groupId>com.timecho.ratis</groupId>
262+
<groupId>org.apache.ratis</groupId>
265263
<type>test-jar</type>
266264
</dependency>
267265

268266
<dependency>
269267
<artifactId>ratis-examples</artifactId>
270-
<groupId>com.timecho.ratis</groupId>
268+
<groupId>org.apache.ratis</groupId>
271269
</dependency>
272270
<dependency>
273271
<artifactId>ratis-examples</artifactId>
274-
<groupId>com.timecho.ratis</groupId>
272+
<groupId>org.apache.ratis</groupId>
275273
<type>test-jar</type>
276274
</dependency>
277275

278276
<dependency>
279277
<artifactId>ratis-replicated-map</artifactId>
280-
<groupId>com.timecho.ratis</groupId>
278+
<groupId>org.apache.ratis</groupId>
281279
</dependency>
282280
<dependency>
283281
<artifactId>ratis-replicated-map</artifactId>
284-
<groupId>com.timecho.ratis</groupId>
282+
<groupId>org.apache.ratis</groupId>
285283
<type>test-jar</type>
286284
</dependency>
287285

288286
<dependency>
289-
<groupId>com.timecho.ratis</groupId>
287+
<groupId>org.apache.ratis</groupId>
290288
<artifactId>ratis-metrics-api</artifactId>
291289
</dependency>
292290
<dependency>
293-
<groupId>com.timecho.ratis</groupId>
291+
<groupId>org.apache.ratis</groupId>
294292
<artifactId>ratis-metrics-default</artifactId>
295293
</dependency>
296294
<dependency>
297-
<groupId>com.timecho.ratis</groupId>
295+
<groupId>org.apache.ratis</groupId>
298296
<artifactId>ratis-tools</artifactId>
299297
</dependency>
300298
<dependency>
301-
<groupId>com.timecho.ratis</groupId>
299+
<groupId>org.apache.ratis</groupId>
302300
<artifactId>ratis-shell</artifactId>
303301
</dependency>
304302
</dependencies>
@@ -345,8 +343,7 @@
345343
<arguments>
346344
<argument>bash</argument>
347345
<argument>-c</argument>
348-
<argument>cat maven-shared-archive-resources/META-INF/NOTICE `find
349-
${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`</argument>
346+
<argument>cat maven-shared-archive-resources/META-INF/NOTICE `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`</argument>
350347
</arguments>
351348
<outputFile>${project.build.directory}/NOTICE.aggregate</outputFile>
352349
<workingDirectory>${project.build.directory}</workingDirectory>
@@ -358,4 +355,4 @@
358355
</build>
359356
</profile>
360357
</profiles>
361-
</project>
358+
</project>

‎ratis-client/pom.xml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License. See accompanying LICENSE file.
1414
-->
15-
<project xmlns="http://maven.apache.org/POM/4.0.0"
16-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
15+
<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">
1816
<modelVersion>4.0.0</modelVersion>
1917
<parent>
2018
<artifactId>ratis</artifactId>
21-
<groupId>com.timecho.ratis</groupId>
22-
<version>3.2.0</version>
19+
<groupId>org.apache.ratis</groupId>
20+
<version>3.2.0-SNAPSHOT</version>
2321
</parent>
2422

2523
<artifactId>ratis-client</artifactId>
26-
<name>Timecho Ratis based on Apache Client</name>
24+
<name>Apache Ratis Client</name>
2725

2826
<properties>
2927
<!-- no tests in this module so far -->
@@ -37,17 +35,17 @@
3735
</dependency>
3836
<dependency>
3937
<artifactId>ratis-proto</artifactId>
40-
<groupId>com.timecho.ratis</groupId>
38+
<groupId>org.apache.ratis</groupId>
4139
</dependency>
4240

4341
<dependency>
4442
<artifactId>ratis-common</artifactId>
45-
<groupId>com.timecho.ratis</groupId>
43+
<groupId>org.apache.ratis</groupId>
4644
</dependency>
47-
45+
4846
<dependency>
4947
<groupId>org.slf4j</groupId>
5048
<artifactId>slf4j-api</artifactId>
5149
</dependency>
5250
</dependencies>
53-
</project>
51+
</project>

‎ratis-common/pom.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,24 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License. See accompanying LICENSE file.
1414
-->
15-
<project xmlns="http://maven.apache.org/POM/4.0.0"
16-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
15+
<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">
1816
<modelVersion>4.0.0</modelVersion>
1917
<parent>
2018
<artifactId>ratis</artifactId>
21-
<groupId>com.timecho.ratis</groupId>
22-
<version>3.2.0</version>
19+
<groupId>org.apache.ratis</groupId>
20+
<version>3.2.0-SNAPSHOT</version>
2321
</parent>
2422

2523
<artifactId>ratis-common</artifactId>
26-
<name>Timecho Ratis based on Apache Common</name>
24+
<name>Apache Ratis Common</name>
2725

2826
<dependencies>
2927
<dependency>
3028
<groupId>org.apache.ratis</groupId>
3129
<artifactId>ratis-thirdparty-misc</artifactId>
3230
</dependency>
3331
<dependency>
34-
<groupId>com.timecho.ratis</groupId>
32+
<groupId>org.apache.ratis</groupId>
3533
<artifactId>ratis-proto</artifactId>
3634
</dependency>
3735

@@ -72,4 +70,4 @@
7270
<scope>test</scope>
7371
</dependency>
7472
</dependencies>
75-
</project>
73+
</project>

‎ratis-docs/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,23 @@
1313
limitations under the License. See accompanying LICENSE file.
1414
-->
1515
<project xmlns="http://maven.apache.org/POM/4.0.0"
16-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
18+
https://maven.apache.org/xsd/maven-4.0.0.xsd">
1819
<modelVersion>4.0.0</modelVersion>
1920
<parent>
2021
<artifactId>ratis</artifactId>
21-
<groupId>com.timecho.ratis</groupId>
22-
<version>3.2.0</version>
22+
<groupId>org.apache.ratis</groupId>
23+
<version>3.2.0-SNAPSHOT</version>
2324
</parent>
2425

2526
<artifactId>ratis-docs</artifactId>
26-
<name>Timecho Ratis based on Apache Documentation</name>
27+
<name>Apache Ratis Documentation</name>
2728
<packaging>jar</packaging>
2829

2930
<properties>
3031
<!-- no testable code in this module -->
3132
<skipTests>true</skipTests>
3233
</properties>
3334

34-
</project>
35+
</project>

‎ratis-docs/src/main/javadoc/dummy.java‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)