Skip to content

Commit 56abd52

Browse files
goekaygoekay
committed
refactor
1 parent ff441b9 commit 56abd52

File tree

3 files changed

+81
-138
lines changed

3 files changed

+81
-138
lines changed

‎ocpp-custom/pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,4 @@
1111
<artifactId>ocpp-custom</artifactId>
1212
<packaging>jar</packaging>
1313

14-
<dependencies>
15-
<dependency>
16-
<groupId>org.jsonschema2pojo</groupId>
17-
<artifactId>jsonschema2pojo-core</artifactId>
18-
</dependency>
19-
<dependency>
20-
<groupId>org.projectlombok</groupId>
21-
<artifactId>lombok</artifactId>
22-
</dependency>
23-
</dependencies>
2414
</project>

‎ocpp-jaxb/pom.xml‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
<properties>
1515
<ocpp-1.6-security-schemas-dir>OCPP-1.6_Security_3rd_Edition_schemas</ocpp-1.6-security-schemas-dir>
1616
<ocpp-2.0.1-schemas-dir>OCPP-2.0.1_part3_JSON_schemas</ocpp-2.0.1-schemas-dir>
17-
18-
<cxf.version>4.0.5</cxf.version>
1917
</properties>
2018

2119
<build>
@@ -222,64 +220,5 @@
222220
</plugins>
223221
</build>
224222

225-
<dependencies>
226-
<dependency>
227-
<groupId>${project.groupId}</groupId>
228-
<artifactId>ocpp-custom</artifactId>
229-
<scope>compile</scope>
230-
</dependency>
231-
232-
<dependency>
233-
<groupId>jakarta.validation</groupId>
234-
<artifactId>jakarta.validation-api</artifactId>
235-
</dependency>
236-
<dependency>
237-
<groupId>jakarta.xml.soap</groupId>
238-
<artifactId>jakarta.xml.soap-api</artifactId>
239-
</dependency>
240-
<dependency>
241-
<groupId>jakarta.jws</groupId>
242-
<artifactId>jakarta.jws-api</artifactId>
243-
</dependency>
244-
<dependency>
245-
<groupId>jakarta.xml.bind</groupId>
246-
<artifactId>jakarta.xml.bind-api</artifactId>
247-
</dependency>
248-
<dependency>
249-
<groupId>jakarta.xml.ws</groupId>
250-
<artifactId>jakarta.xml.ws-api</artifactId>
251-
</dependency>
252-
<dependency>
253-
<groupId>joda-time</groupId>
254-
<artifactId>joda-time</artifactId>
255-
</dependency>
256-
<dependency>
257-
<groupId>org.projectlombok</groupId>
258-
<artifactId>lombok</artifactId>
259-
</dependency>
260-
261-
<dependency>
262-
<groupId>com.fasterxml.jackson.core</groupId>
263-
<artifactId>jackson-annotations</artifactId>
264-
</dependency>
265223

266-
<dependency>
267-
<groupId>org.junit.jupiter</groupId>
268-
<artifactId>junit-jupiter-engine</artifactId>
269-
<version>5.10.3</version>
270-
<scope>test</scope>
271-
</dependency>
272-
<dependency>
273-
<groupId>org.junit.jupiter</groupId>
274-
<artifactId>junit-jupiter-params</artifactId>
275-
<version>5.10.3</version>
276-
<scope>test</scope>
277-
</dependency>
278-
<dependency>
279-
<groupId>tools.jackson.datatype</groupId>
280-
<artifactId>jackson-datatype-joda</artifactId>
281-
<version>3.0.2</version>
282-
<scope>test</scope>
283-
</dependency>
284-
</dependencies>
285224
</project>

‎pom.xml‎

Lines changed: 81 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -33,87 +33,29 @@
3333
</license>
3434
</licenses>
3535

36-
<scm>
37-
<connection>scm:git:https://github.com/steve-community/ocpp-jaxb.git</connection>
38-
<developerConnection>scm:git:https://github.com/steve-community/ocpp-jaxb.git</developerConnection>
39-
<url>https://github.com/steve-community/ocpp-jaxb</url>
40-
<tag>HEAD</tag>
41-
</scm>
42-
4336
<properties>
4437
<java.version>17</java.version>
4538
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4639

40+
<cxf.version>4.0.5</cxf.version>
4741
<lombok.version>1.18.34</lombok.version>
4842
<jsonschema2pojo.version>1.2.1</jsonschema2pojo.version>
4943
</properties>
5044

45+
<scm>
46+
<connection>scm:git:https://github.com/steve-community/ocpp-jaxb.git</connection>
47+
<developerConnection>scm:git:https://github.com/steve-community/ocpp-jaxb.git</developerConnection>
48+
<url>https://github.com/steve-community/ocpp-jaxb</url>
49+
<tag>HEAD</tag>
50+
</scm>
51+
5152
<distributionManagement>
5253
<repository>
5354
<id>github</id>
5455
<url>https://maven.pkg.github.com/steve-community/ocpp-jaxb</url>
5556
</repository>
5657
</distributionManagement>
5758

