Commit 05171f6a authored by Phillip Webb's avatar Phillip Webb

Inherit profile activation spring-snapshot-build

Inherit default profile activation for spring-snapshot-build in the
spring-boot-starter-parent from the spring-boot-parent.

Allow sample projects to work correctly in eclipse.
parent c2c81441
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<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>
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
</scm> </scm>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Additional Dependencies the consumers of spring-boot-dependencies <!-- Additional Dependencies the consumers of spring-boot-dependencies
will generally not need --> will generally not need -->
<dependency> <dependency>
<groupId>net.sf.jopt-simple</groupId> <groupId>net.sf.jopt-simple</groupId>
...@@ -293,13 +294,16 @@ ...@@ -293,13 +294,16 @@
</build> </build>
<profiles> <profiles>
<profile> <profile>
<!-- Allow snapshots and milestones when building locally, this profile <!-- Allow snapshots and milestones when building locally, this profile
should not be enabled during release. --> should not be enabled during release. -->
<id>spring-snapshot-build</id> <id>spring-snapshot-build</id>
<activation> <activation>
<!-- FIXME disable this during release --> <!-- 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>
......
...@@ -277,6 +277,9 @@ ...@@ -277,6 +277,9 @@
<profiles> <profiles>
<profile> <profile>
<id>spring-snapshot-build</id> <id>spring-snapshot-build</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories> <repositories>
<repository> <repository>
<id>spring-milestones</id> <id>spring-milestones</id>
......
...@@ -277,6 +277,9 @@ ...@@ -277,6 +277,9 @@
<profiles> <profiles>
<profile> <profile>
<id>spring-snapshot-build</id> <id>spring-snapshot-build</id>
<activation>
<activeByDefault>@{spring-snapshot-build-profile-active}</activeByDefault>
</activation>
<repositories> <repositories>
<repository> <repository>
<id>spring-milestones</id> <id>spring-milestones</id>
......
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