Skip to content

Commit af1104d

Browse files
chengyoulingchengyouling
authored
[#5128] Project management of the Archaius component (#5129)
1 parent 7b8b5e3 commit af1104d

11 files changed

Lines changed: 133 additions & 26 deletions

File tree

‎dependencies/bom/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@
158158
<artifactId>foundation-config</artifactId>
159159
<version>${project.version}</version>
160160
</dependency>
161+
<dependency>
162+
<groupId>org.apache.servicecomb</groupId>
163+
<artifactId>foundation-ext-archaius</artifactId>
164+
<version>${project.version}</version>
165+
</dependency>
161166
<dependency>
162167
<groupId>org.apache.servicecomb</groupId>
163168
<artifactId>foundation-metrics</artifactId>

‎dependencies/default/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<properties>
3333
<!-- Dependency versions: sort by alphabetic order -->
3434
<activation.version>1.2.2</activation.version>
35-
<archaius.version>0.7.8</archaius.version>
35+
<archaius.version>0.7.12</archaius.version>
3636
<asciidoctorj.version>2.5.3</asciidoctorj.version>
3737
<aspectj.version>1.9.19</aspectj.version>
3838
<assertj.version>3.23.1</assertj.version>

‎foundations/foundation-common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
<dependencies>
3030
<dependency>
31-
<groupId>com.netflix.archaius</groupId>
32-
<artifactId>archaius-core</artifactId>
31+
<groupId>org.apache.servicecomb</groupId>
32+
<artifactId>foundation-ext-archaius</artifactId>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.sun.activation</groupId>

‎foundations/foundation-config/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,8 @@
4040
<artifactId>spring-beans</artifactId>
4141
</dependency>
4242
<dependency>
43-
<groupId>com.netflix.archaius</groupId>
44-
<artifactId>archaius-core</artifactId>
45-
</dependency>
46-
<dependency>
47-
<groupId>commons-configuration</groupId>
48-
<artifactId>commons-configuration</artifactId>
43+
<groupId>org.apache.servicecomb</groupId>
44+
<artifactId>foundation-ext-archaius</artifactId>
4945
</dependency>
5046
<dependency>
5147
<groupId>org.yaml</groupId>

‎foundations/foundation-ext-archaius/pom.xml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
<!--
2+
~ Licensed to the Apache Software Foundation (ASF) under one or more
3+
~ contributor license agreements. See the NOTICE file distributed with
4+
~ this work for additional information regarding copyright ownership.
5+
~ The ASF licenses this file to You under the Apache License, Version 2.0
6+
~ (the "License"); you may not use this file except in compliance with
7+
~ the License. You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>org.apache.servicecomb</groupId>
23+
<version>2.10.0-SNAPSHOT</version>
24+
<artifactId>foundations</artifactId>
25+
</parent>
26+
27+
<artifactId>foundation-ext-archaius</artifactId>
28+
<name>Java Chassis::Foundations::Ext-Archaius</name>
29+
<packaging>jar</packaging>
30+
31+
<dependencies>
32+
<dependency>
33+
<groupId>com.netflix.archaius</groupId>
34+
<artifactId>archaius-core</artifactId>
35+
<scope>provided</scope>
36+
</dependency>
37+
</dependencies>
38+
39+
<build>
40+
<plugins>
41+
<!-- 使用 dependency 插件，在打包前把 jar 解压到你的编译目录 -->
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-dependency-plugin</artifactId>
45+
<executions>
46+
<execution>
47+
<id>unpack-commons-configuration</id>
48+
<!-- 必须在 package 阶段之前执行，这里选 prepare-package -->
49+
<phase>prepare-package</phase>
50+
<goals>
51+
<goal>unpack</goal>
52+
</goals>
53+
<configuration>
54+
<artifactItems>
55+
<artifactItem>
56+
<groupId>commons-configuration</groupId>
57+
<artifactId>commons-configuration</artifactId>
58+
<version>${commons-configuration.version}</version>
59+
<!-- 解压到哪里？直接解压到项目的 classes 目录，和你的代码混在一起 -->
60+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
61+
<!-- 覆盖已有文件 -->
62+
<overWrite>true</overWrite>
63+
<!-- 【必须】排除掉原来的签名文件，防止最终 jar 报 SecurityException -->
64+
<excludes>META-INF/*,digesterRules.xml,properties.dtd,PropertyList-1.0.dtd</excludes>
65+
</artifactItem>
66+
<artifactItem>
67+
<groupId>commons-lang</groupId>
68+
<artifactId>commons-lang</artifactId>
69+
<version>${commons-lang.version}</version>
70+
<!-- 解压到哪里？直接解压到项目的 classes 目录，和你的代码混在一起 -->
71+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
72+
<!-- 覆盖已有文件 -->
73+
<overWrite>true</overWrite>
74+
<!-- 【必须】排除掉原来的签名文件，防止最终 jar 报 SecurityException -->
75+
<excludes>META-INF/*,digesterRules.xml,properties.dtd,PropertyList-1.0.dtd</excludes>
76+
</artifactItem>
77+
<artifactItem>
78+
<groupId>com.netflix.archaius</groupId>
79+
<artifactId>archaius-core</artifactId>
80+
<version>${archaius.version}</version>
81+
<!-- 解压到哪里？直接解压到项目的 classes 目录，和你的代码混在一起 -->
82+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
83+
<!-- 覆盖已有文件 -->
84+
<overWrite>true</overWrite>
85+
<!-- 【必须】排除掉原来的签名文件，防止最终 jar 报 SecurityException -->
86+
<excludes>META-INF/*,sampleapp.properties</excludes>
87+
</artifactItem>
88+
</artifactItems>
89+
</configuration>
90+
</execution>
91+
</executions>
92+
</plugin>
93+
<plugin>
94+
<groupId>com.github.spotbugs</groupId>
95+
<artifactId>spotbugs-maven-plugin</artifactId>
96+
<inherited>false</inherited>
97+
<configuration>
98+
<skip>true</skip>
99+
</configuration>
100+
</plugin>
101+
</plugins>
102+
</build>
103+
</project>

‎foundations/foundation-metrics/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<artifactId>foundation-common</artifactId>
3333
</dependency>
3434
<dependency>
35-
<groupId>com.netflix.archaius</groupId>
36-
<artifactId>archaius-core</artifactId>
35+
<groupId>org.apache.servicecomb</groupId>
36+
<artifactId>foundation-ext-archaius</artifactId>
3737
</dependency>
3838
<dependency>
3939
<groupId>com.netflix.spectator</groupId>

‎foundations/foundation-ssl/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@
2828

2929
<dependencies>
3030
<dependency>
31-
<groupId>com.netflix.archaius</groupId>
32-
<artifactId>archaius-core</artifactId>
33-
</dependency>
34-
<dependency>
35-
<groupId>commons-configuration</groupId>
36-
<artifactId>commons-configuration</artifactId>
31+
<groupId>org.apache.servicecomb</groupId>
32+
<artifactId>foundation-ext-archaius</artifactId>
3733
</dependency>
3834
<dependency>
3935
<groupId>org.slf4j</groupId>

‎foundations/foundation-test-scaffolding/pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,8 @@
3232
<artifactId>spring-context</artifactId>
3333
</dependency>
3434
<dependency>
35-
<groupId>com.netflix.archaius</groupId>
36-
<artifactId>archaius-core</artifactId>
37-
</dependency>
38-
<dependency>
39-
<groupId>commons-configuration</groupId>
40-
<artifactId>commons-configuration</artifactId>
41-
<scope>compile</scope>
35+
<groupId>org.apache.servicecomb</groupId>
36+
<artifactId>foundation-ext-archaius</artifactId>
4237
</dependency>
4338
<dependency>
4439
<groupId>io.vertx</groupId>

‎foundations/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@
3737
<module>foundation-test-scaffolding</module>
3838
<module>foundation-protobuf</module>
3939
<module>foundation-registry</module>
40+
<module>foundation-ext-archaius</module>
4041
</modules>
4142
</project>

‎handlers/handler-loadbalance/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<artifactId>ribbon-loadbalancer</artifactId>
5454
</dependency>
5555
<dependency>
56-
<groupId>com.netflix.archaius</groupId>
57-
<artifactId>archaius-core</artifactId>
56+
<groupId>org.apache.servicecomb</groupId>
57+
<artifactId>foundation-ext-archaius</artifactId>
5858
</dependency>
5959
<dependency>
6060
<groupId>io.reactivex</groupId>

0 commit comments

Comments
 (0)