58-
<dependencyManagement>
59-
<dependencies>
60-
<!-- Internal module - uses ${project.version} -->
61-
<dependency>
62-
<groupId>${project.groupId}</groupId>
63-
<artifactId>ocpp-custom</artifactId>
64-
<version>${project.version}</version>
65-
</dependency>
66-
67-
<dependency>
68-
<groupId>org.jsonschema2pojo</groupId>
69-
<artifactId>jsonschema2pojo-core</artifactId>
70-
<version>${jsonschema2pojo.version}</version>
71-
</dependency>
72-
<dependency>
73-
<groupId>jakarta.validation</groupId>
74-
<artifactId>jakarta.validation-api</artifactId>
75-
<version>3.1.0</version>
76-
</dependency>
77-
<dependency>
78-
<groupId>jakarta.xml.soap</groupId>
79-
<artifactId>jakarta.xml.soap-api</artifactId>
80-
<version>3.0.2</version>
81-
</dependency>
82-
<dependency>
83-
<groupId>jakarta.jws</groupId>
84-
<artifactId>jakarta.jws-api</artifactId>
85-
<version>3.0.0</version>
86-
</dependency>
87-
<dependency>
88-
<groupId>jakarta.xml.bind</groupId>
89-
<artifactId>jakarta.xml.bind-api</artifactId>
90-
<version>3.0.1</version>
91-
</dependency>
92-
<dependency>
93-
<groupId>jakarta.xml.ws</groupId>
94-
<artifactId>jakarta.xml.ws-api</artifactId>
95-
<version>3.0.1</version>
96-
</dependency>
97-
<dependency>
98-
<groupId>joda-time</groupId>
99-
<artifactId>joda-time</artifactId>
100-
<version>2.12.7</version>
101-
<scope>provided</scope>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.projectlombok</groupId>
105-
<artifactId>lombok</artifactId>
106-
<version>${lombok.version}</version>
107-
</dependency>
108-
<!-- Jackson 3.x components rely on 2.x annotations; there are no separate 3.x jackson-annotations -->
109-
<dependency>
110-
<groupId>com.fasterxml.jackson.core</groupId>
111-
<artifactId>jackson-annotations</artifactId>
112-
<version>2.20</version>
113-
</dependency>
114-
</dependencies>
115-
</dependencyManagement>
116-
11759
<build>
11860
<plugins>
11961
<plugin>
@@ -149,4 +91,76 @@
14991
</plugins>
15092
</build>
15193

152-
</project>
94+
<dependencies>
95+
<dependency>
96+
<groupId>org.jsonschema2pojo</groupId>
97+
<artifactId>jsonschema2pojo-core</artifactId>
98+
<version>${jsonschema2pojo.version}</version>
99+
<scope>compile</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>jakarta.validation</groupId>
103+
<artifactId>jakarta.validation-api</artifactId>
104+
<version>3.1.0</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>jakarta.xml.soap</groupId>
108+
<artifactId>jakarta.xml.soap-api</artifactId>
109+
<version>3.0.2</version>
110+
</dependency>
111+
<dependency>
112+
<groupId>jakarta.jws</groupId>
113+
<artifactId>jakarta.jws-api</artifactId>
114+
<version>3.0.0</version>
115+
</dependency>
116+
<dependency>
117+
<groupId>jakarta.xml.bind</groupId>
118+
<artifactId>jakarta.xml.bind-api</artifactId>
119+
<version>3.0.1</version>
120+
</dependency>
121+
<dependency>
122+
<groupId>jakarta.xml.ws</groupId>
123+
<artifactId>jakarta.xml.ws-api</artifactId>
124+
<version>3.0.1</version>
125+
</dependency>
126+
127+
<dependency>
128+
<groupId>joda-time</groupId>
129+
<artifactId>joda-time</artifactId>
130+
<version>2.12.7</version>
131+
<scope>provided</scope>
132+
</dependency>
133+
<dependency>
134+
<groupId>org.projectlombok</groupId>
135+
<artifactId>lombok</artifactId>
136+
<version>${lombok.version}</version>
137+
</dependency>
138+
139+
<!-- Jackson 3.x components rely on 2.x annotations; there are no separate 3.x jackson-annotations -->
140+
<dependency>
141+
<groupId>com.fasterxml.jackson.core</groupId>
142+
<artifactId>jackson-annotations</artifactId>
143+
<version>2.20</version>
144+
</dependency>
145+
146+
<dependency>
147+
<groupId>org.junit.jupiter</groupId>
148+
<artifactId>junit-jupiter-engine</artifactId>
149+
<version>5.10.3</version>
150+
<scope>test</scope>
151+
</dependency>
152+
<dependency>
153+
<groupId>org.junit.jupiter</groupId>
154+
<artifactId>junit-jupiter-params</artifactId>
155+
<version>5.10.3</version>
156+
<scope>test</scope>
157+
</dependency>
158+
<dependency>
159+
<groupId>tools.jackson.datatype</groupId>
160+
<artifactId>jackson-datatype-joda</artifactId>
161+
<version>3.0.2</version>
162+
<scope>test</scope>
163+
</dependency>
164+
</dependencies>
165+
166+
</project>

0 commit comments

Comments
 (0)