+
Skip to content

Revert "Release timecho 3.2.0" #2

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

Merged
merged 1 commit into from
Jul 4, 2025
Merged

Revert "Release timecho 3.2.0" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 48 additions & 103 deletions pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

67 changes: 32 additions & 35 deletions ratis-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ratis</artifactId>
<groupId>com.timecho.ratis</groupId>
<version>3.2.0</version>
<groupId>org.apache.ratis</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>ratis-assembly</artifactId>
<name>Timecho Ratis based on Apache Project Assembly</name>
<name>Apache Ratis Project Assembly</name>

<packaging>pom</packaging>

Expand All @@ -41,7 +39,7 @@

<build>
<plugins>
<!-- licensing info from our dependencies -->
<!-- licensing info from our dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
Expand Down Expand Up @@ -189,116 +187,116 @@
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
<dependency>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-resource-bundle</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
</dependency>
<dependency>
<artifactId>ratis-docs</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-proto</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-common</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-common</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<type>test-jar</type>
</dependency>

<dependency>
<artifactId>ratis-client</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-client</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<type>test-jar</type>
</dependency>
<dependency>
<artifactId>ratis-server-api</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-server</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-server</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<type>test-jar</type>
</dependency>

<dependency>
<artifactId>ratis-grpc</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-grpc</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<type>test-jar</type>
</dependency>

<dependency>
<artifactId>ratis-netty</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-netty</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<type>test-jar</type>
</dependency>

<dependency>
<artifactId>ratis-test</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-test</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<type>test-jar</type>
</dependency>

<dependency>
<artifactId>ratis-examples</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-examples</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<type>test-jar</type>
</dependency>

<dependency>
<artifactId>ratis-replicated-map</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-replicated-map</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-metrics-api</artifactId>
</dependency>
<dependency>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-metrics-default</artifactId>
</dependency>
<dependency>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-tools</artifactId>
</dependency>
<dependency>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-shell</artifactId>
</dependency>
</dependencies>
Expand Down Expand Up @@ -345,8 +343,7 @@
<arguments>
<argument>bash</argument>
<argument>-c</argument>
<argument>cat maven-shared-archive-resources/META-INF/NOTICE `find
${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`</argument>
<argument>cat maven-shared-archive-resources/META-INF/NOTICE `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`</argument>
</arguments>
<outputFile>${project.build.directory}/NOTICE.aggregate</outputFile>
<workingDirectory>${project.build.directory}</workingDirectory>
Expand All @@ -358,4 +355,4 @@
</build>
</profile>
</profiles>
</project>
</project>
18 changes: 8 additions & 10 deletions ratis-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ratis</artifactId>
<groupId>com.timecho.ratis</groupId>
<version>3.2.0</version>
<groupId>org.apache.ratis</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>ratis-client</artifactId>
<name>Timecho Ratis based on Apache Client</name>
<name>Apache Ratis Client</name>

<properties>
<!-- no tests in this module so far -->
Expand All @@ -37,17 +35,17 @@
</dependency>
<dependency>
<artifactId>ratis-proto</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>

<dependency>
<artifactId>ratis-common</artifactId>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>
</project>
14 changes: 6 additions & 8 deletions ratis-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,24 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ratis</artifactId>
<groupId>com.timecho.ratis</groupId>
<version>3.2.0</version>
<groupId>org.apache.ratis</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>ratis-common</artifactId>
<name>Timecho Ratis based on Apache Common</name>
<name>Apache Ratis Common</name>

<dependencies>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
<dependency>
<groupId>com.timecho.ratis</groupId>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-proto</artifactId>
</dependency>

Expand Down Expand Up @@ -72,4 +70,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
13 changes: 7 additions & 6 deletions ratis-docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,23 @@
limitations under the License. See accompanying LICENSE file.
-->
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ratis</artifactId>
<groupId>com.timecho.ratis</groupId>
<version>3.2.0</version>
<groupId>org.apache.ratis</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>ratis-docs</artifactId>
<name>Timecho Ratis based on Apache Documentation</name>
<name>Apache Ratis Documentation</name>
<packaging>jar</packaging>

<properties>
<!-- no testable code in this module -->
<skipTests>true</skipTests>
</properties>

</project>
</project>
30 changes: 0 additions & 30 deletions ratis-docs/src/main/javadoc/dummy.java
View file
Open in desktop

This file was deleted.

Loading
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载