Skip to content

Commit e5aba6f

Browse files
freelansamfreelansam
committed
JAVA-5223: Fix formatting of POMs (Other Spring Modules)
1 parent 4b1f2c5 commit e5aba6f

File tree

15 files changed

+96
-115
lines changed

15 files changed

+96
-115
lines changed

‎spring-shell/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>spring-shell</artifactId>
67
<version>0.1-SNAPSHOT</version>
@@ -26,4 +27,4 @@
2627
<org.springframework.shell.version>1.2.0.RELEASE</org.springframework.shell.version>
2728
</properties>
2829

29-
</project>
30+
</project>

‎spring-sleuth/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>spring-sleuth</artifactId>
67
<version>1.0.0-SNAPSHOT</version>
@@ -41,4 +42,4 @@
4142
<spring-cloud-sleuth.version>2.0.2.RELEASE</spring-cloud-sleuth.version>
4243
</properties>
4344

44-
</project>
45+
</project>

‎spring-soap/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>spring-soap</artifactId>
67
<version>1.0.0</version>
@@ -37,7 +38,6 @@
3738
<groupId>org.springframework.boot</groupId>
3839
<artifactId>spring-boot-maven-plugin</artifactId>
3940
</plugin>
40-
4141
<!-- tag::xsd[] -->
4242
<plugin>
4343
<groupId>org.codehaus.mojo</groupId>
@@ -58,7 +58,6 @@
5858
</configuration>
5959
</plugin>
6060
<!-- end::xsd[] -->
61-
6261
<plugin>
6362
<groupId>org.jvnet.jaxb2.maven2</groupId>
6463
<artifactId>maven-jaxb2-plugin</artifactId>
@@ -84,4 +83,4 @@
8483
</plugins>
8584
</build>
8685

87-
</project>
86+
</project>

‎spring-spel/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>spring-spel</artifactId>
67
<version>1.0-SNAPSHOT</version>

‎spring-state-machine/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>spring-state-machine</artifactId>
67
<name>spring-state-machine</name>

‎spring-static-resources/pom.xml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<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/maven-v4_0_0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>spring-static-resources</artifactId>
67
<version>0.1.0-SNAPSHOT</version>
@@ -31,7 +32,6 @@
3132
<artifactId>spring-security-taglibs</artifactId>
3233
<version>${spring-security.version}</version>
3334
</dependency>
34-
3535
<!-- Spring -->
3636
<dependency>
3737
<groupId>org.springframework</groupId>
@@ -74,7 +74,6 @@
7474
<artifactId>spring-expression</artifactId>
7575
<version>${spring.version}</version>
7676
</dependency>
77-
7877
<dependency>
7978
<groupId>org.springframework</groupId>
8079
<artifactId>spring-web</artifactId>
@@ -85,7 +84,6 @@
8584
<artifactId>spring-webmvc</artifactId>
8685
<version>${spring.version}</version>
8786
</dependency>
88-
8987
<!-- AOP -->
9088
<dependency>
9189
<groupId>org.aspectj</groupId>
@@ -97,7 +95,6 @@
9795
<artifactId>javax.inject</artifactId>
9896
<version>${inject.version}</version>
9997
</dependency>
100-
10198
<!-- Servlet -->
10299
<dependency>
103100
<groupId>javax.servlet</groupId>
@@ -119,41 +116,35 @@
119116
<artifactId>jackson-databind</artifactId>
120117
<version>${jackson.version}</version>
121118
</dependency>
122-
123119
<dependency>
124120
<groupId>org.hibernate</groupId>
125121
<artifactId>hibernate-validator</artifactId>
126122
<version>${hibernate-validator.version}</version>
127123
</dependency>
128-
129124
<!-- Joda Time Library -->
130125
<dependency>
131126
<groupId>joda-time</groupId>
132127
<artifactId>joda-time</artifactId>
133128
<version>${joda-time.version}</version>
134129
</dependency>
135-
136130
<!-- Handlebars.java -->
137131
<dependency>
138132
<groupId>com.github.jknack</groupId>
139133
<artifactId>handlebars</artifactId>
140134
<version>${handlebars.version}</version>
141135
</dependency>
142-
143136
<!-- commons.io -->
144137
<dependency>
145138
<groupId>commons-io</groupId>
146139
<artifactId>commons-io</artifactId>
147140
<version>${commons-io.version}</version>
148141
</dependency>
149-
150142
<dependency>
151143
<groupId>org.springframework</groupId>
152144
<artifactId>spring-test</artifactId>
153145
<version>${spring.version}</version>
154146
<scope>test</scope>
155147
</dependency>
156-
157148
</dependencies>
158149

159150
<build>
@@ -204,14 +195,12 @@
204195
<properties>
205196
<org.aspectj-version>1.8.9</org.aspectj-version>
206197
<javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
207-
208198
<!-- various 1.3.2 -->
209199
<hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
210200
<handlebars.version>4.1.0</handlebars.version>
211201
<joda-time.version>2.10</joda-time.version>
212202
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
213203
<inject.version>1</inject.version>
214-
215204
<!-- Maven plugins -->
216205
<yuicompressor-maven-plugin.version>1.5.1</yuicompressor-maven-plugin.version>
217206
</properties>

‎spring-swagger-codegen/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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">
45
<modelVersion>4.0.0</modelVersion>
56
<artifactId>spring-swagger-codegen</artifactId>
67
<version>0.0.1-SNAPSHOT</version>
@@ -19,4 +20,4 @@
1920
<module>spring-swagger-codegen-app</module>
2021
</modules>
2122

22-
</project>
23+
</project>

‎spring-swagger-codegen/spring-openapi-generator-api-client/pom.xml

