Skip to content

Commit 4ff65d5

Browse files
philwebbphilwebb
committed
Fix integration test POMs
Update integration test POMs to use CI friendly version numbers. See gh-9316
1 parent 8670151 commit 4ff65d5

File tree

6 files changed

+28
-127
lines changed
  • spring-boot-tests/spring-boot-integration-tests
    • pom.xml
    • spring-boot-devtools-tests
    • spring-boot-integration-tests-embedded-servlet-container
    • spring-boot-launch-script-tests
    • spring-boot-security-tests

6 files changed

+28
-127
lines changed

‎spring-boot-tests/spring-boot-integration-tests/pom.xml

+16-91
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
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>
6-
<artifactId>spring-boot-parent</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
8-
<relativePath>../spring-boot-parent</relativePath>
7+
<artifactId>spring-boot-tests</artifactId>
8+
<version>${revision}</version>
99
</parent>
1010
<artifactId>spring-boot-integration-tests</artifactId>
1111
<packaging>pom</packaging>
1212
<name>Spring Boot Integration Tests</name>
1313
<description>Spring Boot Integration Tests</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>
20-
<main.basedir>${basedir}/..</main.basedir>
15+
<main.basedir>${basedir}/../..</main.basedir>
2116
<java.version>1.8</java.version>
2217
</properties>
2318
<modules>
@@ -26,85 +21,15 @@
2621
<module>spring-boot-launch-script-tests</module>
2722
<module>spring-boot-security-tests</module>
2823
</modules>
29-
<profiles>
30-
<profile>
31-
<id>default</id>
32-
<activation>
33-
<activeByDefault>true</activeByDefault>
34-
</activation>
35-
<build>
36-
<plugins>
37-
<plugin>
38-
<!-- Invoke integration tests in the install phase, after the maven-plugin
39-
is available -->
40-
<groupId>org.apache.maven.plugins</groupId>
41-
<artifactId>maven-invoker-plugin</artifactId>
42-
<inherited>false</inherited>
43-
<configuration>
44-
<settingsFile>src/it/settings.xml</settingsFile>
45-
<projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory>
46-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
47-
<skipInvocation>${skipTests}</skipInvocation>
48-
<streamLogs>true</streamLogs>
49-
<profiles>
50-
<profile>integration-test</profile>
51-
</profiles>
52-
<localRepositoryPath> </localRepositoryPath>
53-
<pomIncludes>
54-
<pomInclude>*/pom.xml</pomInclude>
55-
</pomIncludes>
56-
</configuration>
57-
<executions>
58-
<execution>
59-
<id>integration-test</id>
60-
<phase>install</phase>
61-
<goals>
62-
<goal>install</goal>
63-
<goal>run</goal>
64-
</goals>
65-
</execution>
66-
</executions>
67-
</plugin>
68-
<plugin>
69-
<groupId>org.apache.maven.plugins</groupId>
70-
<artifactId>maven-antrun-plugin</artifactId>
71-
<inherited>false</inherited>
72-
<executions>
73-
<execution>
74-
<id>clean-samples</id>
75-
<phase>clean</phase>
76-
<goals>
77-
<goal>run</goal>
78-
</goals>
79-
<configuration>
80-
<target>
81-
<delete includeemptydirs="true">
82-
<fileset dir="${main.basedir}/spring-boot-samples" includes="**/target/" />
83-
</delete>
84-
</target>
85-
</configuration>
86-
</execution>
87-
</executions>
88-
</plugin>
89-
<plugin>
90-
<groupId>org.apache.maven.plugins</groupId>
91-
<artifactId>maven-clean-plugin</artifactId>
92-
<inherited>false</inherited>
93-
<executions>
94-
<execution>
95-
<id>clean-samples</id>
96-
<phase>clean</phase>
97-
<goals>
98-
<goal>clean</goal>
99-
</goals>
100-
</execution>
101-
</executions>
102-
</plugin>
103-
</plugins>
104-
</build>
105-
</profile>
106-
<profile>
107-
<id>full</id>
108-
</profile>
109-
</profiles>
24+
<build>
25+
<plugins>
26+
<plugin>
27+
<groupId>org.apache.maven.plugins</groupId>
28+
<artifactId>maven-install-plugin</artifactId>
29+
<configuration>
30+
<skip>true</skip>
31+
</configuration>
32+
</plugin>
33+
</plugins>
34+
</build>
11035
</project>

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-integration-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
7+
<version>${revision}</version>
88
</parent>
99
<artifactId>spring-boot-devtools-tests</artifactId>
1010
<name>Spring Boot DevTools Tests</name>
1111
<description>${project.name}</description>
12-
<url>http://projects.spring.io/spring-boot/</url>
13-
<organization>
14-
<name>Pivotal Software, Inc.</name>
15-
<url>http://www.spring.io</url>
16-
</organization>
1712
<properties>
18-
<main.basedir>${basedir}/../..</main.basedir>
13+
<main.basedir>${basedir}/../../..</main.basedir>
1914
</properties>
2015
<dependencies>
2116
<dependency>

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml

+4-8
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-integration-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
8+
<version>${revision}</version>
89
</parent>
910
<artifactId>spring-boot-integration-tests-embedded-servlet-container</artifactId>
1011
<packaging>jar</packaging>
1112
<name>Spring Boot Embedded Servlet Container Integration Tests</name>
12-
<url>http://projects.spring.io/spring-boot/</url>
13-
<organization>
14-
<name>Pivotal Software, Inc.</name>
15-
<url>http://www.spring.io</url>
16-
</organization>
1713
<properties>
18-
<main.basedir>${basedir}/../..</main.basedir>
14+
<main.basedir>${basedir}/../../..</main.basedir>
1915
</properties>
2016
<dependencies>
2117
<dependency>

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-integration-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
7+
<version>${revision}</version>
88
</parent>
99
<artifactId>spring-boot-launch-script-tests</artifactId>
1010
<packaging>jar</packaging>
1111
<name>Spring Boot Launch Script Integration Tests</name>
1212
<description>Spring Boot Launch Script Integration Tests</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>
1813
<properties>
19-
<main.basedir>${basedir}/../..</main.basedir>
14+
<main.basedir>${basedir}/../../..</main.basedir>
2015
<jersey.version>2.11</jersey.version>
2116
</properties>
2217
<dependencies>

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-integration-tests</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
7+
<version>${revision}</version>
88
</parent>
99
<artifactId>spring-boot-security-tests</artifactId>
1010
<packaging>pom</packaging>
1111
<name>Spring Boot Security Tests</name>
1212
<description>${project.name}</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>
1813
<properties>
19-
<main.basedir>${basedir}/../..</main.basedir>
14+
<main.basedir>${basedir}/../../..</main.basedir>
2015
</properties>
2116
<modules>
2217
<module>spring-boot-security-test-web-helloworld</module>

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-security-tests</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
8+
<version>${revision}</version>
99
<relativePath>../</relativePath>
1010
</parent>
1111
<artifactId>spring-boot-security-test-web-helloworld</artifactId>
1212
<name>Spring Boot Security Tests - Web Hello World</name>
1313
<description>${project.name}</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>
20-
<main.basedir>${basedir}/../../..</main.basedir>
15+
<main.basedir>${basedir}/../../../..</main.basedir>
2116
</properties>
2217
<dependencies>
2318
<dependency>

0 commit comments

Comments
 (0)