Skip to content

Commit 4517e2e

Browse files
authored
Merge pull request #52 from reactivegroup/refactor/metric
refactor: refactor pom
2 parents 841fe29 + 89f2c34 commit 4517e2e

File tree

5 files changed

+26
-36
lines changed

5 files changed

+26
-36
lines changed

capa-spi-aws-config/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
<artifactId>capa-spi-aws-infrastructure</artifactId>
3636
</dependency>
3737

38+
<dependency>
39+
<groupId>group.rxcloud</groupId>
40+
<artifactId>capa-foundation</artifactId>
41+
</dependency>
42+
3843
<dependency>
3944
<groupId>software.amazon.awssdk</groupId>
4045
<artifactId>appconfig</artifactId>
@@ -67,11 +72,6 @@
6772
<artifactId>byte-buddy</artifactId>
6873
<scope>test</scope>
6974
</dependency>
70-
71-
<dependency>
72-
<groupId>group.rxcloud</groupId>
73-
<artifactId>capa-foundation</artifactId>
74-
</dependency>
7575
</dependencies>
7676

7777
<build>

capa-spi-aws-log/pom.xml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
<project xmlns="http://maven.apache.org/POM/4.0.0"
1919
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2020
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
2123
<parent>
2224
<artifactId>capa-aws-parent</artifactId>
2325
<groupId>group.rxcloud</groupId>
2426
<version>1.0.7.RELEASE</version>
2527
</parent>
26-
<modelVersion>4.0.0</modelVersion>
2728

2829
<artifactId>capa-spi-aws-log</artifactId>
2930

@@ -32,8 +33,8 @@
3233
<log4j.version>2.14.1</log4j.version>
3334
<logback.version>1.2.3</logback.version>
3435
<gson.version>2.8.0</gson.version>
35-
<capa.addons.version>1.0.3.RELEASE</capa.addons.version>
3636
</properties>
37+
3738
<dependencies>
3839
<dependency>
3940
<groupId>group.rxcloud</groupId>
@@ -43,12 +44,10 @@
4344
<dependency>
4445
<groupId>group.rxcloud</groupId>
4546
<artifactId>capa-foundation</artifactId>
46-
<version>${capa.addons.version}</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>group.rxcloud</groupId>
5050
<artifactId>capa-id-generator</artifactId>
51-
<version>${capa.addons.version}</version>
5251
</dependency>
5352

5453
<!-- cloud watch logs -->
@@ -61,6 +60,13 @@
6160
<artifactId>cloudwatch</artifactId>
6261
</dependency>
6362

63+
<!-- fixme: can we only use jackson -->
64+
<dependency>
65+
<groupId>com.google.code.gson</groupId>
66+
<artifactId>gson</artifactId>
67+
<version>${gson.version}</version>
68+
</dependency>
69+
6470
<!-- logback -->
6571
<dependency>
6672
<groupId>ch.qos.logback</groupId>
@@ -82,11 +88,7 @@
8288
<version>${log4j.version}</version>
8389
<optional>true</optional>
8490
</dependency>
85-
<dependency>
86-
<groupId>com.google.code.gson</groupId>
87-
<artifactId>gson</artifactId>
88-
<version>${gson.version}</version>
89-
</dependency>
91+
9092
<!-- unit test -->
9193
<dependency>
9294
<groupId>org.junit.jupiter</groupId>
@@ -98,10 +100,6 @@
98100
<artifactId>mockito-core</artifactId>
99101
<scope>test</scope>
100102
</dependency>
101-
<dependency>
102-
<groupId>group.rxcloud</groupId>
103-
<artifactId>capa-spi-aws-telemetry</artifactId>
104-
</dependency>
105103
</dependencies>
106104

107105
<build>

capa-spi-aws-mesh/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,15 @@
2929
<artifactId>capa-spi-aws-mesh</artifactId>
3030
<name>capa-skd-spi-aws-appmesh</name>
3131