Lines changed: 42 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>com.baeldung</groupId>
56
<artifactId>spring-openapi-generator-api-client</artifactId>
@@ -13,15 +14,13 @@
1314
<developerConnection>scm:git:[email protected]:openapitools/openapi-generator.git</developerConnection>
1415
<url>https://github.com/openapitools/openapi-generator</url>
1516
</scm>
16-
1717
<licenses>
1818
<license>
1919
<name>Unlicense</name>
2020
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
2121
<distribution>repo</distribution>
2222
</license>
2323
</licenses>
24-
2524
<developers>
2625
<developer>
2726
<name>OpenAPI-Generator Contributors</name>
@@ -31,51 +30,24 @@
3130
</developer>
3231
</developers>
3332

34-
<profiles>
35-
<profile>
36-
<id>sign-artifacts</id>
37-
<build>
38-
<plugins>
39-
<plugin>
40-
<groupId>org.apache.maven.plugins</groupId>
41-
<artifactId>maven-gpg-plugin</artifactId>
42-
<version>1.5</version>
43-
<executions>
44-
<execution>
45-
<id>sign-artifacts</id>
46-
<phase>verify</phase>
47-
<goals>
48-
<goal>sign</goal>
49-
</goals>
50-
</execution>
51-
</executions>
52-
</plugin>
53-
</plugins>
54-
</build>
55-
</profile>
56-
</profiles>
57-
5833
<dependencies>
5934
<dependency>
6035
<groupId>io.swagger</groupId>
6136
<artifactId>swagger-annotations</artifactId>
6237
<version>${swagger-annotations-version}</version>
6338
</dependency>
64-
6539
<!-- @Nullable annotation -->
6640
<dependency>
6741
<groupId>com.google.code.findbugs</groupId>
6842
<artifactId>jsr305</artifactId>
6943
<version>3.0.2</version>
7044
</dependency>
71-
7245
<!-- HTTP client: Spring RestTemplate -->
7346
<dependency>
7447
<groupId>org.springframework</groupId>
7548
<artifactId>spring-web</artifactId>
7649
<version>${spring-web-version}</version>
7750
</dependency>
78-
7951
<!-- JSON processing: jackson -->
8052
<dependency>
8153
<groupId>com.fasterxml.jackson.core</groupId>
@@ -102,17 +74,16 @@
10274
<artifactId>jackson-databind-nullable</artifactId>
10375
<version>${jackson-databind-nullable-version}</version>
10476
</dependency>
105-
<dependency>
106-
<groupId>com.fasterxml.jackson.datatype</groupId>
107-
<artifactId>jackson-datatype-jsr310</artifactId>
108-
<version>${jackson-version}</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>com.github.joschi.jackson</groupId>
112-
<artifactId>jackson-datatype-threetenbp</artifactId>
113-
<version>${jackson-threetenbp-version}</version>
114-
</dependency>
115-
77+
<dependency>
78+
<groupId>com.fasterxml.jackson.datatype</groupId>
79+
<artifactId>jackson-datatype-jsr310</artifactId>
80+
<version>${jackson-version}</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>com.github.joschi.jackson</groupId>
84+
<artifactId>jackson-datatype-threetenbp</artifactId>
85+
<version>${jackson-threetenbp-version}</version>
86+
</dependency>
11687
<!-- test dependencies -->
11788
<dependency>
11889
<groupId>junit</groupId>
@@ -174,7 +145,6 @@
174145
</execution>
175146
</executions>
176147
</plugin>
177-
178148
<!-- attach test jar -->
179149
<plugin>
180150
<groupId>org.apache.maven.plugins</groupId>
@@ -191,7 +161,6 @@
191161
<configuration>
192162
</configuration>
193163
</plugin>
194-
195164
<plugin>
196165
<groupId>org.codehaus.mojo</groupId>
197166
<artifactId>build-helper-maven-plugin</artifactId>
@@ -228,8 +197,8 @@
228197
<artifactId>maven-compiler-plugin</artifactId>
229198
<version>3.6.1</version>
230199
<configuration>
231-
<source>1.8</source>
232-
<target>1.8</target>
200+
<source>1.8</source>
201+
<target>1.8</target>
233202
</configuration>
234203
</plugin>
235204
<plugin>
@@ -261,14 +230,39 @@
261230
</plugins>
262231
</build>
263232

233+
<profiles>
234+
<profile>
235+
<id>sign-artifacts</id>
236+
<build>
237+
<plugins>
238+
<plugin>
239+
<groupId>org.apache.maven.plugins</groupId>
240+
<artifactId>maven-gpg-plugin</artifactId>
241+
<version>1.5</version>
242+
<executions>
243+
<execution>
244+
<id>sign-artifacts</id>
245+
<phase>verify</phase>
246+
<goals>
247+
<goal>sign</goal>
248+
</goals>
249+
</execution>
250+
</executions>
251+
</plugin>
252+
</plugins>
253+
</build>
254+
</profile>
255+
</profiles>
256+
264257
<properties>
265258
<swagger-annotations-version>1.5.22</swagger-annotations-version>
266259
<spring-web-version>4.3.9.RELEASE</spring-web-version>
267260
<jackson-version>2.11.1</jackson-version>
268-
<!-- <jackson-databind-version>2.10.1</jackson-databind-version>-->
261+
<!-- <jackson-databind-version>2.10.1</jackson-databind-version> -->
269262
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
270263
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
271264
<maven-plugin-version>1.0.0</maven-plugin-version>
272265
<junit-version>4.13</junit-version>
273266
</properties>
274-
</project>
267+
268+
</project>

0 commit comments

Comments
 (0)