Browse Source

Merge branch '1.5.x'

pull/7193/merge
Stephane Nicoll 9 years ago
parent
commit
fcb405ebde
  1. 1
      spring-boot-samples/pom.xml
  2. 1
      spring-boot-samples/spring-boot-sample-custom-layout/pom.xml
  3. 35
      spring-boot-samples/spring-boot-sample-custom-layout/src/it/settings.xml

1
spring-boot-samples/pom.xml

@ -153,6 +153,7 @@ @@ -153,6 +153,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>enforce-rules</id>

1
spring-boot-samples/spring-boot-sample-custom-layout/pom.xml

@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.10</version>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<settingsFile>src/it/settings.xml</settingsFile>

35
spring-boot-samples/spring-boot-sample-custom-layout/src/it/settings.xml

@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<profiles>
<profile>
<id>it-repo</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>local.central</id>
<url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
<url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>
Loading…
Cancel
Save