Skip to content

Commit d21ee97

Browse files
SkyeBeFreemanSkyeBeFreeman
authored
feat:upgrade polaris-all maven shade configuration. (#584)
1 parent 8fd21ef commit d21ee97

File tree

68 files changed

+358
-654
lines changed

Some content is hidden

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

68 files changed

+358
-654
lines changed

‎polaris-assembly/polaris-assembly-client/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
66
<artifactId>polaris-assembly</artifactId>
77
<groupId>com.tencent.polaris</groupId>
@@ -20,12 +20,6 @@
2020
<artifactId>polaris-assembly-api</artifactId>
2121
<version>${project.version}</version>
2222
</dependency>
23-
<dependency>
24-
<groupId>org.slf4j</groupId>
25-
<artifactId>slf4j-api</artifactId>
26-
<version>${slf4j.version}</version>
27-
<scope>provided</scope>
28-
</dependency>
2923
<dependency>
3024
<groupId>com.tencent.polaris</groupId>
3125
<artifactId>polaris-discovery-client</artifactId>

‎polaris-auth/polaris-auth-client/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,5 @@
2020
<artifactId>polaris-auth-api</artifactId>
2121
<version>${project.version}</version>
2222
</dependency>
23-
24-
<dependency>
25-
<groupId>org.slf4j</groupId>
26-
<artifactId>slf4j-api</artifactId>
27-
<version>${slf4j.version}</version>
28-
<scope>provided</scope>
29-
</dependency>
3023
</dependencies>
3124
</project>

‎polaris-auth/polaris-auth-factory/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,5 @@
3030
<artifactId>polaris-client</artifactId>
3131
<version>${project.version}</version>
3232
</dependency>
33-
<dependency>
34-
<groupId>org.slf4j</groupId>
35-
<artifactId>slf4j-api</artifactId>
36-
<version>${slf4j.version}</version>
37-
<scope>provided</scope>
38-
</dependency>
3933
</dependencies>
4034
</project>

‎polaris-circuitbreaker/polaris-circuitbreaker-client/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
66
<artifactId>polaris-circuitbreaker</artifactId>
77
<groupId>com.tencent.polaris</groupId>
@@ -21,12 +21,6 @@
2121
<artifactId>polaris-client</artifactId>
2222
<version>${project.version}</version>
2323
</dependency>
24-
<dependency>
25-
<groupId>org.slf4j</groupId>
26-
<artifactId>slf4j-api</artifactId>
27-
<version>${slf4j.version}</version>
28-
<scope>provided</scope>
29-
</dependency>
3024
<dependency>
3125
<groupId>com.tencent.polaris</groupId>
3226
<artifactId>polaris-circuitbreaker-api</artifactId>

‎polaris-circuitbreaker/polaris-circuitbreaker-factory/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,5 @@
153153
<version>${project.version}</version>
154154
<scope>test</scope>
155155
</dependency>
156-
157-
<dependency>
158-
<groupId>org.slf4j</groupId>
159-
<artifactId>slf4j-api</artifactId>
160-
<version>${slf4j.version}</version>
161-
<scope>provided</scope>
162-
</dependency>
163156
</dependencies>
164157
</project>

‎polaris-common/polaris-client/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
66
<artifactId>polaris-common</artifactId>
77
<groupId>com.tencent.polaris</groupId>
@@ -26,12 +26,6 @@
2626
<artifactId>polaris-logging</artifactId>
2727
<version>${project.version}</version>
2828
</dependency>
29-
<dependency>
30-
<groupId>org.slf4j</groupId>
31-
<artifactId>slf4j-api</artifactId>
32-
<version>${slf4j.version}</version>
33-
<scope>provided</scope>
34-
</dependency>
3529
<dependency>
3630
<groupId>com.tencent.polaris</groupId>
3731
<artifactId>polaris-plugin-api</artifactId>

‎polaris-common/polaris-config/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
66
<artifactId>polaris-common</artifactId>
77
<groupId>com.tencent.polaris</groupId>
@@ -21,12 +21,6 @@
2121
<artifactId>polaris-logging</artifactId>
2222
<version>${project.version}</version>
2323
</dependency>
24-
<dependency>
25-
<groupId>org.slf4j</groupId>
26-
<artifactId>slf4j-api</artifactId>
27-
<version>${slf4j.version}</version>
28-
<scope>provided</scope>
29-
</dependency>
3024
<dependency>
3125
<groupId>com.fasterxml.jackson.dataformat</groupId>
3226
<artifactId>jackson-dataformat-yaml</artifactId>

‎polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/global/AdminConfigImpl.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,12 @@ public void setDefault(Object defaultObject) {
6666
}
6767
}
6868
}
69+
70+
@Override
71+
public String toString() {
72+
return "AdminConfigImpl{" +
73+
"host='" + host + '\'' +
74+
", port=" + port +
75+
'}';
76+
}
6977
}

‎polaris-common/polaris-encrypt/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@
2020
<artifactId>polaris-model</artifactId>
2121
<version>${project.version}</version>
2222
</dependency>
23-
<dependency>
24-
<groupId>org.slf4j</groupId>
25-
<artifactId>slf4j-api</artifactId>
26-
<version>${slf4j.version}</version>
27-
<scope>provided</scope>
28-
</dependency>
2923
<dependency>
3024
<groupId>org.bouncycastle</groupId>
3125
<artifactId>bcpkix-jdk15to18</artifactId>

‎polaris-common/polaris-logging/pom.xml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns="http://maven.apache.org/POM/4.0.0"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
66
<artifactId>polaris-common</artifactId>
77
<groupId>com.tencent.polaris</groupId>
@@ -16,13 +16,6 @@
1616

1717

1818
<dependencies>
19-
<dependency>
20-
<groupId>org.slf4j</groupId>
21-
<artifactId>slf4j-api</artifactId>
22-
<version>${slf4j.version}</version>
23-
<scope>provided</scope>
24-
</dependency>
25-
2619
<dependency>
2720
<groupId>log4j</groupId>
2821
<artifactId>log4j</artifactId>

0 commit comments

Comments
 (0)