32-
<properties>
33-
<capa-serializer.version>1.0.3.RELEASE</capa-serializer.version>
34-
</properties>
35-
3632
<dependencies>
3733
<dependency>
3834
<groupId>group.rxcloud</groupId>
3935
<artifactId>capa-spi-aws-infrastructure</artifactId>
4036
</dependency>
4137

42-
<!-- https://mvnrepository.com/artifact/group.rxcloud/capa-serializer -->
4338
<dependency>
4439
<groupId>group.rxcloud</groupId>
4540
<artifactId>capa-serializer</artifactId>
46-
<version>${capa-serializer.version}</version>
4741
</dependency>
4842

4943
<dependency>

capa-spi-aws-telemetry/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<log4j.version>2.14.1</log4j.version>
3535
<logback.version>1.2.3</logback.version>
3636
<gson.version>2.8.0</gson.version>
37-
<capa.addons.version>1.0.4.RELEASE</capa.addons.version>
3837
</properties>
3938

4039
<dependencies>
@@ -46,12 +45,10 @@
4645
<dependency>
4746
<groupId>group.rxcloud</groupId>
4847
<artifactId>capa-foundation</artifactId>
49-
<version>${capa.addons.version}</version>
5048
</dependency>
5149
<dependency>
5250
<groupId>group.rxcloud</groupId>
5351
<artifactId>capa-id-generator</artifactId>
54-
<version>${capa.addons.version}</version>
5552
</dependency>
5653

5754
<!-- cloud watch logs -->
@@ -67,7 +64,6 @@
6764
<!-- <version>${project.version}</version>-->
6865
<!-- <scope>test</scope>-->
6966
<!-- </dependency>-->
70-
7167
<!-- <dependency>-->
7268
<!-- <groupId>ch.qos.logback</groupId>-->
7369
<!-- <artifactId>logback-classic</artifactId>-->

pom.xml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<capa.version>1.0.9.RELEASE</capa.version>
7979
<aws-sdk.version>2.17.40</aws-sdk.version>
8080
<guava.version>19.0</guava.version>
81+
<capa-addons.version>1.0.5.RELEASE</capa-addons.version>
8182
<junit.version>5.3.1</junit.version>
8283
<mockito-core.version>3.6.0</mockito-core.version>
8384
<powermock.version>2.0.9</powermock.version>
@@ -90,7 +91,6 @@
9091
<maven.surefire.version>3.0.0-M1</maven.surefire.version>
9192
<maven.jacoco.version>0.8.6</maven.jacoco.version>
9293
<byte-buddy.version>1.12.2</byte-buddy.version>
93-
<capa.foundation.version>1.0.4.RELEASE</capa.foundation.version>
9494
</properties>
9595

9696
<dependencyManagement>
@@ -104,6 +104,14 @@
104104
<scope>import</scope>
105105
</dependency>
106106

107+
<dependency>
108+
<groupId>group.rxcloud</groupId>
109+
<artifactId>capa-addons</artifactId>
110+
<version>${capa-addons.version}</version>
111+
<type>pom</type>
112+
<scope>import</scope>
113+
</dependency>
114+
107115
<!-- SDK modules -->
108116
<dependency>
109117
<groupId>group.rxcloud</groupId>
@@ -174,12 +182,6 @@
174182
<version>${byte-buddy.version}</version>
175183
<scope>test</scope>
176184
</dependency>
177-
178-
<dependency>
179-
<groupId>group.rxcloud</groupId>
180-
<artifactId>capa-foundation</artifactId>
181-
<version>${capa.foundation.version}</version>
182-
</dependency>
183185
</dependencies>
184186
</dependencyManagement>
185187

@@ -367,7 +369,7 @@
367369
<format>html</format>
368370
<format>xml</format>
369371
</formats>
370-
<check />
372+
<check/>
371373
</configuration>
372374
</plugin>
373375
<plugin>

0 commit comments

Comments
 (0)