GitHub-Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-05-03 03:43:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix integration test POMs

Browse Source 
Update integration test POMs to use CI friendly version numbers.

See gh-9316
This commit is contained in:
Phillip Webb
2017-08-04 09:32:24 -07:00
parent 8670151045
commit 4ff65d58a4
6 changed files with 28 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-tests/spring-boot-integration-tests/pom.xml
+16 -91
View File
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-parent</artifactId> <artifactId>spring-boot-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../spring-boot-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-integration-tests</artifactId> <artifactId>spring-boot-integration-tests</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Boot Integration Tests</name> <name>Spring Boot Integration Tests</name>
<description>Spring Boot Integration Tests</description> <description>Spring Boot Integration Tests</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/../..</main.basedir>
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>
<modules> <modules>
@@ -26,85 +21,15 @@
<module>spring-boot-launch-script-tests</module> <module>spring-boot-launch-script-tests</module>
<module>spring-boot-security-tests</module> <module>spring-boot-security-tests</module>
</modules> </modules>
<profiles> <build>
<profile> <plugins>
<id>default</id> <plugin>
<activation> <groupId>org.apache.maven.plugins</groupId>
<activeByDefault>true</activeByDefault> <artifactId>maven-install-plugin</artifactId>
</activation> <configuration>
<build> <skip>true</skip>
<plugins> </configuration>
<plugin> </plugin>
<!-- Invoke integration tests in the install phase, after the maven-plugin </plugins>
is available --> </build>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<settingsFile>src/it/settings.xml</settingsFile>
<projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<skipInvocation>${skipTests}</skipInvocation>
<streamLogs>true</streamLogs>
<profiles>
<profile>integration-test</profile>
</profiles>
<localRepositoryPath> </localRepositoryPath>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<phase>install</phase>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>clean-samples</id>
<phase>clean</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<delete includeemptydirs="true">
<fileset dir="${main.basedir}/spring-boot-samples" includes="**/target/" />
</delete>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>clean-samples</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>full</id>
</profile>
</profiles>
</project> </project>
spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml
+2 -7
View File
@@ -4,18 +4,13 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-integration-tests</artifactId> <artifactId>spring-boot-integration-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<artifactId>spring-boot-devtools-tests</artifactId> <artifactId>spring-boot-devtools-tests</artifactId>
<name>Spring Boot DevTools Tests</name> <name>Spring Boot DevTools Tests</name>
<description>${project.name}</description> <description>${project.name}</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml
+4 -8
View File
@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-integration-tests</artifactId> <artifactId>spring-boot-integration-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<artifactId>spring-boot-integration-tests-embedded-servlet-container</artifactId> <artifactId>spring-boot-integration-tests-embedded-servlet-container</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Spring Boot Embedded Servlet Container Integration Tests</name> <name>Spring Boot Embedded Servlet Container Integration Tests</name>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml
+2 -7
View File
@@ -4,19 +4,14 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-integration-tests</artifactId> <artifactId>spring-boot-integration-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<artifactId>spring-boot-launch-script-tests</artifactId> <artifactId>spring-boot-launch-script-tests</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Spring Boot Launch Script Integration Tests</name> <name>Spring Boot Launch Script Integration Tests</name>
<description>Spring Boot Launch Script Integration Tests</description> <description>Spring Boot Launch Script Integration Tests</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
<jersey.version>2.11</jersey.version> <jersey.version>2.11</jersey.version>
</properties> </properties>
<dependencies> <dependencies>
spring-boot-tests/spring-boot-integration-tests/spring-boot-security-tests/pom.xml
+2 -7
View File
@@ -4,19 +4,14 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-integration-tests</artifactId> <artifactId>spring-boot-integration-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<artifactId>spring-boot-security-tests</artifactId> <artifactId>spring-boot-security-tests</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Boot Security Tests</name> <name>Spring Boot Security Tests</name>
<description>${project.name}</description> <description>${project.name}</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
</properties> </properties>
<modules> <modules>
<module>spring-boot-security-test-web-helloworld</module> <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
View File
@@ -5,19 +5,14 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-security-tests</artifactId> <artifactId>spring-boot-security-tests</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
<artifactId>spring-boot-security-test-web-helloworld</artifactId> <artifactId>spring-boot-security-test-web-helloworld</artifactId>
<name>Spring Boot Security Tests - Web Hello World</name> <name>Spring Boot Security Tests - Web Hello World</name>
<description>${project.name}</description> <description>${project.name}</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<properties> <properties>
<main.basedir>${basedir}/../../..</main.basedir> <main.basedir>${basedir}/../../../..</main.basedir>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>