Merge branch '1.4.x' into 1.5.x

d1a8d136 · Phillip Webb · 158ce3c3 · b28d537c · d1a8d136
Commit d1a8d136 authored Jan 18, 2017 by Phillip Webb
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

pom.xml spring-boot-parent/pom.xml +6 -0

No files found.
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -766,6 +766,12 @@
 					<name>m2e.version</name>
 				</property>
 			</activation>
+			<properties>
+				<m2e.jaxrs.activation>false</m2e.jaxrs.activation>
+				<m2e.jpa.activation>false</m2e.jpa.activation>
+				<m2e.jsf.activation>false</m2e.jsf.activation>
+				<m2e.cdi.activation>false</m2e.cdi.activation>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>