diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml index be35031f461..392b03e08a6 100644 --- a/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-autoconfigure/pom.xml @@ -116,11 +116,11 @@ spring-security-acl true - - org.springframework.amqp - spring-rabbit - true - + + org.springframework.amqp + spring-rabbit + true + org.springframework.mobile spring-mobile-device @@ -152,9 +152,9 @@ true - org.apache.geronimo.specs - geronimo-jms_1.1_spec - true + org.apache.geronimo.specs + geronimo-jms_1.1_spec + true org.aspectj diff --git a/spring-boot-cli-grape/pom.xml b/spring-boot-cli-grape/pom.xml index 39724177a01..f251d1553b9 100644 --- a/spring-boot-cli-grape/pom.xml +++ b/spring-boot-cli-grape/pom.xml @@ -71,7 +71,7 @@ org.eclipse.aether aether-util - + junit junit @@ -134,7 +134,8 @@ - + org.eclipse.m2e lifecycle-mapping @@ -152,7 +153,7 @@ - + diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml index d1fe46513d0..152c45aa080 100644 --- a/spring-boot-cli/pom.xml +++ b/spring-boot-cli/pom.xml @@ -51,7 +51,7 @@ groovy-templates true - + ${project.groupId} spring-boot-cli-grape @@ -93,9 +93,9 @@ src/main/resources true - - **/*.vpp - + + **/*.vpp + src/main/groovy @@ -216,7 +216,8 @@ - + org.eclipse.m2e lifecycle-mapping @@ -234,7 +235,7 @@ - + diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 5e3b4e534a5..a55141deda9 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -8,7 +8,6 @@ pom 5.4.0 - 0.9.0.M3 1.7.3 1.4 3.1 @@ -441,11 +440,11 @@ spring-security-acl ${spring-security.version} - - org.springframework.amqp - spring-rabbit - ${spring-rabbit.version} - + + org.springframework.amqp + spring-rabbit + ${spring-rabbit.version} + org.springframework.mobile spring-mobile-device diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index 1a213870cf4..c68d0057f43 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -11,6 +11,7 @@ spring-boot-parent pom + 0.9.0.M3 1.6 UTF-8 UTF-8 @@ -253,6 +254,57 @@ sonar-maven-plugin 2.0 + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-enforcer-plugin + + + [1.3.1,) + + + enforce-once + + + + + + + + + + org.apache.maven.plugins + + + maven-dependency-plugin + + + [2.8,) + + + copy + + + + + + + + + + @@ -281,7 +333,21 @@ maven-enforcer-plugin - 1.3.1 + + + enforce-rules + + enforce-once + + + + + (1.7,1.8) + + + + + maven-jar-plugin @@ -406,7 +472,7 @@ spring-milestones Spring Milestones - http://maven.springframework.org/milestone + http://repo.spring.io/milestone false @@ -414,7 +480,7 @@ spring-snapshots Spring Snapshots - http://maven.springframework.org/snapshot + http://repo.spring.io/snapshot true @@ -424,7 +490,7 @@ spring-milestones Spring Milestones - http://maven.springframework.org/milestone + http://repo.spring.io/milestone false @@ -432,7 +498,7 @@ spring-snapshots Spring Snapshots - http://maven.springframework.org/snapshot + http://repo.spring.io/snapshot true @@ -447,7 +513,7 @@ spring-milestones Spring Milestones - http://maven.springframework.org/milestone + http://repo.spring.io/milestone false @@ -457,7 +523,7 @@ spring-milestones Spring Milestones - http://maven.springframework.org/milestone + http://repo.spring.io/snapshot false @@ -488,8 +554,6 @@ release - - @@ -513,21 +577,5 @@ - - jdk8 - - 1.8 - - - - - maven-javadoc-plugin - - -Xdoclint:none -quiet - - - - - diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml index 4cb6876ae74..457b4d50357 100644 --- a/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.springframework.boot @@ -258,17 +259,22 @@ - + META-INF/spring.handlers - + META-INF/spring.factories - + META-INF/spring.schemas - - + + ${start-class} diff --git a/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/pom.xml index 0124e9b2aef..40b3ab6cb37 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -29,7 +29,7 @@ org.apache.maven - maven-core + maven-core org.apache.maven @@ -65,7 +65,7 @@ org.apache.maven.plugins maven-shade-plugin - true + true