Skip to content

Commit 2a746e6

Browse files
jzheauxjzheaux
authored
Merge pull request eugenp#8017 from amit2103/BAEL-18306-5
[BAEL-18306-5] - Fix formatting of POMs Part 5
2 parents 5d35d07 + 78fe413 commit 2a746e6

File tree

6 files changed

+81
-96
lines changed
  • spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka
  • spring-ejb/spring-ejb-remote
  • spring-rest-compress
  • spring-security-core
  • spring-security-mvc-jsonview
  • spring-security-mvc-socket

6 files changed

+81
-96
lines changed

‎spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
6-
75
<artifactId>spring-cloud-stream-kafka</artifactId>
86
<name>spring-cloud-stream-kafka</name>
97
<description>Simple Spring Cloud Stream</description>
@@ -15,13 +13,6 @@
1513
<version>2.1.5.RELEASE</version>
1614
</parent>
1715

18-
<properties>
19-
<java.version>1.8</java.version>
20-
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
21-
<kafka-avro-serializer.version>4.0.0</kafka-avro-serializer.version>
22-
<avro.version>1.8.2</avro.version>
23-
</properties>
24-
2516
<dependencies>
2617

2718
<dependency>
@@ -108,4 +99,11 @@
10899
</repository>
109100
</repositories>
110101

102+
<properties>
103+
<java.version>1.8</java.version>
104+
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
105+
<kafka-avro-serializer.version>4.0.0</kafka-avro-serializer.version>
106+
<avro.version>1.8.2</avro.version>
107+
</properties>
108+
111109
</project>

‎spring-ejb/spring-ejb-remote/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
</dependency>
2828
</dependencies>
2929

30-
3130
<profiles>
3231
<!-- mvn clean package cargo:run -Pwildfly-standalone -->
3332
<profile>

‎spring-rest-compress/pom.xml

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,65 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
4-
<modelVersion>4.0.0</modelVersion>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>com.baeldung</groupId>
6+
<artifactId>spring-rest-compress</artifactId>
7+
<version>0.0.1-SNAPSHOT</version>
8+
<name>spring-rest-compress</name>
9+
510
<parent>
611
<artifactId>parent-boot-2</artifactId>
712
<groupId>com.baeldung</groupId>
813
<version>0.0.1-SNAPSHOT</version>
914
<relativePath>../parent-boot-2</relativePath>
1015
</parent>
11-
<groupId>com.baeldung</groupId>
12-
<artifactId>spring-rest-compress</artifactId>
13-
<version>0.0.1-SNAPSHOT</version>
14-
<name>spring-rest-compress</name>
15-
16-
<properties>
17-
<java.version>1.8</java.version>
18-
<commons-io.version>2.6</commons-io.version>
19-
</properties>
20-
21-
<dependencies>
2216

23-
<dependency>
24-
<groupId>org.springframework.boot</groupId>
25-
<artifactId>spring-boot-starter-web</artifactId>
26-
<exclusions>
27-
<exclusion>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter-tomcat</artifactId>
30-
</exclusion>
31-
</exclusions>
32-
</dependency>
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.springframework.boot</groupId>
20+
<artifactId>spring-boot-starter-web</artifactId>
21+
<exclusions>
22+
<exclusion>
23+
<groupId>org.springframework.boot</groupId>
24+
<artifactId>spring-boot-starter-tomcat</artifactId>
25+
</exclusion>
26+
</exclusions>
27+
</dependency>
3328

34-
<dependency>
35-
<groupId>org.springframework.boot</groupId>
36-
<artifactId>spring-boot-starter-jetty</artifactId>
37-
</dependency>
29+
<dependency>
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-starter-jetty</artifactId>
32+
</dependency>
3833

39-
<dependency>
40-
<groupId>org.apache.httpcomponents</groupId>
41-
<artifactId>httpclient</artifactId>
42-
</dependency>
34+
<dependency>
35+
<groupId>org.apache.httpcomponents</groupId>
36+
<artifactId>httpclient</artifactId>
37+
</dependency>
4338

44-
<dependency>
45-
<groupId>commons-io</groupId>
46-
<artifactId>commons-io</artifactId>
47-
<version>${commons-io.version}</version>
48-
</dependency>
39+
<dependency>
40+
<groupId>commons-io</groupId>
41+
<artifactId>commons-io</artifactId>
42+
<version>${commons-io.version}</version>
43+
</dependency>
4944

50-
<dependency>
51-
<groupId>org.springframework.boot</groupId>
52-
<artifactId>spring-boot-starter-test</artifactId>
53-
<scope>test</scope>
54-
</dependency>
55-
</dependencies>
45+
<dependency>
46+
<groupId>org.springframework.boot</groupId>
47+
<artifactId>spring-boot-starter-test</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
</dependencies>
5651

