Skip to content

Commit

Permalink
change package name and artifact id
Browse files Browse the repository at this point in the history
Signed-off-by: lilai <[email protected]>
  • Loading branch information
lilai23 committed Apr 28, 2024
1 parent af3dbc5 commit cb07b10
Show file tree
Hide file tree
Showing 3,222 changed files with 64,334 additions and 64,770 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions .github/actions/common/spring/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ runs:
if: matrix.springCloudVersion == '2020.0.0' || matrix.springCloudVersion == '2021.0.0' || matrix.springCloudVersion == '2021.0.3'
shell: bash
run: |
mv sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/com/huaweicloud/spring/feign/api/configuration/FeignClientSslConfigurationLowVersion.java sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/com/huaweicloud/spring/feign/api/configuration/FeignClientSslConfigurationLowVersion.java.lowVersion
mv sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/com/huaweicloud/spring/feign/api/configuration/FeignClientSslConfigurationHighVersion.java.highVersion sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/com/huaweicloud/spring/feign/api/configuration/FeignClientSslConfigurationHighVersion.java
ls sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/com/huaweicloud/spring/feign/api/configuration
mv sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/io/sermant/spring/feign/api/configuration/FeignClientSslConfigurationLowVersion.java sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/io/sermant/spring/feign/api/configuration/FeignClientSslConfigurationLowVersion.java.lowVersion
mv sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/io/sermant/spring/feign/api/configuration/FeignClientSslConfigurationHighVersion.java.highVersion sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/io/sermant/spring/feign/api/configuration/FeignClientSslConfigurationHighVersion.java
ls sermant-integration-tests/spring-test/spring-common-demos/spring-common-feign/feign-api/src/main/java/io/sermant/spring/feign/api/configuration
2 changes: 0 additions & 2 deletions .github/actions/scenarios/dubbo/visibility/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ runs:
DUBBO_PROTOCOL_PORT: 28854
VISIBILITY_SERVICE_FLAG: true
VISIBILITY_CONFIG_START_FLAG: true
AGENT_CONFIG_SERVICE_BLACK_LIST: com.huaweicloud.sermant.implement.service.tracing.TracingServiceImpl
run: |
nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=dubbo-integration-provider -jar \
sermant-integration-tests/dubbo-test/dubbo-${{ env.projectPath }}-integration-provider/target/dubbo-integration-provider.jar > ${{ env.logDir }}/visibility-provider.log 2>&1 &
Expand All @@ -41,7 +40,6 @@ runs:
DUBBO_PROTOCOL_PORT: 28850
VISIBILITY_SERVICE_VERSION: 12345
VISIBILITY_CONFIG_START_FLAG: true
AGENT_CONFIG_SERVICE_BLACK_LIST: com.huaweicloud.sermant.implement.service.tracing.TracingServiceImpl
run: |
nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=dubbo-integration-consumer -jar \
sermant-integration-tests/dubbo-test/dubbo-${{ env.projectPath }}-integration-consumer/target/dubbo-integration-consumer.jar > ${{ env.logDir }}/visibility-consumer.log 2>&1 &
Expand Down
2 changes: 0 additions & 2 deletions .github/actions/scenarios/spring/visibility/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ runs:
env:
VISIBILITY_SERVICE_FLAG: true
VISIBILITY_CONFIG_START_FLAG: true
AGENT_CONFIG_SERVICE_BLACK_LIST: com.huaweicloud.sermant.implement.service.tracing.TracingServiceImpl
run: |
nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=default -Dservice.meta.application=feign -Dserver.port=8013 -jar \
-Dsermant_log_dir=${{ env.logDir }}/feign-provider${{ env.tailVersion }} -Dconfig.retry.sleepMs=20 \
Expand All @@ -35,7 +34,6 @@ runs:
env:
VISIBILITY_SERVICE_FLAG: true
VISIBILITY_CONFIG_START_FLAG: true
AGENT_CONFIG_SERVICE_BLACK_LIST: com.huaweicloud.sermant.implement.service.tracing.TracingServiceImpl
run: |
nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=default -Dservice.meta.application=feign -Dserver.port=8015 -jar \
-Dsermant_log_dir=${{ env.logDir }}/feign-consumer${{ env.tailVersion }} -Dservicecomb.service.openMigration=true -Dservicecomb.service.enableSpringRegister=true \
Expand Down
4 changes: 0 additions & 4 deletions Sermant-CodeStyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
<value>
<package name="" withSubpackages="true" static="true" />
<emptyLine />
<package name="com.huawei" withSubpackages="true" static="false" />
<emptyLine />
<package name="com.huaweicloud" withSubpackages="true" static="false" />
<emptyLine />
<package name="com" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
Expand Down
4 changes: 2 additions & 2 deletions checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@
<!-- 不能有无用的import -->
<module name="UnusedImports"/>
<module name="ImportOrder">
<property name="groups" value="android,androidx,com.android,huawei,com.huawei,com.huaweicloud,com,*,net,org,javacard,/^java\./,javax"/>
<property name="groups" value="android,androidx,com.android,huawei,com,*,net,org,javacard,/^java\./,javax"/>
<property name="ordered" value="true"/>
<property name="separated" value="true"/>
<property name="option" value="top"/>
Expand Down Expand Up @@ -515,7 +515,7 @@
</module>
<module name="PackageName">
<!-- 包名检查 -->
<property name="format" value="(^com.huawei(\.[a-z][a-z0-9]*)*$)|(^com.huaweicloud(\.[a-z][a-z0-9]*)*$)"/>
<property name="format" value="(^io.sermant(\.[a-z][a-z0-9]*)*$)|(^com.example(\.[a-z][a-z0-9]*)*$)"/>
</module>
<module name="ParameterName">
<!-- 参数检查: -->
Expand Down
7 changes: 3 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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>
<groupId>com.huaweicloud.sermant</groupId>
<groupId>io.sermant</groupId>
<artifactId>sermant</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>
Expand Down Expand Up @@ -93,7 +93,6 @@
<package.license.ftl.file>third-party-license.ftl</package.license.ftl.file>
<package.resources.dir>sermant-package/resources</package.resources.dir>

<shade.common.prefix>com.huaweicloud.sermant.dependencies</shade.common.prefix>
<shade.distinct.prefix>${project.artifactId}</shade.distinct.prefix>

<license.binary.suffix.file>LICENSE-binary-suffix.txt</license.binary.suffix.file>
Expand All @@ -106,12 +105,12 @@
<version>${org.jacoco.version}</version>
</dependency>
<dependency>
<groupId>com.huaweicloud.sermant</groupId>
<groupId>io.sermant</groupId>
<artifactId>sermant-agentcore-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.huaweicloud.sermant</groupId>
<groupId>io.sermant</groupId>
<artifactId>sermant-common</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
Loading

0 comments on commit cb07b10

Please sign in to comment.