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.

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

optimize: merge the packaging processes of namingserver and seata-server #6819

Merged
merged 29 commits into from
Sep 9, 2024

Conversation

funky-eyes
Copy link
Contributor

@funky-eyes funky-eyes commented Sep 5, 2024

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

目录结构
directory structure
image

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@funky-eyes funky-eyes changed the title optimize: merge the packaging processes of Naming Server and Seata Server optimize: merge the packaging processes of namingserver and seata-server Sep 5, 2024
Copy link

codecov bot commented Sep 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.43%. Comparing base (e57fa54) to head (8c4c38e).
Report is 1 commits behind head on 2.x.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##                2.x    #6819   +/-   ##
=========================================
  Coverage     52.42%   52.43%           
  Complexity     6380     6380           
=========================================
  Files          1080     1080           
  Lines         37558    37558           
  Branches       4452     4450    -2     
=========================================
+ Hits          19689    19692    +3     
+ Misses        15919    15917    -2     
+ Partials       1950     1949    -1     

see 4 files with indirect coverage changes

Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -264,6 +264,8 @@
<include>**/*.def</include>
</includes>
<excludes>
<exclude>**/script/**</exclude>
<exclude>**/generated/**</exclude>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

duplicate with L269.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

.asf.yaml Outdated Show resolved Hide resolved
pom.xml Show resolved Hide resolved
Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@funky-eyes Can the apache-seata folder be removed, or is there another purpose for it later on?

@slievrly
Copy link
Member

slievrly commented Sep 9, 2024

2.1.0:

└── apache-seata-2.1.0-incubating-bin
├── DISCLAIMER
├── Dockerfile
├── LICENSE
├── NOTICE
├── lib
│   ├── DmJdbcDriver18-8.1.2.192.jar
│   ├── HikariCP-4.0.3.jar
│   ├── animal-sniffer-annotations-1.18.jar
│   ├── annotations-4.1.1.4.jar
│   ├── ant-launcher-1.10.12.jar
│   ├── antlr-2.7.7.jar
│   ├── aopalliance-1.0.jar
│   ├── apollo-client-2.0.1.jar
│   ├── audience-annotations-0.12.0.jar
│   ├── bolt-1.6.7.jar
│   ├── checker-qual-3.5.0.jar
│   ├── commons-codec-1.15.jar
│   ├── commons-configuration-1.10.jar
│   ├── commons-io-2.8.0.jar
│   ├── commons-jxpath-1.3.jar
│   ├── commons-lang-2.6.jar
│   ├── commons-logging-1.2.jar
│   ├── commons-math-2.2.jar
│   ├── config-1.2.1.jar
│   ├── consul-api-1.4.2.jar
│   ├── dexx-collections-0.2.jar
│   ├── eureka-client-1.10.18.jar
│   ├── failureaccess-1.0.1.jar
│   ├── fastjson-1.2.83.jar
│   ├── grpc-context-1.27.1.jar
│   ├── grpc-core-1.27.1.jar
│   ├── grpc-grpclb-1.27.1.jar
│   ├── grpc-protobuf-1.27.1.jar
│   ├── grpc-protobuf-lite-1.27.1.jar
│   ├── gson-2.9.1.jar
│   ├── guava-32.1.3-jre.jar
│   ├── guice-5.0.1.jar
│   ├── h2-2.1.214.jar
│   ├── hessian-4.0.63.jar
│   ├── httpasyncclient-4.1.5.jar
│   ├── httpclient-4.5.14.jar
│   ├── httpcore-nio-4.4.16.jar
│   ├── jackson-annotations-2.13.5.jar
│   ├── jackson-databind-2.13.5.jar
│   ├── jackson-datatype-jdk8-2.13.5.jar
│   ├── jackson-module-parameter-names-2.13.5.jar
│   ├── javax.inject-1.jar
│   ├── jcommander-1.82.jar
│   ├── jctools-core-2.1.1.jar
│   ├── jedis-3.8.0.jar
│   ├── jersey-apache-client4-1.19.1.jar
│   ├── jersey-core-1.19.1.jar
│   ├── jetcd-common-0.5.0.jar
│   ├── jetcd-resolver-0.5.0.jar
│   ├── jettison-1.5.4.jar
│   ├── jjwt-api-0.10.5.jar
│   ├── jjwt-jackson-0.10.5.jar
│   ├── jna-5.5.0.jar
│   ├── joda-time-2.3.jar
│   ├── jraft-core-1.3.14.jar
│   ├── jsr305-3.0.2.jar
│   ├── jsr311-api-1.1.1.jar
│   ├── kryo-5.4.0.jar
│   ├── kryo-serializers-0.45.jar
│   ├── logback-classic-1.2.12.jar
│   ├── logback-kafka-appender-0.2.0-RC2.jar
│   ├── logstash-logback-encoder-6.5.jar
│   ├── lz4-java-1.7.1.jar
│   ├── metrics-core-4.2.21.jar
│   ├── minlog-1.3.1.jar
│   ├── mxparser-1.2.2.jar
│   ├── nacos-api-1.4.6.jar
│   ├── nacos-common-1.4.6.jar
│   ├── netflix-eventbus-0.3.0.jar
│   ├── netflix-infix-0.3.0.jar
│   ├── netty-buffer-4.1.100.Final.jar
│   ├── netty-codec-4.1.100.Final.jar
│   ├── netty-codec-dns-4.1.100.Final.jar
│   ├── netty-codec-haproxy-4.1.100.Final.jar
│   ├── netty-codec-http2-4.1.100.Final.jar
│   ├── netty-codec-memcache-4.1.100.Final.jar
│   ├── netty-codec-redis-4.1.100.Final.jar
│   ├── netty-codec-stomp-4.1.100.Final.jar
│   ├── netty-codec-xml-4.1.100.Final.jar
│   ├── netty-common-4.1.100.Final.jar
│   ├── netty-handler-ssl-ocsp-4.1.100.Final.jar
│   ├── netty-resolver-4.1.100.Final.jar
│   ├── netty-resolver-dns-classes-macos-4.1.100.Final.jar
│   ├── netty-resolver-dns-native-macos-4.1.100.Final-osx-aarch_64.jar
│   ├── netty-resolver-dns-native-macos-4.1.100.Final-osx-x86_64.jar
│   ├── netty-transport-4.1.100.Final.jar
│   ├── netty-transport-classes-epoll-4.1.100.Final.jar
│   ├── netty-transport-classes-kqueue-4.1.100.Final.jar
│   ├── netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
│   ├── netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
│   ├── netty-transport-native-kqueue-4.1.100.Final-osx-aarch_64.jar
│   ├── netty-transport-native-kqueue-4.1.100.Final-osx-x86_64.jar
│   ├── netty-transport-rxtx-4.1.100.Final.jar
│   ├── netty-transport-sctp-4.1.100.Final.jar
│   ├── netty-transport-udt-4.1.100.Final.jar
│   ├── perfmark-api-0.19.0.jar
│   ├── postgresql-42.3.8.jar
│   ├── proto-google-common-protos-1.17.0.jar
│   ├── reflectasm-1.11.9.jar
│   ├── registry-client-all-6.3.0.jar
│   ├── seata-compressor-all-2.1.0.jar
│   ├── seata-compressor-bzip2-2.1.0.jar
│   ├── seata-compressor-deflater-2.1.0.jar
│   ├── seata-compressor-gzip-2.1.0.jar
│   ├── seata-compressor-lz4-2.1.0.jar
│   ├── seata-compressor-zip-2.1.0.jar
│   ├── seata-compressor-zstd-2.1.0.jar
│   ├── seata-config-all-2.1.0.jar
│   ├── seata-config-consul-2.1.0.jar
│   ├── seata-config-core-2.1.0.jar
│   ├── seata-config-etcd3-2.1.0.jar
│   ├── seata-config-nacos-2.1.0.jar
│   ├── seata-config-zk-2.1.0.jar
│   ├── seata-core-2.1.0.jar
│   ├── seata-discovery-all-2.1.0.jar
│   ├── seata-discovery-consul-2.1.0.jar
│   ├── seata-discovery-custom-2.1.0.jar
│   ├── seata-discovery-etcd3-2.1.0.jar
│   ├── seata-discovery-eureka-2.1.0.jar
│   ├── seata-discovery-nacos-2.1.0.jar
│   ├── seata-discovery-redis-2.1.0.jar
│   ├── seata-discovery-sofa-2.1.0.jar
│   ├── seata-discovery-zk-2.1.0.jar
│   ├── seata-metrics-all-2.1.0.jar
│   ├── seata-metrics-api-2.1.0.jar
│   ├── seata-metrics-core-2.1.0.jar
│   ├── seata-serializer-all-2.1.0.jar
│   ├── seata-serializer-hessian-2.1.0.jar
│   ├── seata-serializer-kryo-2.1.0.jar
│   ├── seata-serializer-protobuf-2.1.0.jar
│   ├── seata-serializer-seata-2.1.0.jar
│   ├── servo-core-0.12.21.jar
│   ├── simpleclient-0.15.0.jar
│   ├── simpleclient_common-0.15.0.jar
│   ├── simpleclient_tracer_common-0.15.0.jar
│   ├── simpleclient_tracer_otel-0.15.0.jar
│   ├── simpleclient_tracer_otel_agent-0.15.0.jar
│   ├── snakeyaml-2.0.jar
│   ├── snappy-java-1.1.10.5.jar
│   ├── sofa-common-tools-1.0.12.jar
│   ├── spring-aop-5.3.30.jar
│   ├── spring-beans-5.3.30.jar
│   ├── spring-boot-autoconfigure-2.7.17.jar
│   ├── spring-boot-starter-logging-2.7.17.jar
│   ├── spring-boot-starter-security-2.7.17.jar
│   ├── spring-boot-starter-tomcat-2.7.17.jar
│   ├── spring-boot-starter-web-2.7.17.jar
│   ├── spring-context-5.3.30.jar
│   ├── spring-core-5.3.30.jar
│   ├── spring-expression-5.3.30.jar
│   ├── spring-jcl-5.3.30.jar
│   ├── spring-security-config-5.7.11.jar
│   ├── spring-security-web-5.7.11.jar
│   ├── stringtemplate-3.2.1.jar
│   ├── tomcat-embed-core-9.0.83.jar
│   ├── tomcat-embed-el-9.0.82.jar
│   ├── tomcat-embed-websocket-9.0.82.jar
│   ├── zkclient-0.11.jar
│   ├── zookeeper-3.7.2.jar
│   ├── zstd-jni-1.5.0-4.jar
│   ├── ant-1.10.12.jar
│   ├── antlr-runtime-3.4.jar
│   ├── apollo-core-2.0.1.jar
│   ├── archaius-core-0.7.6.jar
│   ├── asm-6.0.jar
│   ├── commons-compiler-3.1.10.jar
│   ├── commons-dbcp2-2.9.0.jar
│   ├── commons-pool-1.6.jar
│   ├── commons-pool2-2.11.1.jar
│   ├── compactmap-2.0.jar
│   ├── disruptor-3.3.7.jar
│   ├── druid-1.2.7.jar
│   ├── error_prone_annotations-2.21.1.jar
│   ├── failsafe-2.3.3.jar
│   ├── grpc-api-1.27.1.jar
│   ├── grpc-netty-1.27.1.jar
│   ├── grpc-stub-1.27.1.jar
│   ├── hessian-4.0.3.jar
│   ├── httpcore-4.4.16.jar
│   ├── j2objc-annotations-2.8.jar
│   ├── jackson-core-2.13.5.jar
│   ├── jackson-datatype-jsr310-2.13.5.jar
│   ├── jakarta.annotation-api-1.3.5.jar
│   ├── janino-3.1.10.jar
│   ├── javax.servlet-api-4.0.1.jar
│   ├── jersey-client-1.19.1.jar
│   ├── jetcd-core-0.5.0.jar
│   ├── jjwt-impl-0.10.5.jar
│   ├── jul-to-slf4j-1.7.36.jar
│   ├── kafka-clients-3.6.1.jar
│   ├── logback-core-1.2.12.jar
│   ├── nacos-client-1.4.6.jar
│   ├── netty-all-4.1.100.Final.jar
│   ├── netty-codec-http-4.1.100.Final.jar
│   ├── netty-codec-mqtt-4.1.100.Final.jar
│   ├── netty-codec-smtp-4.1.100.Final.jar
│   ├── netty-codec-socks-4.1.100.Final.jar
│   ├── netty-handler-4.1.100.Final.jar
│   ├── netty-handler-proxy-4.1.100.Final.jar
│   ├── netty-resolver-dns-4.1.100.Final.jar
│   ├── netty-transport-native-unix-common-4.1.100.Final.jar
│   ├── objenesis-3.2.jar
│   ├── protobuf-java-3.16.3.jar
│   ├── protobuf-java-util-3.11.0.jar
│   ├── rocksdbjni-8.8.1.jar
│   ├── seata-common-2.1.0.jar
│   ├── seata-config-apollo-2.1.0.jar
│   ├── seata-config-spring-cloud-2.1.0.jar
│   ├── seata-console-2.1.0.jar
│   ├── seata-discovery-core-2.1.0.jar
│   ├── seata-metrics-exporter-prometheus-2.1.0.jar
│   ├── seata-metrics-registry-compact-2.1.0.jar
│   ├── seata-spring-autoconfigure-core-2.1.0.jar
│   ├── seata-spring-autoconfigure-server-2.1.0.jar
│   ├── simpleclient_httpserver-0.15.0.jar
│   ├── slf4j-api-1.7.36.jar
│   ├── spring-boot-2.7.17.jar
│   ├── spring-boot-starter-2.7.17.jar
│   ├── spring-boot-starter-json-2.7.17.jar
│   ├── spring-security-core-5.7.11.jar
│   ├── spring-security-crypto-5.7.11.jar
│   ├── spring-web-5.3.30.jar
│   ├── spring-webmvc-5.3.30.jar
│   ├── tomcat-annotations-api-9.0.82.jar
│   ├── xstream-1.4.20.jar
│   ├── zookeeper-jute-3.7.2.jar
│   └── jdbc
├── conf
│   ├── application.raft.example.yml
│   ├── application.yml
│   ├── logback-spring.xml
│   ├── application.example.yml
│   └── logback
├── ext
│   └── apm-skywalking
├── target
│   └── seata-server.jar
├── script
│   ├── logstash
│   ├── server
│   └── config-center
├── logs
└── bin
├── seata-server.bat
├── seata-server.sh
├── seata-setup.sh
├── sessionStore

Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@funky-eyes funky-eyes merged commit 5fa41c5 into apache:2.x Sep 9, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants