Skip to content

Commit 2855010

Browse files
philwebbphilwebb
committed
Fix sample POMs
Update sample POMs to follow CI friendly Maven conventions. See gh-9316
1 parent 3476f7b commit 2855010

File tree

80 files changed

+358
-659
lines changed
  • spring-boot-samples
    • pom.xml
    • spring-boot-sample-activemq
    • spring-boot-sample-actuator
    • spring-boot-sample-actuator-custom-security
    • spring-boot-sample-actuator-log4j2
    • spring-boot-sample-actuator-noweb
    • spring-boot-sample-actuator-ui
    • spring-boot-sample-amqp
    • spring-boot-sample-ant
    • spring-boot-sample-aop
    • spring-boot-sample-atmosphere
    • spring-boot-sample-batch
    • spring-boot-sample-cache
    • spring-boot-sample-custom-layout
    • spring-boot-sample-data-cassandra
    • spring-boot-sample-data-couchbase
    • spring-boot-sample-data-elasticsearch
    • spring-boot-sample-data-jpa
    • spring-boot-sample-data-ldap
    • spring-boot-sample-data-mongodb
    • spring-boot-sample-data-neo4j
    • spring-boot-sample-data-redis
    • spring-boot-sample-data-rest
    • spring-boot-sample-data-solr
    • spring-boot-sample-devtools
    • spring-boot-sample-flyway
    • spring-boot-sample-hateoas
    • spring-boot-sample-integration
    • spring-boot-sample-jersey
    • spring-boot-sample-jersey1
    • spring-boot-sample-jetty
    • spring-boot-sample-jetty-jsp
    • spring-boot-sample-jetty-ssl
    • spring-boot-sample-jooq
    • spring-boot-sample-jpa
    • spring-boot-sample-jta-atomikos
    • spring-boot-sample-jta-bitronix
    • spring-boot-sample-jta-jndi
    • spring-boot-sample-jta-narayana
    • spring-boot-sample-junit-jupiter
    • spring-boot-sample-liquibase
    • spring-boot-sample-logback
    • spring-boot-sample-oauth2-client
    • spring-boot-sample-parent-context
    • spring-boot-sample-profile
    • spring-boot-sample-property-validation
    • spring-boot-sample-quartz
    • spring-boot-sample-secure
    • spring-boot-sample-secure-webflux
    • spring-boot-sample-servlet
    • spring-boot-sample-session
    • spring-boot-sample-simple
    • spring-boot-sample-test
    • spring-boot-sample-test-nomockito
    • spring-boot-sample-testng
    • spring-boot-sample-tomcat
    • spring-boot-sample-tomcat-jsp
    • spring-boot-sample-tomcat-multi-connectors
    • spring-boot-sample-tomcat-ssl
    • spring-boot-sample-traditional
    • spring-boot-sample-undertow
    • spring-boot-sample-undertow-ssl
    • spring-boot-sample-war
    • spring-boot-sample-web-freemarker
    • spring-boot-sample-web-groovy-templates
    • spring-boot-sample-web-jsp
    • spring-boot-sample-web-method-security
    • spring-boot-sample-web-mustache
    • spring-boot-sample-web-secure
    • spring-boot-sample-web-secure-custom
    • spring-boot-sample-web-secure-jdbc
    • spring-boot-sample-web-static
    • spring-boot-sample-web-ui
    • spring-boot-sample-webflux
    • spring-boot-sample-webservices
    • spring-boot-sample-websocket-jetty
    • spring-boot-sample-websocket-tomcat
    • spring-boot-sample-websocket-undertow
    • spring-boot-sample-xml
  • spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+358
-659
lines changed

Diff for: ‎spring-boot-samples/pom.xml

+90-106
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
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" 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" 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">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>
67
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
8-
<relativePath>../spring-boot-starters/spring-boot-starter-parent</relativePath>
8+
<version>${revision}</version>
9+
<relativePath>../spring-boot-project/spring-boot-starters/spring-boot-starter-parent</relativePath>
910
</parent>
1011
<artifactId>spring-boot-samples</artifactId>
1112
<packaging>pom</packaging>
1213
<name>Spring Boot Samples</name>
1314
<description>Spring Boot Samples</description>
14-
<url>http://projects.spring.io/spring-boot/</url>
15-
<organization>
16-
<name>Pivotal Software, Inc.</name>
17-
<url>http://www.spring.io</url>
18-
</organization>
1915
<properties>
2016
<main.basedir>${basedir}/..</main.basedir>
2117
<java.version>1.8</java.version>
@@ -103,6 +99,77 @@
10399
<!-- No dependencies - otherwise the samples won't work if you change the
104100
parent -->
105101
<build>
102+
<pluginManagement>
103+
<plugins>
104+
<plugin>
105+
<groupId>org.codehaus.mojo</groupId>
106+
<artifactId>flatten-maven-plugin</artifactId>
107+
<inherited>true</inherited>
108+
<executions>
109+
<execution>
110+
<id>flatten</id>
111+
<phase>process-resources</phase>
112+
<goals>
113+
<goal>flatten</goal>
114+
</goals>
115+
<configuration>
116+
<updatePomFile>true</updatePomFile>
117+
<flattenMode>oss</flattenMode>
118+
</configuration>
119+
</execution>
120+
</executions>
121+
</plugin>
122+
<plugin>
123+
<groupId>org.eclipse.m2e</groupId>
124+
<artifactId>lifecycle-mapping</artifactId>
125+
<version>1.0.0</version>
126+
<configuration>
127+
<lifecycleMappingMetadata>
128+
<pluginExecutions>
129+
<pluginExecution>
130+
<pluginExecutionFilter>
131+
<groupId>
132+
org.apache.maven.plugins
133+
</groupId>
134+
<artifactId>
135+
maven-enforcer-plugin
136+
</artifactId>
137+
<versionRange>
138+
[1.3.1,)
139+
</versionRange>
140+
<goals>
141+
<goal>enforce</goal>
142+
</goals>
143+
</pluginExecutionFilter>
144+
<action>
145+
<ignore />
146+
</action>
147+
</pluginExecution>
148+
<pluginExecution>
149+
<pluginExecutionFilter>
150+
<groupId>
151+
org.springframework.boot
152+
</groupId>
153+
<artifactId>
154+
spring-boot-maven-plugin
155+
</artifactId>
156+
<versionRange>
157+
[1.4.0.BUILD-SNAPSHOT,)
158+
</versionRange>
159+
<goals>
160+
<goal>build-info</goal>
161+
</goals>
162+
</pluginExecutionFilter>
163+
<action>
164+
<ignore />
165+
</action>
166+
</pluginExecution>
167+
</pluginExecutions>
168+
</lifecycleMappingMetadata>
169+
</configuration>
170+
</plugin>
171+
</plugins>
172+
</pluginManagement>
106173
<plugins>
107174
<plugin>
108175
<groupId>org.apache.maven.plugins</groupId>
@@ -160,106 +227,23 @@
160227
</execution>
161228
</executions>
162229
</plugin>
230+
<plugin>
231+
<groupId>org.apache.maven.plugins</groupId>
232+
<artifactId>maven-install-plugin</artifactId>
233+
<configuration>
234+
<skip>true</skip>
235+
</configuration>
236+
</plugin>
237+
<plugin>
238+
<groupId>org.apache.maven.plugins</groupId>
239+
<artifactId>maven-javadoc-plugin</artifactId>
240+
<configuration>
241+
<skip>true</skip>
242+
</configuration>
243+
<inherited>true</inherited>
244+
</plugin>
163245
</plugins>
164-
<pluginManagement>
165-
<plugins>
166-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
167-
<plugin>
168-
<groupId>org.eclipse.m2e</groupId>
169-
<artifactId>lifecycle-mapping</artifactId>
170-
<version>1.0.0</version>
171-
<configuration>
172-
<lifecycleMappingMetadata>
173-
<pluginExecutions>
174-
<pluginExecution>
175-
<pluginExecutionFilter>
176-
<groupId>
177-
org.apache.maven.plugins
178-
</groupId>
179-
<artifactId>
180-
maven-enforcer-plugin
181-
</artifactId>
182-
<versionRange>
183-
[1.3.1,)
184-
</versionRange>
185-
<goals>
186-
<goal>enforce</goal>
187-
</goals>
188-
</pluginExecutionFilter>
189-
<action>
190-
<ignore />
191-
</action>
192-
</pluginExecution>
193-
<pluginExecution>
194-
<pluginExecutionFilter>
195-
<groupId>
196-
org.springframework.boot
197-
</groupId>
198-
<artifactId>
199-
spring-boot-maven-plugin
200-
</artifactId>
201-
<versionRange>
202-
[1.4.0.BUILD-SNAPSHOT,)
203-
</versionRange>
204-
<goals>
205-
<goal>build-info</goal>
206-
</goals>
207-
</pluginExecutionFilter>
208-
<action>
209-
<ignore />
210-
</action>
211-
</pluginExecution>
212-
</pluginExecutions>
213-
</lifecycleMappingMetadata>
214-
</configuration>
215-
</plugin>
216-
</plugins>
217-
</pluginManagement>
218246
</build>
219-
<repositories>
220-
<repository>
221-
<id>spring-snapshots</id>
222-
<name>Spring Snapshots</name>
223-
<url>http://repo.spring.io/snapshot</url>
224-
<snapshots>
225-
<enabled>true</enabled>
226-
</snapshots>
227-
</repository>
228-
<repository>
229-
<id>spring-milestones</id>
230-
<name>Spring Milestones</name>
231-
<url>http://repo.spring.io/milestone</url>
232-
<snapshots>
233-
<enabled>false</enabled>
234-
</snapshots>
235-
</repository>
236-
</repositories>
237-
<pluginRepositories>
238-
<pluginRepository>
239-
<id>spring-snapshots</id>
240-
<name>Spring Snapshots</name>
241-
<url>http://repo.spring.io/snapshot</url>
242-
<snapshots>
243-
<enabled>true</enabled>
244-
</snapshots>
245-
</pluginRepository>
246-
<pluginRepository>
247-
<id>spring-milestones</id>
248-
<name>Spring Milestones</name>
249-
<url>http://repo.spring.io/milestone</url>
250-
<snapshots>
251-
<enabled>false</enabled>
252-
</snapshots>
253-
</pluginRepository>
254-
<pluginRepository>
255-
<id>spring-releases</id>
256-
<name>Spring Releases</name>
257-
<url>http://repo.spring.io/release</url>
258-
<snapshots>
259-
<enabled>false</enabled>
260-
</snapshots>
261-
</pluginRepository>
262-
</pluginRepositories>
263247
<profiles>
264248
<profile>
265249
<id>java9</id>

Diff for: ‎spring-boot-samples/spring-boot-sample-activemq/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
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" 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" 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">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<!-- Your own application should inherit from spring-boot-starter-parent -->
67
<artifactId>spring-boot-samples</artifactId>
78
<groupId>org.springframework.boot</groupId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
9+
<version>${revision}</version>
910
</parent>
1011
<artifactId>spring-boot-sample-activemq</artifactId>
1112
<name>Spring Boot ActiveMQ Sample</name>
1213
<description>Spring Boot ActiveMQ Sample</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1814
<properties>
1915
<main.basedir>${basedir}/../..</main.basedir>
2016
</properties>

Diff for: ‎spring-boot-samples/spring-boot-sample-actuator-custom-security/pom.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@
66
<!-- Your own application should inherit from spring-boot-starter-parent -->
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-samples</artifactId>
9-
<version>2.0.0.BUILD-SNAPSHOT</version>
9+
<version>${revision}</version>
1010
</parent>
1111
<artifactId>spring-boot-sample-actuator-custom-security</artifactId>
1212
<name>Spring Boot Actuator Custom Security Sample</name>
1313
<description>Spring Boot Actuator Custom Security Sample</description>
14-
<url>http://projects.spring.io/spring-boot/</url>
15-
<organization>
16-
<name>Pivotal Software, Inc.</name>
17-
<url>http://www.spring.io</url>
18-
</organization>
1914
<properties>
2015
<main.basedir>${basedir}/../..</main.basedir>
2116
</properties>

Diff for: ‎spring-boot-samples/spring-boot-sample-actuator-log4j2/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
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" 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" 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">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<!-- Your own application should inherit from spring-boot-starter-parent -->
67
<groupId>org.springframework.boot</groupId>
78
<artifactId>spring-boot-samples</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
9+
<version>${revision}</version>
910
</parent>
1011
<artifactId>spring-boot-sample-actuator-log4j2</artifactId>
1112
<name>Spring Boot Actuator Log4j 2 Sample</name>
1213
<description>Spring Boot Actuator Log4j 2 Sample</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1814
<properties>
1915
<main.basedir>${basedir}/../..</main.basedir>
2016
</properties>

Diff for: ‎spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
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" 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" 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">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<!-- Your own application should inherit from spring-boot-starter-parent -->
67
<groupId>org.springframework.boot</groupId>
78
<artifactId>spring-boot-samples</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
9+
<version>${revision}</version>
910
</parent>
1011
<artifactId>spring-boot-sample-actuator-noweb</artifactId>
1112
<name>Spring Boot Actuator Non-Web Sample</name>
1213
<description>Spring Boot Actuator Non-Web Sample</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1814
<properties>
1915
<main.basedir>${basedir}/../..</main.basedir>
2016
</properties>

Diff for: ‎spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
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" 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" 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">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<!-- Your own application should inherit from spring-boot-starter-parent -->
67
<groupId>org.springframework.boot</groupId>
78
<artifactId>spring-boot-samples</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
9+
<version>${revision}</version>
910
</parent>
1011
<artifactId>spring-boot-sample-actuator-ui</artifactId>
1112
<name>Spring Boot Actuator UI Sample</name>
1213
<description>Spring Boot Actuator UI Sample</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1814
<properties>
1915
<main.basedir>${basedir}/../..</main.basedir>
2016
</properties>

Diff for: ‎spring-boot-samples/spring-boot-sample-actuator/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
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" 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" 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">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<!-- Your own application should inherit from spring-boot-starter-parent -->
67
<groupId>org.springframework.boot</groupId>
78
<artifactId>spring-boot-samples</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
9+
<version>${revision}</version>
910
</parent>
1011
<artifactId>spring-boot-sample-actuator</artifactId>
1112
<name>Spring Boot Actuator Sample</name>
1213
<description>Spring Boot Actuator Sample</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1814
<properties>
1915
<main.basedir>${basedir}/../..</main.basedir>
2016
</properties>

Diff for: ‎spring-boot-samples/spring-boot-sample-amqp/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
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" 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" 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">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<!-- Your own application should inherit from spring-boot-starter-parent -->
67
<groupId>org.springframework.boot</groupId>
78
<artifactId>spring-boot-samples</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
9+
<version>${revision}</version>
910
</parent>
1011
<artifactId>spring-boot-sample-amqp</artifactId>
1112
<name>Spring Boot AMQP Sample</name>
1213
<description>Spring Boot AMQP Sample</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1814
<properties>
1915
<main.basedir>${basedir}/../..</main.basedir>
2016
</properties>

0 commit comments

Comments
 (0)