Merge branch '2.3.x'

Closes gh-24112
spring-projects · Nov 10, 2020 · 21d9752 · 21d9752
2 parents 82652c7 + e6ab20b
commit 21d9752
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 0 deletions.
diff --git a/...oot-maven-plugin/src/intTest/java/org/springframework/boot/maven/WarIntegrationTests.java b/...oot-maven-plugin/src/intTest/java/org/springframework/boot/maven/WarIntegrationTests.java
@@ -80,4 +80,13 @@ void whenWarIsRepackagedWithOutputTimestampTheBuildFailsAsItIsNotSupported(Maven
 		});
 	}
 
+	@TestTemplate
+	void whenADependencyHasSystemScopeAndInclusionOfSystemScopeDependenciesIsEnabledItIsIncludedInTheRepackagedJar(
+			MavenBuild mavenBuild) {
+		mavenBuild.project("war-system-scope").execute((project) -> {
+			File main = new File(project, "target/war-system-scope-0.0.1.BUILD-SNAPSHOT.war");
+			assertThat(jar(main)).hasEntryWithName("WEB-INF/lib-provided/sample-1.0.0.jar");
+		});
+	}
+
 }
diff --git a/.../spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-system-scope/pom.xml b/.../spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-system-scope/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.boot.maven.it</groupId>
+	<artifactId>war-system-scope</artifactId>
+	<version>0.0.1.BUILD-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>@java.version@</maven.compiler.source>
+		<maven.compiler.target>@java.version@</maven.compiler.target>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>@project.groupId@</groupId>
+				<artifactId>@project.artifactId@</artifactId>
+				<version>@project.version@</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+						<configuration>
+							<includeSystemScope>true</includeSystemScope>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>@maven-war-plugin.version@</version>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Not-Used>Foo</Not-Used>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>@spring-framework.version@</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>@jakarta-servlet.version@</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.example</groupId>
+			<artifactId>sample</artifactId>
+			<version>1.0.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/sample-1.0.0.jar</systemPath>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/war-system-scope/sample-1.0.0.jar b/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/war-system-scope/sample-1.0.0.jar
diff --git a/...lugin/src/intTest/projects/war-system-scope/src/main/java/org/test/SampleApplication.java b/...lugin/src/intTest/projects/war-system-scope/src/main/java/org/test/SampleApplication.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.test;
+
+public class SampleApplication {
+
+	public static void main(String[] args) {
+	}
+
+}
diff --git a/...spring-boot-maven-plugin/src/intTest/projects/war-system-scope/src/main/webapp/index.html b/...spring-boot-maven-plugin/src/intTest/projects/war-system-scope/src/main/webapp/index.html
@@ -0,0 +1 @@
+<html></html>