diff --git a/.gitignore b/.gitignore index cd592922e9..4e580f3d8b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ _site/ .*.md.html manifest.yml MANIFEST.MF +settings.xml diff --git a/.settings-template.xml b/.settings-template.xml new file mode 100644 index 0000000000..371a423826 --- /dev/null +++ b/.settings-template.xml @@ -0,0 +1,8 @@ + + + @profile@ + + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5478093405..1600ab726d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,8 +34,10 @@ and tools should also work without issue. ### Building from source 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 -can be build using the standard maven command: +[Apache Maven](http://maven.apache.org/run-maven/index.html) v3.0 or above. + +#### Default build +The project can be build from the root directory using the standard maven command: $ mvn clean install @@ -47,6 +49,41 @@ to submit a pull request: $ 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 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 diff --git a/buildhelper/all/pom.xml b/buildhelper/all/pom.xml deleted file mode 100644 index c0a388d330..0000000000 --- a/buildhelper/all/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - org.springframework.boot - spring-boot-build-all - 0.5.0.BUILD-SNAPSHOT - pom - - 3.0.0 - - - ${basedir}/../.. - - - ../.. - ../../spring-boot-samples - - \ No newline at end of file diff --git a/buildhelper/all/setversion.sh b/buildhelper/all/setversion.sh deleted file mode 100755 index 958bd84155..0000000000 --- a/buildhelper/all/setversion.sh +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/pom.xml b/pom.xml index 20b92b57f8..5be17f66d8 100644 --- a/pom.xml +++ b/pom.xml @@ -12,28 +12,164 @@ ${basedir} - - spring-boot-dependencies - spring-boot-parent - spring-boot - spring-boot-autoconfigure - spring-boot-tools - spring-boot-actuator - spring-boot-starters - spring-boot-cli - spring-boot-integration-tests - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.7 - - true - - false - - + + + + maven-antrun-plugin + 1.7 + + + + + + default + + true + + + spring-boot-dependencies + spring-boot-parent + spring-boot-tools + spring-boot + spring-boot-autoconfigure + spring-boot-actuator + spring-boot-starters + spring-boot-cli + spring-boot-integration-tests + + + + 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 + + + + + + + + + + + + + + + + + + + + + + fixup-starter-parent + verify + + run + + false + + + + + + + + + + + + + + + + maven-surefire-plugin + + true + + + + + + + full + + 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 1f3912c23c..11c89cd86c 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 @@ -52,11 +52,11 @@ import org.apache.ivy.util.MessageLogger; 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 * taking a long time, and also fixes a problem where ivy cannot use a local Maven cache * repo. - * + * * @author Phillip Webb * @author Dave Syer */ diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java index 4b72d1274a..8c398c8964 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; /** * Integration tests to exercise the samples. - * + * * @author Dave Syer */ public class SampleIntegrationTests { diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 2d43f71598..5ca43d6dd1 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -43,7 +43,6 @@ 1.1.1 7.0.42 - @@ -435,6 +434,10 @@ + + maven-antrun-plugin + 1.7 + maven-assembly-plugin 2.4 @@ -522,36 +525,4 @@ - - - spring-deploy - - http://www.springsource.com/download/community - - spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version} - - - spring-repo-release - Spring Release Repository - http://repo.springsource.org/libs-release-local - - - spring-repo-snapshot - Spring Snapshot Repository - http://repo.springsource.org/libs-snapshot-local - - - - - milestone - - - spring-repo-milestone - Spring Milestone Repository - http://repo.springsource.org/libs-milestone-local - - - - diff --git a/spring-boot-full-build/Copy of pom.xml b/spring-boot-full-build/Copy of pom.xml new file mode 100644 index 0000000000..1b12aabe37 --- /dev/null +++ b/spring-boot-full-build/Copy of pom.xml @@ -0,0 +1,589 @@ + + + 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-full-build/pom.xml b/spring-boot-full-build/pom.xml new file mode 100644 index 0000000000..8a387494dd --- /dev/null +++ b/spring-boot-full-build/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + org.springframework.boot + spring-boot-full-build + 0.5.0.BUILD-SNAPSHOT + pom + + ../ + ../spring-boot-dependencies + ../spring-boot-parent + ../spring-boot-tools + ../spring-boot + ../spring-boot-autoconfigure + ../spring-boot-actuator + ../spring-boot-starters + ../spring-boot-cli + ../spring-boot-samples + ../spring-boot-integration-tests + + + + full + + + diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml index c0cf70c77c..92f1eb918f 100644 --- a/spring-boot-integration-tests/pom.xml +++ b/spring-boot-integration-tests/pom.xml @@ -13,132 +13,41 @@ ${basedir}/.. - - - - ${project.groupId} - spring-boot - ${project.version} - - - ${project.groupId} - spring-boot-autoconfigure - ${project.version} - - - ${project.groupId} - spring-boot-cli - ${project.version} - - - ${project.groupId} - spring-boot-loader - ${project.version} - - - ${project.groupId} - spring-boot-maven-plugin - ${project.version} - - - ${project.groupId} - spring-boot-actuator - ${project.version} - - - ${project.groupId} - spring-boot-starter - ${project.version} - - - ${project.groupId} - spring-boot-starter-batch - ${project.version} - - - ${project.groupId} - spring-boot-starter-data-jpa - ${project.version} - - - ${project.groupId} - spring-boot-starter-integration - ${project.version} - - - ${project.groupId} - spring-boot-starter-jetty - ${project.version} - - - ${project.groupId} - spring-boot-starter-logging - ${project.version} - - - ${project.groupId} - spring-boot-starter-actuator - ${project.version} - - - ${project.groupId} - spring-boot-starter-parent - ${project.version} - pom - - - ${project.groupId} - spring-boot-starter-security - ${project.version} - - - ${project.groupId} - spring-boot-starter-tomcat - ${project.version} - - - ${project.groupId} - spring-boot-starter-web - ${project.version} - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - maven-invoker-plugin - - src/it/settings.xml - ${main.basedir}/spring-boot-samples/ - - - spring-boot-sample-websocket/pom.xml - - ${project.build.directory}/local-repo - ${skipTests} - true - - - - integration-test - install - - install - run - - - - - - + + + default + + true + + + + + + maven-invoker-plugin + + src/it/settings.xml + ${main.basedir}/spring-boot-samples/ + ${project.build.directory}/local-repo + ${skipTests} + true + + + + integration-test + install + + install + run + + + + + + + + + full + + diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index 5458f5e8a2..cb2d4d5f69 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -15,7 +15,6 @@ UTF-8 UTF-8 3.0.5 - false @@ -201,6 +200,10 @@ maven-invoker-plugin 1.8 + + maven-enforcer-plugin + 1.3.1 + maven-plugin-plugin 3.2 @@ -236,6 +239,10 @@ + + maven-enforcer-plugin + 1.3.1 + maven-jar-plugin @@ -247,28 +254,6 @@ - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - maven-surefire-plugin @@ -294,16 +279,10 @@ - - spring-snapshot-build + default - true - - true - spring-milestones @@ -341,6 +320,148 @@ + + full + + + + 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 diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index b21ebc6c57..40ac1b86af 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.boot - spring-boot-parent + spring-boot-starter-parent 0.5.0.BUILD-SNAPSHOT - ../spring-boot-parent + ../spring-boot-starters/spring-boot-starter-parent spring-boot-samples pom @@ -30,37 +30,55 @@ spring-boot-sample-websocket spring-boot-sample-xml - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - ${project.groupId} - spring-boot-maven-plugin - ${project.version} - true - - - - repackage - - - - - - maven-war-plugin - 2.3 - - false - - - - - + + + + ${project.groupId} + spring-boot + ${project.version} + tests + test + + + org.springframework + spring-test + test + + + + + 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 + + + + spring-milestones + Spring Milestones + http://maven.springframework.org/milestone + + false + + + diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml b/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml index 5f63d7b9d5..b2b730c350 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-actuator-ui jar @@ -40,7 +40,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml index 334fc3487a..a1b35beea0 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-actuator jar @@ -44,7 +44,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-batch/pom.xml b/spring-boot-samples/spring-boot-sample-batch/pom.xml index 5c3530ffb0..c6500f1c96 100644 --- a/spring-boot-samples/spring-boot-sample-batch/pom.xml +++ b/spring-boot-samples/spring-boot-sample-batch/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-batch jar @@ -18,20 +18,11 @@ ${project.groupId} spring-boot-starter-batch - - - ${project.groupId} - spring-boot - ${project.version} - tests - test - - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml index b6ed64e364..8a710058a5 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-data-jpa jar @@ -31,7 +31,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-integration/pom.xml b/spring-boot-samples/spring-boot-sample-integration/pom.xml index 14aed183ef..4fff3da742 100644 --- a/spring-boot-samples/spring-boot-sample-integration/pom.xml +++ b/spring-boot-samples/spring-boot-sample-integration/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-integration jar @@ -22,7 +22,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-jetty/pom.xml index 0032d5228c..56180a544e 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-jetty jar @@ -30,7 +30,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-profile/pom.xml b/spring-boot-samples/spring-boot-sample-profile/pom.xml index b3a1027b11..bb8ad94857 100644 --- a/spring-boot-samples/spring-boot-sample-profile/pom.xml +++ b/spring-boot-samples/spring-boot-sample-profile/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-profile jar @@ -23,20 +23,11 @@ snakeyaml runtime - - - ${project.groupId} - spring-boot - ${project.version} - tests - test - - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-simple/pom.xml b/spring-boot-samples/spring-boot-sample-simple/pom.xml index e9d0cd89f3..e51ecef13d 100644 --- a/spring-boot-samples/spring-boot-sample-simple/pom.xml +++ b/spring-boot-samples/spring-boot-sample-simple/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-simple jar @@ -18,20 +18,11 @@ ${project.groupId} spring-boot-starter - - - ${project.groupId} - spring-boot - ${project.version} - tests - test - - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml index 40fdf131b4..1ec4b345eb 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-tomcat jar @@ -30,7 +30,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-traditional/pom.xml b/spring-boot-samples/spring-boot-sample-traditional/pom.xml index c40e0c6785..c91da4ecca 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/pom.xml +++ b/spring-boot-samples/spring-boot-sample-traditional/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-traditional war @@ -37,7 +37,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml index d53b42d009..6270c866fe 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-web-jsp war @@ -25,6 +25,10 @@ + + org.springframework.boot + spring-boot-maven-plugin + org.apache.maven.plugins maven-surefire-plugin @@ -32,10 +36,6 @@ false - - ${project.groupId} - spring-boot-maven-plugin - diff --git a/spring-boot-samples/spring-boot-sample-web-static/pom.xml b/spring-boot-samples/spring-boot-sample-web-static/pom.xml index 7e8be3e5dd..2d46355ff5 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-static/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-web-static war @@ -32,7 +32,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-web-ui/pom.xml b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml index 31423e5147..664b1c19ad 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-web-ui jar @@ -34,7 +34,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-samples/spring-boot-sample-websocket/pom.xml b/spring-boot-samples/spring-boot-sample-websocket/pom.xml index eac5cc7fe4..1aed3045d7 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/pom.xml +++ b/spring-boot-samples/spring-boot-sample-websocket/pom.xml @@ -1,24 +1,18 @@ - 4.0.0 spring-boot-sample-websocket war - + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent - 1.7 8.0.0-RC1 - org.springframework.boot.samples.websocket.config.SampleWebSocketsApplication - - org.springframework.boot @@ -29,7 +23,6 @@ spring-boot-starter-actuator - @@ -38,5 +31,4 @@ - diff --git a/spring-boot-samples/spring-boot-sample-xml/pom.xml b/spring-boot-samples/spring-boot-sample-xml/pom.xml index 618b3bfacd..2b6c51723f 100644 --- a/spring-boot-samples/spring-boot-sample-xml/pom.xml +++ b/spring-boot-samples/spring-boot-sample-xml/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.springframework.boot - spring-boot-starter-parent + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - ../../spring-boot-starters/spring-boot-starter-parent spring-boot-sample-xml jar @@ -18,20 +18,11 @@ ${project.groupId} spring-boot-starter - - - ${project.groupId} - spring-boot - ${project.version} - tests - test - - ${project.groupId} + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index 4496c87848..ebc83a2c81 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -27,34 +27,4 @@ spring-boot-starter-web spring-boot-starter-websocket - - - - org.apache.maven.plugins - maven-resources-plugin - - - validate - - copy-resources - - false - - false - - @{*} - - - - ${basedir}/spring-boot-starter-parent/src/main/maven - true - - - ${basedir}/spring-boot-starter-parent - - - - - - diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml index 151dbe0bfd..e87800b34e 100644 --- a/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -1,11 +1,4 @@ - - - - - + 4.0.0 org.springframework.boot @@ -16,8 +9,8 @@ spring-boot-starter-parent pom - 0.5.0.BUILD-SNAPSHOT 1.6 + 0.5.0.BUILD-SNAPSHOT @@ -36,62 +29,62 @@ org.springframework.boot spring-boot - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-actuator - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-actuator - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-web - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-tomcat - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-jetty - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-data-jpa - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-batch - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-integration - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-security - ${spring.boot.version} + ${spring-boot.version} org.springframework.boot spring-boot-starter-websocket - ${spring.boot.version} + ${spring-boot.version} @@ -112,17 +105,6 @@ hamcrest-library test - - org.springframework - spring-test - test - - - commons-logging - commons-logging - - - @@ -219,7 +201,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + ${spring-boot.version} @@ -240,7 +222,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + ${spring-boot.version} @@ -265,22 +247,17 @@ - + META-INF/spring.handlers - + META-INF/spring.factories - + META-INF/spring.schemas - - + + ${start-class} @@ -291,48 +268,4 @@ - - - spring-snapshot-build - - true - - - - 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 - - - - - - + \ No newline at end of file diff --git a/spring-boot-starters/spring-boot-starter-parent/src/main/maven/pom.xml b/spring-boot-starters/spring-boot-starter-parent/src/main/maven/pom.xml deleted file mode 100644 index 6aaccd8048..0000000000 --- a/spring-boot-starters/spring-boot-starter-parent/src/main/maven/pom.xml +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - 4.0.0 - - org.springframework.boot - spring-boot-dependencies - @{project.version} - ../../spring-boot-dependencies - - spring-boot-starter-parent - pom - - @{project.version} - 1.6 - - - - - org.springframework - spring-core - ${spring.version} - - - - commons-logging - commons-logging - - - - - org.springframework.boot - spring-boot - ${spring.boot.version} - - - org.springframework.boot - spring-boot-actuator - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-actuator - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-tomcat - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-jetty - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-batch - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-integration - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-security - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-websocket - ${spring.boot.version} - - - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.hamcrest - hamcrest-library - test - - - org.springframework - spring-test - test - - - commons-logging - commons-logging - - - - - - - - - src/main/resources - true - - **/application.yml - **/application.propeties - - - - src/main/resources - - **/application.yml - **/application.propeties - - - - - - - - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - - - - maven-jar-plugin - - - - ${start-class} - - - - - - maven-surefire-plugin - 2.15 - - - **/*Tests.java - **/*Test.java - - - **/Abstract*.java - - - - - maven-war-plugin - - false - - - ${start-class} - - - - - - org.codehaus.mojo - exec-maven-plugin - - - ${start-class} - - - - - pl.project13.maven - git-commit-id-plugin - 1.9 - - - - revision - - - - - true - yyyy-MM-dd'T'HH:mm:ssZ - true - src/main/resources/git.properties - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - ${start-class} - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - true - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - META-INF/spring.handlers - - - META-INF/spring.factories - - - META-INF/spring.schemas - - - - ${start-class} - - - - - - - - - - - - spring-snapshot-build - - @{spring-snapshot-build-profile-active} - - - - 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 - - - - - -