Skip to content

S
spring-boot
Commit a3342592 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Rework POMs to support automated CI release

parent a44f8bc5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1139 additions and 815 deletions
.gitignore
View file @ a3342592
...@@ -17,4 +17,5 @@ _site/ ...@@ -17,4 +17,5 @@ _site/
.*.md.html .*.md.html
manifest.yml manifest.yml
MANIFEST.MF MANIFEST.MF
settings.xml
.settings-template.xml 0 → 100644
View file @ a3342592
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
<activeProfiles>
<activeProfile>@profile@</activeProfile>
</activeProfiles>
</settings>
CONTRIBUTING.md
View file @ a3342592
...@@ -34,8 +34,10 @@ and tools should also work without issue. ...@@ -34,8 +34,10 @@ and tools should also work without issue.
### Building from source ### Building from source
To build the source you will need to install To build the source you will need to install
[Apache Maven](http://maven.apache.org/run-maven/index.html) v3.0 or above. The project [Apache Maven](http://maven.apache.org/run-maven/index.html) v3.0 or above.
can be build using the standard maven command:
#### Default build
The project can be build from the root directory using the standard maven command:
$ mvn clean install $ mvn clean install
...@@ -47,6 +49,41 @@ to submit a pull request: ...@@ -47,6 +49,41 @@ to submit a pull request:
$ mvn clean install -DskipTests $ mvn clean install -DskipTests
#### Full Build
Multi-module Maven builds cannot directly include maven plugins that are part of the
reactor unless they have previously been built. Unfortunately this restriction causes
some compilations for Spring Boot as we include a maven plugin and use it within the
samples. The standard build works around this restriction by launching the samples via
the `maven-invoker-plugin` so that they are not part of the reactor. This works fine
most of the time, however, sometimes it useful to run a build that includes all modules
(for example when using `maven-versions-plugin`. We use the full build on our CI servers
and during the release process.
Running a full build is a two phase process.
1) Prepare the build
Preparing the build will compile and install the `spring-boot-maven-plugin` so that it
can be referenced during the full build. It also generates a `settings.xml` file that
enables a `snapshot`, `milestone` or `release` profiles based on the version being
build. To prepare the build, from the root directory use:
$ mvn -P snapshot,prepare install
> **NOTE:** You may notice that preparing the build also changes the
> `spring-boot-starter-parent` POM. This is required for our release process to work
> correctly.
2) Run the full build
Once the build has been prepared, you can run a full build using the following commands:
$ cd spring-boot-full-build
$ mvn -s ../settings.xml -P full clean install
We generate more artifacts when running the full build (such as Javadoc jars), so you
may find the process a little slower than the standard build.
### Importing into eclipse with m2eclipse ### Importing into eclipse with m2eclipse
We recommend the [m2eclipe](http://eclipse.org/m2e/) eclipse plugin when working with We recommend the [m2eclipe](http://eclipse.org/m2e/) eclipse plugin when working with
eclipse. If you don't already have m2eclipse installed it is available from the "eclipse eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
......
buildhelper/all/setversion.sh deleted 100755 → 0
View file @ a44f8bc5
if [ -z "$1" ]; then
echo "Specify the new version"
exit 1
fi
cd ../../spring-boot-dependencies
mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1
cd ..
mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1
cd buildhelper/all
mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1
mvn -N versions:update-child-modules -DgenerateBackupPoms=false
cd ../../spring-boot-starters
mvn -N validate
cd ../buildhelper/all
pom.xml
View file @ a3342592
...@@ -12,28 +12,164 @@ ...@@ -12,28 +12,164 @@
<properties> <properties>
<main.basedir>${basedir}</main.basedir> <main.basedir>${basedir}</main.basedir>
</properties> </properties>
<modules>
<module>spring-boot-dependencies</module>
<module>spring-boot-parent</module>
<module>spring-boot</module>
<module>spring-boot-autoconfigure</module>
<module>spring-boot-tools</module>
<module>spring-boot-actuator</module>
<module>spring-boot-starters</module>
<module>spring-boot-cli</module>
<module>spring-boot-integration-tests</module>
</modules>
<build> <build>
<plugins> <pluginManagement>
<plugin> <plugins>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>2.7</version> <version>1.7</version>
<configuration> </plugin>
<skip>true</skip> </plugins>
</configuration> </pluginManagement>
<inherited>false</inherited>
</plugin>
</plugins>
</build> </build>
<profiles>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>spring-boot-dependencies</module>
<module>spring-boot-parent</module>
<module>spring-boot-tools</module>
<module>spring-boot</module>
<module>spring-boot-autoconfigure</module>
<module>spring-boot-actuator</module>
<module>spring-boot-starters</module>
<module>spring-boot-cli</module>
<module>spring-boot-integration-tests</module>
</modules>
</profile>
<profile>
<id>prepare</id>
<properties>
<skipTests>true</skipTests>
</properties>
<modules>
<module>spring-boot-tools</module>
</modules>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>org.tigris.antelope</groupId>
<artifactId>antelopetasks</artifactId>
<version>3.2.10</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>generate-settings.xml</id>
<phase>verify</phase>
<goals>
<goal>run</goal>
</goals>
<inherited>false</inherited>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
<var name="version-type" value="${project.version}" />
<propertyregex property="version-type" override="true"
input="${version-type}" regexp=".*\.(.*)" replace="\1" />
<propertyregex property="version-type" override="true"
input="${version-type}" regexp="(M)\d+" replace="\1ILESTONE" />
<propertyregex property="version-type" override="true"
input="${version-type}" regexp="BUILD-(.*)" replace="\1" />
<stringutil string="${version-type}" property="profile">
<lowercase />
</stringutil>
<echo message="Writing settings for ${profile} profile" />
<copy file=".settings-template.xml" tofile="settings.xml"
overwrite="true">
<filterset>
<filter token="profile" value="${profile}" />
</filterset>
</copy>
</target>
</configuration>
</execution>
<execution>
<id>fixup-starter-parent</id>
<phase>verify</phase>
<goals>
<goal>run</goal>
</goals>
<inherited>false</inherited>
<configuration>
<target>
<property name="sourceFile"
value="spring-boot-starters/spring-boot-starter-parent/pom.xml" />
<xslt in="${sourceFile}" out="${sourceFile}.new" force="true">
<style>
<string><![CDATA[
<xsl:stylesheet version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0"
exclude-result-prefixes="m">
<xsl:template match="node()|@*">
<xsl:copy>
<xsl:apply-templates select="node()|@*" />
</xsl:copy>
</xsl:template>
<xsl:template
match="m:properties/m:spring-boot.version/text()">
<xsl:value-of select="/m:project/m:parent/m:version/text()"/>
</xsl:template>
<xsl:template
match="m:dependency[m:groupId='org.springframework.boot']/m:version/text()">
<xsl:text>${spring-boot.version}</xsl:text>
</xsl:template>
<xsl:template
match="m:plugin[m:groupId='org.springframework.boot']/m:version/text()">
<xsl:text>${spring-boot.version}</xsl:text>
</xsl:template>
</xsl:stylesheet>
]]>
</string>
</style>
</xslt>
<move file="${sourceFile}" tofile="${sourceFile}.old" />
<move file="${sourceFile}.new" tofile="${sourceFile}" />
<delete file="${sourceFile}.old" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>full</id>
</profile>
</profiles>
</project> </project>
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java
View file @ a3342592
...@@ -52,11 +52,11 @@ import org.apache.ivy.util.MessageLogger; ...@@ -52,11 +52,11 @@ import org.apache.ivy.util.MessageLogger;
import org.springframework.boot.cli.Log; import org.springframework.boot.cli.Log;
/** /**
* Customizes the groovy grape engine to enhance and patch the behaviour of ivy. Can add * Customizes the groovy grape engine to enhance and patch the behavior of ivy. Can add
* Spring repos to the search path, provide simple log progress feedback if downloads are * Spring repos to the search path, provide simple log progress feedback if downloads are
* taking a long time, and also fixes a problem where ivy cannot use a local Maven cache * taking a long time, and also fixes a problem where ivy cannot use a local Maven cache
* repo. * repo.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Dave Syer * @author Dave Syer
*/ */
......
spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
View file @ a3342592
...@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; ...@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue;
/** /**
* Integration tests to exercise the samples. * Integration tests to exercise the samples.
* *
* @author Dave Syer * @author Dave Syer
*/ */
public class SampleIntegrationTests { public class SampleIntegrationTests {
......
spring-boot-dependencies/pom.xml
View file @ a3342592
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
<thymeleaf-layout-dialect.version>1.1.1</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>1.1.1</thymeleaf-layout-dialect.version>
<tomcat.version>7.0.42</tomcat.version> <tomcat.version>7.0.42</tomcat.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -435,6 +434,10 @@ ...@@ -435,6 +434,10 @@
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
</plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
...@@ -522,36 +525,4 @@ ...@@ -522,36 +525,4 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<profiles>
<profile>
<id>spring-deploy</id>
<distributionManagement>
<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
<site>
<id>spring-docs</id>
<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version}</url>
</site>
<repository>
<id>spring-repo-release</id>
<name>Spring Release Repository</name>
<url>http://repo.springsource.org/libs-release-local</url>
</repository>
<snapshotRepository>
<id>spring-repo-snapshot</id>
<name>Spring Snapshot Repository</name>
<url>http://repo.springsource.org/libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
</profile>
<profile>
<id>milestone</id>
<distributionManagement>
<repository>
<id>spring-repo-milestone</id>
<name>Spring Milestone Repository</name>
<url>http://repo.springsource.org/libs-milestone-local</url>
</repository>
</distributionManagement>
</profile>
</profiles>
</project> </project>
spring-boot-full-build/Copy of pom.xml 0 → 100644
View file @ a3342592
This diff is collapsed.
buildhelper/all/pom.xml → spring-boot-full-build/pom.xml
View file @ a3342592
<?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" <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"> 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>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-build-all</artifactId> <artifactId>spring-boot-full-build</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<prerequisites>
<maven>3.0.0</maven>
</prerequisites>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<modules> <modules>
<module>../..</module> <module>../</module>
<module>../../spring-boot-samples</module> <module>../spring-boot-dependencies</module>
<module>../spring-boot-parent</module>
<module>../spring-boot-tools</module>
<module>../spring-boot</module>
<module>../spring-boot-autoconfigure</module>
<module>../spring-boot-actuator</module>
<module>../spring-boot-starters</module>
<module>../spring-boot-cli</module>
<module>../spring-boot-samples</module>
<module>../spring-boot-integration-tests</module>
</modules> </modules>
</project> <profiles>
\ No newline at end of file <profile>
<id>full</id>
</profile>
</profiles>
</project>
spring-boot-integration-tests/pom.xml
View file @ a3342592
...@@ -13,132 +13,41 @@ ...@@ -13,132 +13,41 @@
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
</properties> </properties>
<dependencies> <profiles>
<!-- Ensure other reactor projects are built before running integration <profile>
tests --> <id>default</id>
<dependency> <activation>
<groupId>${project.groupId}</groupId> <activeByDefault>true</activeByDefault>
<artifactId>spring-boot</artifactId> </activation>
<version>${project.version}</version> <build>
</dependency> <plugins>
<dependency> <plugin>
<groupId>${project.groupId}</groupId> <!-- Invoke integration tests in the install phase, after the maven-plugin
<artifactId>spring-boot-autoconfigure</artifactId> is available -->
<version>${project.version}</version> <artifactId>maven-invoker-plugin</artifactId>
</dependency> <configuration>
<dependency> <settingsFile>src/it/settings.xml</settingsFile>
<groupId>${project.groupId}</groupId> <projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory>
<artifactId>spring-boot-cli</artifactId> <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<version>${project.version}</version> <skipInvocation>${skipTests}</skipInvocation>
</dependency> <streamLogs>true</streamLogs>
<dependency> </configuration>
<groupId>${project.groupId}</groupId> <executions>
<artifactId>spring-boot-loader</artifactId> <execution>
<version>${project.version}</version> <id>integration-test</id>
</dependency> <phase>install</phase>
<dependency> <goals>
<groupId>${project.groupId}</groupId> <goal>install</goal>
<artifactId>spring-boot-maven-plugin</artifactId> <goal>run</goal>
<version>${project.version}</version> </goals>
</dependency> </execution>
<dependency> </executions>
<groupId>${project.groupId}</groupId> </plugin>
<artifactId>spring-boot-actuator</artifactId> </plugins>
<version>${project.version}</version> </build>
</dependency> </profile>
<dependency> <profile>
<groupId>${project.groupId}</groupId> <id>full</id>
<artifactId>spring-boot-starter</artifactId> </profile>
<version>${project.version}</version> </profiles>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-batch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<!-- Invoke integration tests in the install phase, after the maven-plugin
is available -->
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<settingsFile>src/it/settings.xml</settingsFile>
<projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory>
<pomExcludes>
<!-- temporarily suspend integration test (Bamboo doesn't like it,
WTF?) -->
<pomExclude>spring-boot-sample-websocket/pom.xml</pomExclude>
</pomExcludes>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<skipInvocation>${skipTests}</skipInvocation>
<streamLogs>true</streamLogs>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<phase>install</phase>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
spring-boot-parent/pom.xml
View file @ a3342592
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.version>3.0.5</maven.version> <maven.version>3.0.5</maven.version>
<spring-snapshot-build-profile-active>false</spring-snapshot-build-profile-active>
</properties> </properties>
<developers> <developers>
<developer> <developer>
...@@ -201,6 +200,10 @@ ...@@ -201,6 +200,10 @@
<artifactId>maven-invoker-plugin</artifactId> <artifactId>maven-invoker-plugin</artifactId>
<version>1.8</version> <version>1.8</version>
</plugin> </plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
</plugin>
<plugin> <plugin>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<version>3.2</version> <version>3.2</version>
...@@ -236,6 +239,10 @@ ...@@ -236,6 +239,10 @@
</additionalConfig> </additionalConfig>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
</plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
...@@ -247,28 +254,6 @@ ...@@ -247,28 +254,6 @@
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
...@@ -294,16 +279,10 @@ ...@@ -294,16 +279,10 @@
</build> </build>
<profiles> <profiles>
<profile> <profile>
<!-- Allow snapshots and milestones when building locally, this profile <id>default</id>
should not be enabled during release. -->
<id>spring-snapshot-build</id>
<activation> <activation>
<!-- FIXME disable this during release -->
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties>
<spring-snapshot-build-profile-active>true</spring-snapshot-build-profile-active>
</properties>
<repositories> <repositories>
<repository> <repository>
<id>spring-milestones</id> <id>spring-milestones</id>
...@@ -341,6 +320,148 @@ ...@@ -341,6 +320,148 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</profile> </profile>
<profile>
<id>full</id>
<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>snapshot</id>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://maven.springframework.org/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://maven.springframework.org/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://maven.springframework.org/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://maven.springframework.org/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>milestone</id>
<activation>
</activation>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://maven.springframework.org/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://maven.springframework.org/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-milestone-rules</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireReleaseDeps />
<requireReleaseVersion />
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<activation>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-milestone-rules</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireReleaseDeps />
<requireReleaseVersion />
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile> <profile>
<id>jdk8</id> <id>jdk8</id>
<activation> <activation>
......
spring-boot-samples/pom.xml
View file @ a3342592
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<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-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-boot-parent</relativePath> <relativePath>../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-samples</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
...@@ -30,37 +30,55 @@ ...@@ -30,37 +30,55 @@
<module>spring-boot-sample-websocket</module> <module>spring-boot-sample-websocket</module>
<module>spring-boot-sample-xml</module> <module>spring-boot-sample-xml</module>
</modules> </modules>
<build> <dependencies>
<pluginManagement> <!-- Test -->
<plugins> <dependency>
<plugin> <groupId>${project.groupId}</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>spring-boot</artifactId>
<artifactId>maven-deploy-plugin</artifactId> <version>${project.version}</version>
<configuration> <classifier>tests</classifier>
<skip>true</skip> <scope>test</scope>
</configuration> </dependency>
</plugin> <dependency>
<plugin> <groupId>org.springframework</groupId>
<groupId>${project.groupId}</groupId> <artifactId>spring-test</artifactId>
<artifactId>spring-boot-maven-plugin</artifactId> <scope>test</scope>
<version>${project.version}</version> </dependency>
<extensions>true</extensions> </dependencies>
<executions> <repositories>
<execution> <repository>
<goals> <id>spring-snapshots</id>
<goal>repackage</goal> <name>Spring Snapshots</name>
</goals> <url>http://maven.springframework.org/snapshot</url>
</execution> <snapshots>
</executions> <enabled>true</enabled>
</plugin> </snapshots>
<plugin> </repository>
<artifactId>maven-war-plugin</artifactId> <repository>
<version>2.3</version> <id>spring-milestones</id>
<configuration> <name>Spring Milestones</name>
<failOnMissingWebXml>false</failOnMissingWebXml> <url>http://maven.springframework.org/milestone</url>
</configuration> <snapshots>
</plugin> <enabled>false</enabled>
</plugins> </snapshots>
</pluginManagement> </repository>
</build> </repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://maven.springframework.org/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://maven.springframework.org/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-actuator-ui</artifactId> <artifactId>spring-boot-sample-actuator-ui</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-actuator/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-actuator</artifactId> <artifactId>spring-boot-sample-actuator</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-batch/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-batch</artifactId> <artifactId>spring-boot-sample-batch</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -18,20 +18,11 @@ ...@@ -18,20 +18,11 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter-batch</artifactId> <artifactId>spring-boot-starter-batch</artifactId>
</dependency> </dependency>
<!-- This dependency is just for our integration testing, your app would
not need it -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-data-jpa</artifactId> <artifactId>spring-boot-sample-data-jpa</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-integration/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-integration</artifactId> <artifactId>spring-boot-sample-integration</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-jetty/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-jetty</artifactId> <artifactId>spring-boot-sample-jetty</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-profile/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-profile</artifactId> <artifactId>spring-boot-sample-profile</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -23,20 +23,11 @@ ...@@ -23,20 +23,11 @@
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!-- This dependency is just for our integration testing, your app would
not need it -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-simple/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-simple</artifactId> <artifactId>spring-boot-sample-simple</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -18,20 +18,11 @@ ...@@ -18,20 +18,11 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<!-- This dependency is just for our integration testing, your app would
not need it -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-tomcat</artifactId> <artifactId>spring-boot-sample-tomcat</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-traditional/pom.xml
View file @ a3342592
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-traditional</artifactId> <artifactId>spring-boot-sample-traditional</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-web-jsp</artifactId> <artifactId>spring-boot-sample-web-jsp</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
...@@ -32,10 +36,6 @@ ...@@ -32,10 +36,6 @@
<useSystemClassLoader>false</useSystemClassLoader> <useSystemClassLoader>false</useSystemClassLoader>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
spring-boot-samples/spring-boot-sample-web-static/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-web-static</artifactId> <artifactId>spring-boot-sample-web-static</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-web-ui</artifactId> <artifactId>spring-boot-sample-web-ui</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-samples/spring-boot-sample-websocket/pom.xml
View file @ a3342592
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>spring-boot-sample-websocket</artifactId> <artifactId>spring-boot-sample-websocket</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<parent> <parent>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<properties> <properties>
<java.version>1.7</java.version> <java.version>1.7</java.version>
<tomcat.version>8.0.0-RC1</tomcat.version> <tomcat.version>8.0.0-RC1</tomcat.version>
<start-class>org.springframework.boot.samples.websocket.config.SampleWebSocketsApplication</start-class>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -29,7 +23,6 @@ ...@@ -29,7 +23,6 @@
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
...@@ -38,5 +31,4 @@ ...@@ -38,5 +31,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
spring-boot-samples/spring-boot-sample-xml/pom.xml
View file @ a3342592
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-samples</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../../spring-boot-starters/spring-boot-starter-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-sample-xml</artifactId> <artifactId>spring-boot-sample-xml</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -18,20 +18,11 @@ ...@@ -18,20 +18,11 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<!-- This dependency is just for our integration testing, your app would
not need it -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>${project.groupId}</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
......
spring-boot-starters/pom.xml
View file @ a3342592
...@@ -27,34 +27,4 @@ ...@@ -27,34 +27,4 @@
<module>spring-boot-starter-web</module> <module>spring-boot-starter-web</module>
<module>spring-boot-starter-websocket</module> <module>spring-boot-starter-websocket</module>
</modules> </modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<inherited>false</inherited>
<configuration>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@{*}</delimiter>
</delimiters>
<resources>
<resource>
<directory>${basedir}/spring-boot-starter-parent/src/main/maven</directory>
<filtering>true</filtering>
</resource>
</resources>
<outputDirectory>${basedir}/spring-boot-starter-parent</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
spring-boot-starters/spring-boot-starter-parent/pom.xml
View file @ a3342592
<?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">
<!-- This POM file that can be used as a parent for your own builds. It provides
generally useful dependencies and plugins. NOTE: If you are editing a local
checkout of this file, be sure to modify 'spring-boot-starter-parent/src/main/parent/pom.xml'. -->
<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>
...@@ -16,8 +9,8 @@ ...@@ -16,8 +9,8 @@
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<spring.boot.version>0.5.0.BUILD-SNAPSHOT</spring.boot.version>
<java.version>1.6</java.version> <java.version>1.6</java.version>
<spring-boot.version>0.5.0.BUILD-SNAPSHOT</spring-boot.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
...@@ -36,62 +29,62 @@ ...@@ -36,62 +29,62 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId> <artifactId>spring-boot</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator</artifactId> <artifactId>spring-boot-actuator</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId> <artifactId>spring-boot-starter-tomcat</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId> <artifactId>spring-boot-starter-jetty</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-batch</artifactId> <artifactId>spring-boot-starter-batch</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-integration</artifactId> <artifactId>spring-boot-starter-integration</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId> <artifactId>spring-boot-starter-websocket</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -112,17 +105,6 @@ ...@@ -112,17 +105,6 @@
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest-library</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
<build> <build>
<!-- Turn on filtering by default for application properties --> <!-- Turn on filtering by default for application properties -->
...@@ -219,7 +201,7 @@ ...@@ -219,7 +201,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
...@@ -240,7 +222,7 @@ ...@@ -240,7 +222,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
...@@ -265,22 +247,17 @@ ...@@ -265,22 +247,17 @@
</goals> </goals>
<configuration> <configuration>
<transformers> <transformers>
<transformer <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.handlers</resource> <resource>META-INF/spring.handlers</resource>
</transformer> </transformer>
<transformer <transformer implementation="org.springframework.maven.packaging.PropertiesMergingResourceTransformer">
implementation="org.springframework.maven.packaging.PropertiesMergingResourceTransformer">
<resource>META-INF/spring.factories</resource> <resource>META-INF/spring.factories</resource>
</transformer> </transformer>
<transformer <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource> <resource>META-INF/spring.schemas</resource>
</transformer> </transformer>
<transformer <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass> <mainClass>${start-class}</mainClass>
</transformer> </transformer>
</transformers> </transformers>
...@@ -291,48 +268,4 @@ ...@@ -291,48 +268,4 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<profiles> </project>
<profile> \ No newline at end of file
<id>spring-snapshot-build</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://maven.springframework.org/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://maven.springframework.org/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://maven.springframework.org/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://maven.springframework.org/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment