From 548ed4e14a7f8bf2fe67ddeb8c4f937b70010479 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 6 Dec 2013 14:44:21 -0600 Subject: [PATCH] Update samples to declare repository already added --- .../_hello-includes/secure-the-application.asc | 2 +- .../_includes/maven-repository-milestone.asc | 2 +- .../_includes/maven-repository-snapshot.asc | 2 +- gradle/maven-deployment.gradle | 13 ++++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/guides/src/asciidoc/_hello-includes/secure-the-application.asc b/docs/guides/src/asciidoc/_hello-includes/secure-the-application.asc index e6396a600c..22dbe14a99 100644 --- a/docs/guides/src/asciidoc/_hello-includes/secure-the-application.asc +++ b/docs/guides/src/asciidoc/_hello-includes/secure-the-application.asc @@ -1,6 +1,6 @@ == Securing the application -Before securing your application, it is important to ensure that the existing application works as we did in <>. Now that the application runs without security, we are ready to add security to our application. This section demonstrates the minimal steps to add Spring Security to a Spring MVC application. +Before securing your application, it is important to ensure that the existing application works as we did in <>. Now that the application runs without security, we are ready to add security to our application. This section demonstrates the minimal steps to add Spring Security to our application. === Updating your dependencies diff --git a/docs/guides/src/asciidoc/_includes/maven-repository-milestone.asc b/docs/guides/src/asciidoc/_includes/maven-repository-milestone.asc index 75009e17c3..9414018722 100644 --- a/docs/guides/src/asciidoc/_includes/maven-repository-milestone.asc +++ b/docs/guides/src/asciidoc/_includes/maven-repository-milestone.asc @@ -1,4 +1,4 @@ -In order to resolve Spring Security milestones and release candidates add the Spring Milestone repository as shown below: +In order to resolve Spring Security milestones and release candidates add the Spring Milestone repository. For our example, the repository has already been added for you. In the event you were working on another application, you would need to ensure you add the following to your pom: .pom.xml [source,xml] diff --git a/docs/guides/src/asciidoc/_includes/maven-repository-snapshot.asc b/docs/guides/src/asciidoc/_includes/maven-repository-snapshot.asc index 6b58902aa9..8a1c04f964 100644 --- a/docs/guides/src/asciidoc/_includes/maven-repository-snapshot.asc +++ b/docs/guides/src/asciidoc/_includes/maven-repository-snapshot.asc @@ -1,4 +1,4 @@ -In order to resolve Spring Security SNAPSHOT dependencies add the Spring Snapshot repository as shown below: +In order to resolve Spring Security SNAPSHOT dependencies add the Spring Snapshot repository. For our example, the repository has already been added for you. In the event you were working on another application, you would need to ensure you add the following to your pom: .pom.xml [source,xml] diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index e865a6c1e8..c9bca8f605 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -65,7 +65,7 @@ def customizePom(pom, gradleProject) { developer { id = 'rwinch' name = 'Rob Winch' - email = 'rwinch@vmware.com' + email = 'rwinch@gopivotal.com' } } if(isWar) { @@ -73,11 +73,18 @@ def customizePom(pom, gradleProject) { 'm2eclipse.wtp.contextRoot' '/' + project.war.baseName } } - if(!project.releaseBuild) { + if(project.snapshotBuild) { repositories { repository { id 'spring-snasphot' - url 'http://repo.springsource.org/libs-snapshot' + url 'https://repo.spring.io/snapshot' + } + } + } else if(!project.releaseBuild) { + repositories { + repository { + id 'spring-milestone' + url 'https://repo.spring.io/milestone' } } }