Skip to content

Fix "Class-Path" parsing issues in -dev.jar generated by Gradle #5988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2019
Merged

Fix "Class-Path" parsing issues in -dev.jar generated by Gradle #5988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import io.quarkus.bootstrap.model.AppModel;
import io.quarkus.bootstrap.resolver.AppModelResolver;
import io.quarkus.bootstrap.resolver.AppModelResolverException;
import io.quarkus.bootstrap.util.PropertyUtils;
import io.quarkus.dev.DevModeContext;
import io.quarkus.dev.DevModeMain;
import io.quarkus.gradle.QuarkusPluginExtension;
Expand Down Expand Up @@ -319,6 +318,8 @@ public void startDev() {
context.setFrameworkClassesDir(wiringClassesDirectory.getAbsoluteFile());
context.setCacheDir(new File(getBuildDir(), "transformer-cache").getAbsoluteFile());

// this is the jar file we will use to launch the dev mode main class
context.setDevModeRunnerJarFile(tempFile);
try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(tempFile))) {
out.putNextEntry(new ZipEntry("META-INF/"));
Manifest manifest = new Manifest();
Expand Down Expand Up @@ -407,19 +408,9 @@ private void addToClassPaths(StringBuilder classPathManifest, DevModeContext con
if (filesIncludedInClasspath.add(file)) {
getProject().getLogger().info("Adding dependency {}", file);

URI uri = file.toPath().toAbsolutePath().toUri();
String path = uri.getRawPath();
if (PropertyUtils.isWindows()) {
if (path.length() > 2 && Character.isLetter(path.charAt(0)) && path.charAt(1) == ':') {
path = "/" + path;
}
}
classPathManifest.append(path);
final URI uri = file.toPath().toAbsolutePath().toUri();
context.getClassPath().add(toUrl(uri));
if (file.isDirectory()) {
classPathManifest.append("/");
}
classPathManifest.append(" ");
classPathManifest.append(uri).append(" ");
}
}

Expand Down