diff --git a/README.md b/README.md index 7fec05661f7..bc739dcf238 100644 --- a/README.md +++ b/README.md @@ -40,10 +40,10 @@ before you begin: ### Manual installation You can download the Spring CLI distribution from the Spring software repository: -* [spring-boot-cli-0.5.0.M4-bin.zip](http://repo.springsource.org/milestone/org/springframework/boot/spring-boot-cli/0.5.0.M4/spring-boot-cli-0.5.0.M4-bin.zip) -* [spring-boot-cli-0.5.0.M4-bin.tar.gz](http://repo.springsource.org/milestone/org/springframework/boot/spring-boot-cli/0.5.0.M4/spring-boot-cli-0.5.0.M4-bin.tar.gz) +* [spring-boot-cli-0.5.0.M4-bin.zip](http://repo.spring.io/milestone/org/springframework/boot/spring-boot-cli/0.5.0.M4/spring-boot-cli-0.5.0.M4-bin.zip) +* [spring-boot-cli-0.5.0.M4-bin.tar.gz](http://repo.spring.io/milestone/org/springframework/boot/spring-boot-cli/0.5.0.M4/spring-boot-cli-0.5.0.M4-bin.tar.gz) -Cutting edge [snapshot distributions](http://repo.springsource.org/snapshot/org/springframework/boot/spring-boot-cli/) +Cutting edge [snapshot distributions](http://repo.spring.io/snapshot/org/springframework/boot/spring-boot-cli/) are also available. Once downloaded, follow the @@ -69,7 +69,7 @@ If you are on a Mac and using [homebrew](http://brew.sh/), all you need to do to the Spring Boot CLI is: ``` -$ brew install http://repo.springsource.org/install/spring-boot-cli.rb +$ brew install http://repo.spring.io/install/spring-boot-cli.rb ``` Homebrew will install `spring` to `/usr/local/bin`. Now you can jump right to a @@ -157,23 +157,23 @@ Create a `pom.xml` to import the appropriate Spring Boot starters: spring-snapshots - http://repo.springsource.org/snapshot + http://repo.spring.io/snapshot true spring-milestones - http://repo.springsource.org/milestone + http://repo.spring.io/milestone true spring-snapshots - http://repo.springsource.org/snapshot + http://repo.spring.io/snapshot spring-milestones - http://repo.springsource.org/milestone + http://repo.spring.io/milestone @@ -226,7 +226,7 @@ should see the following output: ## Building Spring Boot from source You don't need to build from source to use Spring Boot (it's in -[repo.springsource.org](http://repo.springsource.org)), but if you want to try out the +[repo.spring.io](http://repo.spring.io)), but if you want to try out the latest and greatest, Spring Boot can be [built with maven](http://maven.apache.org/run-maven/index.html) v3.0.5 or above. diff --git a/spring-boot-autoconfigure/.gitignore b/spring-boot-autoconfigure/.gitignore new file mode 100644 index 00000000000..ea8c4bf7f35 --- /dev/null +++ b/spring-boot-autoconfigure/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java index 11c89cd86c2..7f20562bad2 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java @@ -56,7 +56,7 @@ import org.springframework.boot.cli.Log; * 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 * repo. - * + * * @author Phillip Webb * @author Dave Syer */ @@ -111,9 +111,9 @@ class GrapeEngineCustomizer { // Add support for spring snapshots and milestones if required if (!Boolean.getBoolean("disableSpringSnapshotRepos")) { springBootResolver.addSpringSnapshotResolver(newResolver("spring-snapshot", - "http://repo.springsource.org/snapshot")); + "http://repo.spring.io/snapshot")); springBootResolver.addSpringSnapshotResolver(newResolver("spring-milestone", - "http://repo.springsource.org/milestone")); + "http://repo.spring.io/milestone")); } // Replace the original resolvers diff --git a/spring-boot-full-build/Copy of pom.xml b/spring-boot-full-build/Copy of pom.xml deleted file mode 100644 index 1b12aabe37f..00000000000 --- a/spring-boot-full-build/Copy of pom.xml +++ /dev/null @@ -1,589 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-build - 0.5.0.BUILD-SNAPSHOT - - spring-boot-parent - pom - - 1.6 - UTF-8 - UTF-8 - 3.0.5 - - - - spring - SpringSource - http://www.springsource.org - - - - 3.0.0 - - - http://github.com/SpringSource/spring-boot - scm:git:git://github.com/SpringSource/spring-boot.git - scm:git:ssh://git@github.com/SpringSource/spring-boot.git - - - - - - net.sf.jopt-simple - jopt-simple - 4.5 - - - org.apache.ivy - ivy - 2.3.0 - - - org.apache.maven - maven-archiver - 2.5 - - - org.apache.maven - maven-artifact - ${maven.version} - - - org.apache.maven - maven-core - ${maven.version} - - - org.apache.maven - maven-model - ${maven.version} - - - org.apache.maven - maven-plugin-api - ${maven.version} - - - org.apache.maven - maven-settings - ${maven.version} - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.2 - - - org.codehaus.groovy - groovy - ${groovy.version} - - - org.codehaus.groovy - groovy-all - ${groovy.version} - - - org.codehaus.groovy - groovy-templates - ${groovy.version} - - - org.codehaus.plexus - plexus-archiver - 2.4.1 - - - org.codehaus.plexus - plexus-utils - 3.0.10 - - - org.gradle - gradle-core - ${gradle.version} - - - org.gradle - gradle-base-services - ${gradle.version} - - - org.gradle - gradle-base-services-groovy - ${gradle.version} - - - org.gradle - gradle-plugins - ${gradle.version} - - - org.ow2.asm - asm - 4.1 - - - org.zeroturnaround - zt-zip - 1.6 - - - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.hamcrest - hamcrest-library - test - - - org.springframework - spring-test - test - - - commons-logging - commons-logging - - - - - - - spring-ext - http://repo.springsource.org/ext-release-local/ - - true - - - false - - - - gradle - http://repo.gradle.org/gradle/libs-releases-local - - true - - - false - - - - - - - - maven-invoker-plugin - 1.8 - - - maven-plugin-plugin - 3.2 - - - org.codehaus.mojo - sonar-maven-plugin - 2.0 - - - - - - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - maven-eclipse-plugin - - false - - - .settings/org.eclipse.jdt.ui.prefs - ${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs - - - .settings/org.eclipse.jdt.core.prefs - ${main.basedir}/eclipse/org.eclipse.jdt.core.prefs - - - - - - maven-enforcer-plugin - 1.3.1 - - - maven-jar-plugin - - - - true - true - - - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/Abstract*.java - - - file:/dev/./urandom - - -Xmx1024m -XX:MaxPermSize=256m - - - - maven-war-plugin - - false - - - - - - - - - - prepare - - true - - - ../spring-boot-tools - - - - - maven-antrun-plugin - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - org.apache.ant - ant-nodeps - 1.8.1 - - - org.tigris.antelope - antelopetasks - 3.2.10 - - - - - generate-settings.xml - verify - - run - - false - - - - - - - - - - - - - - - - - - - - - - - - maven-surefire-plugin - - true - - - - - - - - - default - - true - - - ../spring-boot-tools - ../spring-boot - ../spring-boot-autoconfigure - ../spring-boot-actuator - ../spring-boot-starters - ../spring-boot-cli - ../spring-boot-integration-tests - - - - spring-milestones - Spring Milestones - http://maven.springframework.org/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://maven.springframework.org/snapshot - - true - - - - - - spring-milestones - Spring Milestones - http://maven.springframework.org/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://maven.springframework.org/snapshot - - true - - - - - - - - - full - - ../spring-boot-tools - ../spring-boot - ../spring-boot-autoconfigure - ../spring-boot-actuator - ../spring-boot-starters - ../spring-boot-cli - ../spring-boot-samples - ../spring-boot-integration-tests - - - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - - - - snapshot - - - spring-milestones - Spring Milestones - http://maven.springframework.org/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://maven.springframework.org/snapshot - - true - - - - - - spring-milestones - Spring Milestones - http://maven.springframework.org/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://maven.springframework.org/snapshot - - true - - - - - - milestone - - - - - spring-milestones - Spring Milestones - http://maven.springframework.org/milestone - - false - - - - - - spring-milestones - Spring Milestones - http://maven.springframework.org/milestone - - false - - - - - - - maven-enforcer-plugin - - - enforce-milestone-rules - - enforce - - - - - - - true - - - - - - - - - release - - - - - - maven-enforcer-plugin - - - enforce-milestone-rules - - enforce - - - - - - - true - - - - - - - - - - - jdk8 - - 1.8 - - - - - maven-javadoc-plugin - - -Xdoclint:none -quiet - - - - - - - diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index 237f9138e70..b4bf2c8c314 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -16,20 +16,13 @@ UTF-8 3.0.5 - - - spring - SpringSource - http://www.springsource.org - - 3.0.0 - http://github.com/SpringSource/spring-boot - scm:git:git://github.com/SpringSource/spring-boot.git - scm:git:ssh://git@github.com/SpringSource/spring-boot.git + http://github.com/spring-projects/spring-boot + scm:git:git://github.com/spring-projects/spring-boot.git + scm:git:ssh://git@github.com/spring-projects/spring-boot.git @@ -174,7 +167,7 @@ spring-ext - http://repo.springsource.org/ext-release-local/ + http://repo.spring.io/ext-release-local/ true @@ -287,7 +280,7 @@ spring-milestones Spring Milestones - http://maven.springframework.org/milestone + http://repo.spring.io/milestone false @@ -295,7 +288,7 @@ spring-snapshots Spring Snapshots - http://maven.springframework.org/snapshot + http://repo.spring.io/snapshot true @@ -305,7 +298,7 @@ spring-milestones Spring Milestones - http://maven.springframework.org/milestone + http://repo.spring.io/milestone false @@ -313,7 +306,7 @@ spring-snapshots Spring Snapshots - http://maven.springframework.org/snapshot + http://repo.spring.io/snapshot true diff --git a/spring-boot-tools/spring-boot-gradle-plugin/README.md b/spring-boot-tools/spring-boot-gradle-plugin/README.md index 373b9ada6e8..ed4efbef022 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/README.md +++ b/spring-boot-tools/spring-boot-gradle-plugin/README.md @@ -20,8 +20,8 @@ If you are using a milestone or snapshot release you will also need to add appro ```groovy buildscript { repositories { - maven.url "http://repo.springsource.org/snapshot" - maven.url "http://repo.springsource.org/milestone" + maven.url "http://repo.spring.io/snapshot" + maven.url "http://repo.spring.io/milestone" } // ... } diff --git a/spring-boot-tools/spring-boot-maven-plugin/README.md b/spring-boot-tools/spring-boot-maven-plugin/README.md index a382e41d6e7..e4603d088cb 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/README.md +++ b/spring-boot-tools/spring-boot-maven-plugin/README.md @@ -38,11 +38,11 @@ If you are using a milestone or snapshot release you will also need to add appro spring-snapshots - http://repo.springsource.org/snapshot + http://repo.spring.io/snapshot spring-milestones - http://repo.springsource.org/milestone + http://repo.spring.io/milestone ```