From 3b250bf9eaa5d8c8836462c56ca80f63d986f8e7 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Thu, 23 Apr 2026 18:54:26 +0800 Subject: [PATCH 1/2] [#5128] Project management of the Archaius component --- dependencies/bom/pom.xml | 5 + dependencies/default/pom.xml | 2 +- foundations/foundation-common/pom.xml | 4 +- foundations/foundation-config/pom.xml | 8 +- foundations/foundation-ext-archaius/pom.xml | 103 ++++++++++++++++++ foundations/foundation-metrics/pom.xml | 4 +- foundations/foundation-ssl/pom.xml | 8 +- .../foundation-test-scaffolding/pom.xml | 9 +- foundations/pom.xml | 1 + handlers/handler-loadbalance/pom.xml | 4 +- 10 files changed, 122 insertions(+), 26 deletions(-) create mode 100644 foundations/foundation-ext-archaius/pom.xml diff --git a/dependencies/bom/pom.xml b/dependencies/bom/pom.xml index 6696aa0becf..70dc981d11c 100644 --- a/dependencies/bom/pom.xml +++ b/dependencies/bom/pom.xml @@ -158,6 +158,11 @@ foundation-config ${project.version} + + org.apache.servicecomb + foundation-ext-archaius + ${project.version} + org.apache.servicecomb foundation-metrics diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 68cdcf8c6da..3e0b1b41d39 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -32,7 +32,7 @@ 1.2.2 - 0.7.8 + 0.7.12 2.5.3 1.9.19 3.23.1 diff --git a/foundations/foundation-common/pom.xml b/foundations/foundation-common/pom.xml index ef20501c923..7847a03f676 100644 --- a/foundations/foundation-common/pom.xml +++ b/foundations/foundation-common/pom.xml @@ -28,8 +28,8 @@ - com.netflix.archaius - archaius-core + org.apache.servicecomb + foundation-ext-archaius com.sun.activation diff --git a/foundations/foundation-config/pom.xml b/foundations/foundation-config/pom.xml index 1af0aa6225f..f9f015956dd 100644 --- a/foundations/foundation-config/pom.xml +++ b/foundations/foundation-config/pom.xml @@ -40,12 +40,8 @@ spring-beans - com.netflix.archaius - archaius-core - - - commons-configuration - commons-configuration + org.apache.servicecomb + foundation-ext-archaius org.yaml diff --git a/foundations/foundation-ext-archaius/pom.xml b/foundations/foundation-ext-archaius/pom.xml new file mode 100644 index 00000000000..a04c1ad3bca --- /dev/null +++ b/foundations/foundation-ext-archaius/pom.xml @@ -0,0 +1,103 @@ + + + + 4.0.0 + + org.apache.servicecomb + 2.10.0-SNAPSHOT + foundations + + + foundation-ext-archaius + Java Chassis::Foundations::Ext-Archaius + jar + + + + com.netflix.archaius + archaius-core + provided + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-commons-configuration + + prepare-package + + unpack + + + + + commons-configuration + commons-configuration + ${commons-configuration.version} + + ${project.build.outputDirectory} + + true + + META-INF/*,digesterRules.xml,properties.dtd,PropertyList-1.0.dtd + + + commons-lang + commons-lang + ${commons-lang.version} + + ${project.build.outputDirectory} + + true + + META-INF/*,digesterRules.xml,properties.dtd,PropertyList-1.0.dtd + + + com.netflix.archaius + archaius-core + ${archaius.version} + + ${project.build.outputDirectory} + + true + + META-INF/*,sampleapp.properties + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + false + + true + + + + + \ No newline at end of file diff --git a/foundations/foundation-metrics/pom.xml b/foundations/foundation-metrics/pom.xml index da9a147a2f9..f417310e29a 100644 --- a/foundations/foundation-metrics/pom.xml +++ b/foundations/foundation-metrics/pom.xml @@ -32,8 +32,8 @@ foundation-common - com.netflix.archaius - archaius-core + org.apache.servicecomb + foundation-ext-archaius com.netflix.spectator diff --git a/foundations/foundation-ssl/pom.xml b/foundations/foundation-ssl/pom.xml index 84bf5116c1e..422ee49efc2 100644 --- a/foundations/foundation-ssl/pom.xml +++ b/foundations/foundation-ssl/pom.xml @@ -28,12 +28,8 @@ - com.netflix.archaius - archaius-core - - - commons-configuration - commons-configuration + org.apache.servicecomb + foundation-ext-archaius org.slf4j diff --git a/foundations/foundation-test-scaffolding/pom.xml b/foundations/foundation-test-scaffolding/pom.xml index 5ab74cd07a0..d0aa3fc2da8 100644 --- a/foundations/foundation-test-scaffolding/pom.xml +++ b/foundations/foundation-test-scaffolding/pom.xml @@ -32,13 +32,8 @@ spring-context - com.netflix.archaius - archaius-core - - - commons-configuration - commons-configuration - compile + org.apache.servicecomb + foundation-ext-archaius io.vertx diff --git a/foundations/pom.xml b/foundations/pom.xml index 462559493c5..b1c2e4a2b37 100644 --- a/foundations/pom.xml +++ b/foundations/pom.xml @@ -37,5 +37,6 @@ foundation-test-scaffolding foundation-protobuf foundation-registry + foundation-ext-archaius diff --git a/handlers/handler-loadbalance/pom.xml b/handlers/handler-loadbalance/pom.xml index 37f59f259f5..dd4b5c64016 100644 --- a/handlers/handler-loadbalance/pom.xml +++ b/handlers/handler-loadbalance/pom.xml @@ -53,8 +53,8 @@ ribbon-loadbalancer - com.netflix.archaius - archaius-core + org.apache.servicecomb + foundation-ext-archaius io.reactivex From c36b1ed6e9353e411d56a2f065ca90c86004ab15 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Fri, 24 Apr 2026 11:07:36 +0800 Subject: [PATCH 2/2] add archaius-core for compile --- parents/default/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/parents/default/pom.xml b/parents/default/pom.xml index 41f6439744c..d518ee9762b 100644 --- a/parents/default/pom.xml +++ b/parents/default/pom.xml @@ -91,5 +91,16 @@ assertj-core test + + + com.netflix.archaius + archaius-core + provided + + + commons-configuration + commons-configuration + provided +