57-
<build>
58-
<plugins>
59-
<plugin>
60-
<groupId>org.springframework.boot</groupId>
61-
<artifactId>spring-boot-maven-plugin</artifactId>
62-
</plugin>
63-
</plugins>
64-
</build>
52+
<build>
53+
<plugins>
54+
<plugin>
55+
<groupId>org.springframework.boot</groupId>
56+
<artifactId>spring-boot-maven-plugin</artifactId>
57+
</plugin>
58+
</plugins>
59+
</build>
6560

61+
<properties>
62+
<java.version>1.8</java.version>
63+
<commons-io.version>2.6</commons-io.version>
64+
</properties>
6665
</project>

‎spring-security-core/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<groupId>com.baeldung</groupId>
55
<artifactId>spring-security-core</artifactId>
66
<version>0.1-SNAPSHOT</version>
7-
87
<name>spring-security-core</name>
98
<packaging>war</packaging>
109

‎spring-security-mvc-jsonview/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
54
<groupId>com.baeldung</groupId>
65
<artifactId>spring-security-mvc-jsonview</artifactId>
76
<version>0.1-SNAPSHOT</version>
@@ -16,7 +15,6 @@
1615
</parent>
1716

1817
<dependencies>
19-
2018
<dependency>
2119
<groupId>com.fasterxml.jackson.core</groupId>
2220
<artifactId>jackson-core</artifactId>
@@ -142,7 +140,6 @@
142140
<version>${json-path.version}</version>
143141
<scope>test</scope>
144142
</dependency>
145-
146143
</dependencies>
147144

148145
<build>
@@ -153,9 +150,7 @@
153150
<filtering>true</filtering>
154151
</resource>
155152
</resources>
156-
157153
<plugins>
158-
159154
<plugin>
160155
<groupId>org.apache.maven.plugins</groupId>
161156
<artifactId>maven-war-plugin</artifactId>
@@ -200,15 +195,12 @@
200195
</configuration>
201196
</configuration>
202197
</plugin>
203-
204198
</plugins>
205-
206199
</build>
207200

208201
<properties>
209202
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
210203
<json-path.version>2.4.0</json-path.version>
211-
212204
</properties>
213205

214206
</project>

‎spring-security-mvc-socket/pom.xml

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
5-
65
<groupId>com.baeldung.springsecuredsockets</groupId>
76
<artifactId>spring-security-mvc-socket</artifactId>
87
<version>1.0.0</version>
@@ -151,35 +150,34 @@
151150

152151
<!-- Test -->
153152
<dependency>
154-
<groupId>org.springframework.boot</groupId>
155-
<artifactId>spring-boot-starter-test</artifactId>
156-
<version>1.5.10.RELEASE</version>
157-
<scope>test</scope>
158-
</dependency>
153+
<groupId>org.springframework.boot</groupId>
154+
<artifactId>spring-boot-starter-test</artifactId>
155+
<version>1.5.10.RELEASE</version>
156+
<scope>test</scope>
157+
</dependency>
159158
</dependencies>
160159

161160
<build>
162-
163-
<plugins>
164-
<plugin>
165-
<groupId>org.apache.tomcat.maven</groupId>
166-
<artifactId>tomcat7-maven-plugin</artifactId>
167-
<version>2.2</version>
168-
<configuration>
169-
<path>/spring-security-mvc-socket</path>
170-
</configuration>
171-
</plugin>
172-
<plugin>
173-
<groupId>org.apache.maven.plugins</groupId>
174-
<artifactId>maven-war-plugin</artifactId>
175-
<version>3.0.0</version>
176-
<configuration>
177-
<warSourceDirectory>src/main/webapp</warSourceDirectory>
178-
<failOnMissingWebXml>false</failOnMissingWebXml>
179-
</configuration>
180-
</plugin>
181-
</plugins>
182-
<finalName>spring-security-mvc-socket</finalName>
161+
<finalName>spring-security-mvc-socket</finalName>
162+
<plugins>
163+
<plugin>
164+
<groupId>org.apache.tomcat.maven</groupId>
165+
<artifactId>tomcat7-maven-plugin</artifactId>
166+
<version>2.2</version>
167+
<configuration>
168+
<path>/spring-security-mvc-socket</path>
169+
</configuration>
170+
</plugin>
171+
<plugin>
172+
<groupId>org.apache.maven.plugins</groupId>
173+
<artifactId>maven-war-plugin</artifactId>
174+
<version>3.0.0</version>
175+
<configuration>
176+
<warSourceDirectory>src/main/webapp</warSourceDirectory>
177+
<failOnMissingWebXml>false</failOnMissingWebXml>
178+
</configuration>
179+
</plugin>
180+
</plugins>
183181
</build>
184182

185183
<properties>

0 commit comments

Comments
 (0)