Skip to content
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

Bootstrap Maven: replace the met runtime extensions but not their child deps #10014

Merged
merged 1 commit into from
Jun 30, 2020
Merged

Bootstrap Maven: replace the met runtime extensions but not their child deps #10014

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion ...maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ public boolean visitLeave(DependencyNode node) {
}
}

List<AppDependency> fullDeploymentDeps = new ArrayList<>(userDeps);
List<AppDependency> fullDeploymentDeps = new ArrayList<>(userDeps.size() + deploymentDeps.size());
fullDeploymentDeps.addAll(userDeps);
fullDeploymentDeps.addAll(deploymentDeps);
//we need these to have a type of 'jar'
//type is blank when loaded
Expand Down
62 changes: 31 additions & 31 deletions ...c/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ public static Artifact getRuntimeArtifact(DependencyNode dep) {

private final MavenArtifactResolver resolver;
private final List<Dependency> managedDeps;
private final List<Dependency> runtimeExtensionDeps = new ArrayList<>();
private final List<RemoteRepository> mainRepos;

boolean injectedDeps;
private boolean collectExtensions = true;

private List<DependencyNode> runtimeNodes = new ArrayList<>();
private final AppModel.Builder appBuilder;
Expand All @@ -57,7 +56,7 @@ public DeploymentInjectingDependencyVisitor(MavenArtifactResolver resolver, List
}

public boolean isInjectedDeps() {
return injectedDeps;
return !runtimeNodes.isEmpty();
}

public void injectDeploymentDependencies(DependencyNode root) throws BootstrapDependencyProcessingException {
Expand All @@ -68,10 +67,7 @@ public void injectDeploymentDependencies(DependencyNode root) throws BootstrapDe
}
}

public void collectRuntimeExtensions(List<DependencyNode> list) {
if (list.isEmpty()) {
return;
}
private void collectRuntimeExtensions(List<DependencyNode> list) {
int i = 0;
while (i < list.size()) {
collectRuntimeExtensions(list.get(i++));
Expand All @@ -84,54 +80,59 @@ private void collectRuntimeExtensions(DependencyNode node) {
return;
}
final Path path = resolve(artifact);
final boolean parentCollectsExtensions = collectExtensions;
try {
if (Files.isDirectory(path)) {
processMetaInfDir(node, path.resolve(BootstrapConstants.META_INF));
collectExtensions &= !processMetaInfDir(node, path.resolve(BootstrapConstants.META_INF));
} else {
try (FileSystem artifactFs = ZipUtils.newFileSystem(path)) {
processMetaInfDir(node, artifactFs.getPath(BootstrapConstants.META_INF));
collectExtensions &= !processMetaInfDir(node, artifactFs.getPath(BootstrapConstants.META_INF));
}
}
collectRuntimeExtensions(node.getChildren());
} catch (DeploymentInjectionException e) {
throw e;
} catch (Exception t) {
throw new DeploymentInjectionException("Failed to inject extension deplpyment dependencies", t);
} finally {
collectExtensions = parentCollectsExtensions;
}
collectRuntimeExtensions(node.getChildren());
}

private void processMetaInfDir(DependencyNode node, Path metaInfDir) throws BootstrapDependencyProcessingException {
if (!Files.exists(metaInfDir)) {
return;
}
/**
* @return true in case the node is a Quarkus runtime extension artifact, otherwise - false
* @throws BootstrapDependencyProcessingException in case of a failure
*/
private boolean processMetaInfDir(DependencyNode node, Path metaInfDir) throws BootstrapDependencyProcessingException {
final Path p = metaInfDir.resolve(BootstrapConstants.DESCRIPTOR_FILE_NAME);
if (!Files.exists(p)) {
return;
}
processPlatformArtifact(node, p);
return Files.exists(p) ? processPlatformArtifact(node, p) : false;
}

private void processPlatformArtifact(DependencyNode node, Path descriptor) throws BootstrapDependencyProcessingException {
/**
* @return true in case the node is a Quarkus runtime extension artifact, otherwise - false
* @throws BootstrapDependencyProcessingException in case of a failure
*/
private boolean processPlatformArtifact(DependencyNode node, Path descriptor)
throws BootstrapDependencyProcessingException {
final Properties rtProps = resolveDescriptor(descriptor);
if (rtProps == null) {
return;
return false;
}
final String value = rtProps.getProperty(BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT);
appBuilder.handleExtensionProperties(rtProps, node.getArtifact().toString());
final String value = rtProps.getProperty(BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT);
if (value == null) {
return;
return false;
}
Artifact deploymentArtifact = toArtifact(value);
if (deploymentArtifact.getVersion() == null || deploymentArtifact.getVersion().isEmpty()) {
deploymentArtifact = deploymentArtifact.setVersion(node.getArtifact().getVersion());
}
node.setData(QUARKUS_DEPLOYMENT_ARTIFACT, deploymentArtifact);
runtimeNodes.add(node);
Dependency dependency = new Dependency(node.getArtifact(), JavaScopes.COMPILE);
runtimeExtensionDeps.add(dependency);
managedDeps.add(new Dependency(deploymentArtifact, JavaScopes.COMPILE));
}

public List<Dependency> getRuntimeExtensionDeps() {
return runtimeExtensionDeps;
if (collectExtensions) {
node.setData(QUARKUS_DEPLOYMENT_ARTIFACT, deploymentArtifact);
runtimeNodes.add(node);
}
return true;
}

private void replaceWith(DependencyNode originalNode, DependencyNode newNode)
Expand All @@ -149,7 +150,6 @@ private void replaceWith(DependencyNode originalNode, DependencyNode newNode)
originalNode.setArtifact(newNode.getArtifact());
originalNode.getDependency().setArtifact(newNode.getArtifact());
originalNode.setChildren(children);
injectedDeps = true;
}

private DependencyNode collectDependencies(Artifact artifact) throws BootstrapDependencyProcessingException {
Expand Down