diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c352119..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b415..2a84e188 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/plugins/autodoc/autodoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/tasks/ResolveManifestTask.java b/plugins/autodoc/autodoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/tasks/ResolveManifestTask.java index c2491097..965f9f23 100644 --- a/plugins/autodoc/autodoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/tasks/ResolveManifestTask.java +++ b/plugins/autodoc/autodoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/tasks/ResolveManifestTask.java @@ -16,7 +16,7 @@ import org.gradle.api.artifacts.Dependency; import org.gradle.api.artifacts.ProjectDependency; -import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency; +import org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal; import java.io.File; import java.io.FileInputStream; @@ -52,13 +52,15 @@ protected InputStream resolveManifest(DependencySource autodocManifest) { @Override protected Optional createSource(Dependency dependency) { - if (dependency instanceof DefaultProjectDependency localDependency) { - var manifestFile = localDependency.getDependencyProject().getLayout().getBuildDirectory().file("edc.json"); - if (manifestFile.isPresent()) { - return Optional.of(DependencySourceFactory.createDependencySource(manifestFile.get().getAsFile().toURI(), dependency, MANIFEST_CLASSIFIER, MANIFEST_TYPE)); + if (dependency instanceof ProjectDependencyInternal localDependency) { + var buildPath = localDependency.getTargetProjectIdentity().getBuildPath(); + var manifestFile = new File(buildPath.relativePath("edc.json")); + if (manifestFile.exists()) { + return Optional.of(DependencySourceFactory.createDependencySource(manifestFile.toURI(), dependency, MANIFEST_CLASSIFIER, MANIFEST_TYPE)); } else { getLogger().debug("No manifest file found for dependency {}", dependency); } + return Optional.empty(); } else { getLogger().debug("Dependency {} is not a DefaultProjectDependency", dependency);