Skip to content

Commit 80482ee

Browse files
authored
optimize: repackage name to org.apache.seata (apache#6298)
1 parent 65ee819 commit 80482ee

File tree

2,086 files changed

+10314
-10363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,086 files changed

+10314
-10363
lines changed

.licenserc.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ header:
7272
- 'saga/seata-saga-statemachine-designer/**'
7373
- '**/src/test/resources/statelang/**'
7474
- 'console/src/main/resources/static/console-fe/**'
75-
- '**/io/seata/sqlparser/antlr/**/*.g4'
76-
- '**/io/seata/sqlparser/antlr/mysql/parser/*'
75+
- '**/org/apache/seata/sqlparser/antlr/**/*.g4'
76+
- '**/org/apache/seata/sqlparser/antlr/mysql/parser/*'
7777
- '**/integration/**/*.proto'
7878
- 'console/src/main/resources/static/**'
7979
- 'ext/apm-seata-skywalking-plugin/config/agent.config'
@@ -88,7 +88,7 @@ dependency:
8888
- saga/seata-saga-statemachine-designer/package.json
8989
- console/src/main/resources/static/console-fe/package.json
9090
excludes:
91-
- name: io.seata:*
91+
- name: org.apache.seata:*
9292
recursive: false
9393
# exclude manually confirmed license
9494
# BSD-3-Clause https://www.npmjs.com/package/universal-canvas-context

all/pom.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,8 @@
644644
<createDependencyReducedPom>true</createDependencyReducedPom>
645645
<artifactSet>
646646
<includes>
647-
<include>io.seata:*</include>
647+
<include>org.apache.seata:*</include>
648+
<include>io.seata:seata-all</include>
648649
</includes>
649650
</artifactSet>
650651
<transformers>
@@ -697,7 +698,8 @@
697698
<keepOptionalDependencies>true</keepOptionalDependencies>
698699
<excludeDependencies>
699700
<!-- Exclude dependencies that need to be shaded. -->
700-
<dependency>io.seata:*</dependency>
701+
<dependency>io.seata:seata-all</dependency>
702+
<dependency>org.apache.seata:*</dependency>
701703
</excludeDependencies>
702704
</configuration>
703705
</plugin>

changes/en-us/2.x.md

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Add changes here for all PR submitted to the 2.x branch.
7272
- [[#6291](https://github.com/apache/incubator-seata/pull/6291)] seata-server is developed in idea and console support output logs
7373
- [[#6283](https://github.com/apache/incubator-seata/pull/6283)] add a compatible module to support io.seata APIs
7474
- [[#6297](https://github.com/apache/incubator-seata/pull/6297)] fix problem of `maven-pmd-plugin`
75+
- [[#6298](https://github.com/apache/incubator-seata/pull/6298)] repackage name to org.apache.seata
7576

7677
### security:
7778
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities

changes/zh-cn/2.x.md

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
- [[#6291](https://github.com/apache/incubator-seata/pull/6291)] 优化seata-server在idea等开发工具运行时,控制台未输出完整日志的问题
7171
- [[#6283](https://github.com/apache/incubator-seata/pull/6283)] 增加兼容模块支持 io.seata APIs
7272
- [[#6297](https://github.com/apache/incubator-seata/pull/6297)] 修复 `maven-pmd-plugin` 相关的问题
73+
- [[#6298](https://github.com/apache/incubator-seata/pull/6298)] 重命名包名为 org.apache.seata
7374

7475
### security:
7576
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本,修复安全漏洞

common/src/main/java/io/seata/common/ConfigurationKeys.java common/src/main/java/org/apache/seata/common/ConfigurationKeys.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common;
17+
package org.apache.seata.common;
1818

1919
/**
2020
* The type Configuration keys.

common/src/main/java/io/seata/common/Constants.java common/src/main/java/org/apache/seata/common/Constants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common;
17+
package org.apache.seata.common;
1818

1919
import java.nio.charset.Charset;
2020

common/src/main/java/io/seata/common/DefaultValues.java common/src/main/java/org/apache/seata/common/DefaultValues.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common;
17+
package org.apache.seata.common;
1818

1919
import java.time.Duration;
2020

common/src/main/java/io/seata/common/LockStrategyMode.java common/src/main/java/org/apache/seata/common/LockStrategyMode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common;
17+
package org.apache.seata.common;
1818

1919
/**
2020
* @funkye

common/src/main/java/io/seata/common/XID.java common/src/main/java/org/apache/seata/common/XID.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common;
17+
package org.apache.seata.common;
1818

19-
import static io.seata.common.Constants.IP_PORT_SPLIT_CHAR;
19+
import static org.apache.seata.common.Constants.IP_PORT_SPLIT_CHAR;
2020

2121
/**
2222
* The type Xid.

common/src/main/java/io/seata/common/exception/AuthenticationFailedException.java common/src/main/java/org/apache/seata/common/exception/AuthenticationFailedException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919

2020
/**

common/src/main/java/io/seata/common/exception/DataAccessException.java common/src/main/java/org/apache/seata/common/exception/DataAccessException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
* the data access exception

common/src/main/java/io/seata/common/exception/EurekaRegistryException.java common/src/main/java/org/apache/seata/common/exception/EurekaRegistryException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
* eureka registry exception

common/src/main/java/io/seata/common/exception/FrameworkErrorCode.java common/src/main/java/org/apache/seata/common/exception/FrameworkErrorCode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
* The enum Framework error code.

common/src/main/java/io/seata/common/exception/FrameworkException.java common/src/main/java/org/apache/seata/common/exception/FrameworkException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
import java.sql.SQLException;
2020

common/src/main/java/io/seata/common/exception/JsonParseException.java common/src/main/java/org/apache/seata/common/exception/JsonParseException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
*/

common/src/main/java/io/seata/common/exception/NotSupportYetException.java common/src/main/java/org/apache/seata/common/exception/NotSupportYetException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
* The type Not support yet exception.

common/src/main/java/io/seata/common/exception/RedisException.java common/src/main/java/org/apache/seata/common/exception/RedisException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
* The redis operate exception

common/src/main/java/io/seata/common/exception/RetryableException.java common/src/main/java/org/apache/seata/common/exception/RetryableException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919

2020

common/src/main/java/io/seata/common/exception/ShouldNeverHappenException.java common/src/main/java/org/apache/seata/common/exception/ShouldNeverHappenException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
* The type Should never happen exception.

common/src/main/java/io/seata/common/exception/SkipCallbackWrapperException.java common/src/main/java/org/apache/seata/common/exception/SkipCallbackWrapperException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
* Skip Callback Wrapper Exception.

common/src/main/java/io/seata/common/exception/StoreException.java common/src/main/java/org/apache/seata/common/exception/StoreException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.exception;
17+
package org.apache.seata.common.exception;
1818

1919
/**
2020
* the store exception

common/src/main/java/io/seata/common/executor/Callback.java common/src/main/java/org/apache/seata/common/executor/Callback.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.executor;
17+
package org.apache.seata.common.executor;
1818

1919
/**
2020
* The interface Callback.

common/src/main/java/io/seata/common/executor/Initialize.java common/src/main/java/org/apache/seata/common/executor/Initialize.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.executor;
17+
package org.apache.seata.common.executor;
1818

1919
/**
2020
* The interface Initialize.

common/src/main/java/io/seata/common/holder/ObjectHolder.java common/src/main/java/org/apache/seata/common/holder/ObjectHolder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.holder;
17+
package org.apache.seata.common.holder;
1818

1919
import java.util.Map;
2020
import java.util.concurrent.ConcurrentHashMap;
2121

22-
import io.seata.common.exception.ShouldNeverHappenException;
22+
import org.apache.seata.common.exception.ShouldNeverHappenException;
2323

2424
/**
2525
* The enum object holder

common/src/main/java/io/seata/common/io/FileLoader.java common/src/main/java/org/apache/seata/common/io/FileLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.io;
17+
package org.apache.seata.common.io;
1818

1919
import org.slf4j.Logger;
2020
import org.slf4j.LoggerFactory;

common/src/main/java/io/seata/common/loader/EnhancedServiceLoader.java common/src/main/java/org/apache/seata/common/loader/EnhancedServiceLoader.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.loader;
17+
package org.apache.seata.common.loader;
1818

1919
import java.io.BufferedReader;
2020
import java.io.IOException;
@@ -30,10 +30,10 @@
3030
import java.util.concurrent.ConcurrentMap;
3131
import java.util.stream.Collectors;
3232

33-
import io.seata.common.Constants;
34-
import io.seata.common.executor.Initialize;
35-
import io.seata.common.util.CollectionUtils;
36-
import io.seata.common.util.StringUtils;
33+
import org.apache.seata.common.Constants;
34+
import org.apache.seata.common.executor.Initialize;
35+
import org.apache.seata.common.util.CollectionUtils;
36+
import org.apache.seata.common.util.StringUtils;
3737
import org.apache.commons.lang.exception.ExceptionUtils;
3838
import org.slf4j.Logger;
3939
import org.slf4j.LoggerFactory;

common/src/main/java/io/seata/common/loader/EnhancedServiceNotFoundException.java common/src/main/java/org/apache/seata/common/loader/EnhancedServiceNotFoundException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.loader;
17+
package org.apache.seata.common.loader;
1818

1919
import org.apache.commons.lang.exception.NestableRuntimeException;
2020

common/src/main/java/io/seata/common/loader/ExtensionDefinition.java common/src/main/java/org/apache/seata/common/loader/ExtensionDefinition.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.loader;
17+
package org.apache.seata.common.loader;
1818

19-
import io.seata.common.util.StringUtils;
19+
import org.apache.seata.common.util.StringUtils;
2020

2121
/**
2222
* The type ExtensionDefinition

common/src/main/java/io/seata/common/loader/LoadLevel.java common/src/main/java/org/apache/seata/common/loader/LoadLevel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.loader;
17+
package org.apache.seata.common.loader;
1818

1919
import java.lang.annotation.Documented;
2020
import java.lang.annotation.ElementType;

common/src/main/java/io/seata/common/loader/Scope.java common/src/main/java/org/apache/seata/common/loader/Scope.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.loader;
17+
package org.apache.seata.common.loader;
1818

1919
/**
2020
* the scope of the extension

common/src/main/java/io/seata/common/metadata/ClusterRole.java common/src/main/java/org/apache/seata/common/metadata/ClusterRole.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.metadata;
17+
package org.apache.seata.common.metadata;
1818

1919
/**
2020
*/

common/src/main/java/io/seata/common/metadata/Metadata.java common/src/main/java/org/apache/seata/common/metadata/Metadata.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.metadata;
17+
package org.apache.seata.common.metadata;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -24,8 +24,8 @@
2424
import java.util.concurrent.ConcurrentHashMap;
2525
import java.util.concurrent.ThreadLocalRandom;
2626

27-
import io.seata.common.store.StoreMode;
28-
import io.seata.common.util.StringUtils;
27+
import org.apache.seata.common.store.StoreMode;
28+
import org.apache.seata.common.util.StringUtils;
2929

3030
/**
3131
*/

common/src/main/java/io/seata/common/metadata/MetadataResponse.java common/src/main/java/org/apache/seata/common/metadata/MetadataResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.metadata;
17+
package org.apache.seata.common.metadata;
1818

1919
import java.util.List;
2020

common/src/main/java/io/seata/common/metadata/Node.java common/src/main/java/org/apache/seata/common/metadata/Node.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.metadata;
17+
package org.apache.seata.common.metadata;
1818

1919
import java.util.HashMap;
2020
import java.util.Map;

common/src/main/java/io/seata/common/rpc/RpcStatus.java common/src/main/java/org/apache/seata/common/rpc/RpcStatus.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.rpc;
17+
package org.apache.seata.common.rpc;
1818

1919
import java.util.concurrent.ConcurrentHashMap;
2020
import java.util.concurrent.ConcurrentMap;

common/src/main/java/io/seata/common/store/StoreMode.java common/src/main/java/org/apache/seata/common/store/StoreMode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.store;
17+
package org.apache.seata.common.store;
1818

1919
/**
2020
* transaction log store mode

common/src/main/java/io/seata/common/thread/NamedThreadFactory.java common/src/main/java/org/apache/seata/common/thread/NamedThreadFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package io.seata.common.thread;
17+
package org.apache.seata.common.thread;
1818

1919
import java.util.Map;
2020
import java.util.concurrent.ConcurrentHashMap;
2121
import java.util.concurrent.ThreadFactory;
2222
import java.util.concurrent.atomic.AtomicInteger;
2323

2424
import io.netty.util.concurrent.FastThreadLocalThread;
25-
import io.seata.common.util.CollectionUtils;
25+
import org.apache.seata.common.util.CollectionUtils;
2626

2727
/**
2828
* The type Named thread factory.

0 commit comments

Comments
 (0)