Stricter test, but at the cost of having to run invoker

Author: Dave Syer

launcher/src/main/java/org/springframework/boot/loader/thin/DependencyResolver.java

@@ -331,6 +331,10 @@ private List<ArtifactRepository> mavenRepositories(MavenSettings settings, Repos
 			Properties properties) {
 		List<ArtifactRepository> list = new ArrayList<>();
 		if (session.isOffline()) {
+			if (properties.containsKey(ThinJarLauncher.THIN_ROOT)) {
+				addRepositoryIfMissing(settings, session, list, "local", "file://" + properties.getProperty(THIN_ROOT),
+						true, true);
+			}
 			return list;
 		}
 		if (properties.containsKey(ThinJarLauncher.THIN_ROOT)) {

launcher/src/test/java/org/springframework/boot/loader/thin/ThinJarLauncherTests.java

@@ -25,7 +25,6 @@
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.graph.Dependency;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -127,7 +126,7 @@ public void dryrun() throws Exception {
 	public void classpath() throws Exception {
 		String[] args = new String[] { "--thin.classpath", "--thin.archive=src/test/resources/apps/basic" };
 		ThinJarLauncher.main(args);
-		assertThat(output.toString()).contains("spring-web-4.3.3.RELEASE.jar" + File.pathSeparator);
+		assertThat(output.toString()).contains("spring-web-5.2.7.RELEASE.jar" + File.pathSeparator);
 	}
 
 	@Test
@@ -150,7 +149,7 @@ public void compute() throws Exception {
 		String[] args = new String[] { "--thin.classpath=properties", "--thin.archive=src/test/resources/apps/basic" };
 		ThinJarLauncher.main(args);
 		assertThat(output.toString())
-				.contains("dependencies.spring-web=org.springframework:spring-web:4.3.3.RELEASE\n");
+				.contains("dependencies.spring-web=org.springframework:spring-web:5.2.7.RELEASE\n");
 	}
 
 	@Test
@@ -314,8 +313,24 @@ public void settingsReadFromRootWithThinRoot() throws Exception {
 	}
 
 	@Test
-	@Ignore
 	public void commandLineOffline() throws Exception {
+		// Once online to prime the cache
+		String[] args = new String[] { "--thin.root=target/thin/test", "--thin.dryrun=true",
+				"--thin.archive=src/test/resources/apps/basic", "--debug" };
+		ThinJarLauncher.main(args);
+		DependencyResolver.close();
+		// Then go offline with the same args
+		DependencyResolver.close();
+		args = new String[] { "--thin.root=target/thin/test", "--thin.dryrun=true", "--thin.offline=true",
+				"--thin.archive=src/test/resources/apps/basic", "--debug" };
+		// assertThat(deleteRecursively(new
+		// File("target/thin/test/repository/org/springframework/spring-core"))).isTrue();
+		ThinJarLauncher.main(args);
+		assertThat(new File("target/thin/test/repository/org/springframework/spring-core").exists()).isTrue();
+	}
+
+	@Test
+	public void commandLineOfflineSnapshots() throws Exception {
 		// Once online to prime the cache
 		String[] args = new String[] { "--thin.root=target/thin/test", "--thin.dryrun=true",
 				"--thin.archive=src/test/resources/apps/snapshots-with-repos", "--debug" };
@@ -325,7 +340,8 @@ public void commandLineOffline() throws Exception {
 		DependencyResolver.close();
 		args = new String[] { "--thin.root=target/thin/test", "--thin.dryrun=true", "--thin.offline=true",
 				"--thin.archive=src/test/resources/apps/snapshots-with-repos", "--debug" };
-		assertThat(deleteRecursively(new File("target/thin/test/repository/org/springframework/spring-core"))).isTrue();
+		// assertThat(deleteRecursively(new
+		// File("target/thin/test/repository/org/springframework/spring-core"))).isTrue();
 		ThinJarLauncher.main(args);
 		assertThat(new File("target/thin/test/repository/org/springframework/spring-core").exists()).isTrue();
 	}

launcher/src/test/resources/apps/basic/pom.xml

@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<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.3.RELEASE</spring-boot.version>
+		<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
 		<wrapper.version>1.0.26.BUILD-SNAPSHOT</wrapper.version>
 	</properties>
 

samples/tests/pom.xml

@@ -217,6 +217,20 @@
 							<streamLogs>true</streamLogs>
 						</configuration>
 					</execution>
+					<execution>
+						<id>prepare-samples</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<pom>${basedir}/../app/pom.xml</pom>
+							<cloneProjectsTo>${project.build.directory}/it/app</cloneProjectsTo>
+							<settingsFile>src/it/settings.xml</settingsFile>
+							<addTestClassPath>true</addTestClassPath>
+							<streamLogs>true</streamLogs>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>

samples/tests/src/test/java/com/example/AppMavenIT.java

@@ -57,7 +57,9 @@ public boolean matches(File value) {
 
 	@Test
 	public void launcherDownloaded() {
-		File downloaded = new File("../app/target/thin/root/repository/org/springframework/boot/experimental");
+		// This one fails unless you run the invoke plugin from the command line (per the
+		// pom)
+		File downloaded = new File("target/it/app/target/thin/root/repository/org/springframework/boot/experimental");
 		assertThat(downloaded).exists();
 		downloaded = new File(downloaded,
 				"spring-boot-thin-launcher/1.0.26.BUILD-SNAPSHOT/spring-boot-thin-launcher-1.0.26.BUILD-SNAPSHOT-exec.jar");