Leave out provided dependencies from layout jar

spring-projects-experimental · Apr 16, 2018 · df0f695 · df0f695
1 parent bf68d18
commit df0f695
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/layout/pom.xml b/layout/pom.xml
@@ -19,13 +19,13 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-loader-tools</artifactId>
-			<optional>true</optional>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 			<version>1.2</version>
-			<optional>true</optional>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -107,20 +107,6 @@
 							<mainClass>org.springframework.boot.loader.thin.ThinJarLauncher</mainClass>
 						</transformer>
 					</transformers>
-					<filters>
-						<filter>
-							<artifact>org.springframework.boot:*:*</artifact>
-							<includes>
-								<include>org/springframework/boot/**</include>
-							</includes>
-						</filter>
-						<filter>
-							<artifact>commons-logging:commons-logging:*</artifact>
-							<includes>
-								<include>org/apache/**</include>
-							</includes>
-						</filter>
-					</filters>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/samples/app/pom.xml b/samples/app/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-boot.version>1.5.2.RELEASE</spring-boot.version>
+		<spring-boot-plugin.version>1.5.10.RELEASE</spring-boot-plugin.version>
 		<wrapper.version>1.0.10.BUILD-SNAPSHOT</wrapper.version>
 	</properties>
 
@@ -66,7 +66,25 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>${spring-boot.version}</version>
+				<!-- https://github.com/dsyer/spring-boot-thin-launcher/issues/46 -->
+				<version>${spring-boot-plugin.version}</version>
+				<executions>
+					<execution>
+						<!-- Spring Boot Actuator displays build-related information if a 
+							 META-INF/build-info.properties file is present -->
+						<goals>
+							<goal>build-info</goal>
+						</goals>
+						<configuration>
+							<additionalProperties>
+								<encoding.source>${project.build.sourceEncoding}</encoding.source>
+								<encoding.reporting>${project.reporting.outputEncoding}</encoding.reporting>
+								<java.source>${maven.compiler.source}</java.source>
+								<java.target>${maven.compiler.target}</java.target>
+							</additionalProperties>
+						</configuration>
+					</execution>
+				</executions>
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>