Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.eclipse.edc.plugins.autodoc.AutodocExtension;
import org.gradle.api.DefaultTask;
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.tasks.CacheableTask;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.OutputDirectory;
import org.gradle.api.tasks.TaskAction;
Expand All @@ -39,6 +40,7 @@
* <p>
* Implementations must provide a reference to that autodoc manifest file in the form of a {@link DependencySource}.
*/
@CacheableTask
public abstract class AbstractManifestResolveTask extends DefaultTask {
public static final String MANIFEST_CLASSIFIER = "manifest";
public static final String MANIFEST_TYPE = "json";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
package org.eclipse.edc.plugins.autodoc.tasks;

import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.CacheableTask;
import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.TaskAction;
import org.gradle.util.internal.GFileUtils;

import java.io.File;

@CacheableTask
public class AutodocBomTask extends DefaultTask {

public static final String NAME = "autodocBom";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.artifacts.ProjectDependency;
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
import org.gradle.api.tasks.CacheableTask;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -29,6 +30,7 @@

import static java.lang.String.format;

@CacheableTask
public class DownloadManifestTask extends AbstractManifestResolveTask {

public static final String NAME = "downloadManifests";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.eclipse.edc.plugins.autodoc.spi.ManifestWriter;
import org.gradle.api.DefaultTask;
import org.gradle.api.GradleException;
import org.gradle.api.tasks.CacheableTask;
import org.gradle.api.tasks.TaskAction;

import java.io.File;
Expand All @@ -34,6 +35,7 @@

import static java.lang.String.format;

@CacheableTask
public class MarkdownRendererTask extends DefaultTask {

private final JsonManifestReader reader = new JsonManifestReader(new ObjectMapper());
Expand Down Expand Up @@ -73,6 +75,7 @@ public void renderMarkdown() {
}
}

@CacheableTask
public static class ToHtml extends MarkdownRendererTask {
public static final String NAME = "doc2html";

Expand All @@ -81,6 +84,7 @@ public ToHtml() {
}
}

@CacheableTask
public static class ToMarkdown extends MarkdownRendererTask {
public static final String NAME = "doc2md";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.eclipse.edc.plugins.autodoc.AutodocExtension;
import org.gradle.api.DefaultTask;
import org.gradle.api.GradleException;
import org.gradle.api.tasks.CacheableTask;
import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.TaskAction;
import org.gradle.api.tasks.options.Option;
Expand All @@ -31,6 +32,7 @@
/**
* Task that takes an input file (JSON) and appends its contents to a destination file. This task is intended to be called per-project.
*/
@CacheableTask
public abstract class MergeManifestsTask extends DefaultTask {

public static final String NAME = "mergeManifests";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.artifacts.ProjectDependency;
import org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal;
import org.gradle.api.tasks.CacheableTask;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.Optional;

@CacheableTask
public class ResolveManifestTask extends AbstractManifestResolveTask {

public static final String NAME = "resolveManifests";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import io.swagger.v3.plugins.gradle.tasks.ResolveTask;
import org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension;
import org.eclipse.edc.plugins.edcbuild.tasks.PrintApiGroupTask;
import org.gradle.api.Project;
import org.gradle.api.file.FileCollection;
import org.gradle.api.plugins.JavaPluginExtension;
Expand Down Expand Up @@ -46,8 +45,6 @@ public static Path defaultOutputDirectory(Project project) {
public void apply(Project target) {
target.getPluginManager().withPlugin(SWAGGER_GRADLE_PLUGIN, appliedPlugin -> {

target.getTasks().register("apiGroups", PrintApiGroupTask.class);

Stream.of(
"io.swagger.core.v3:swagger-jaxrs2-jakarta:%s".formatted(SWAGGER),
"jakarta.ws.rs:jakarta.ws.rs-api:%s".formatted(JAKARTA_WS_RS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension;
import org.gradle.api.file.Directory;
import org.gradle.api.model.ObjectFactory;
import org.gradle.api.tasks.CacheableTask;
import org.gradle.api.tasks.TaskAction;
import org.gradle.api.tasks.options.Option;
import org.jetbrains.annotations.NotNull;
Expand All @@ -38,6 +39,7 @@
/**
* Customization of the {@link GenerateTask}, which allows to pass in the input and output directories via command line.
*/
@CacheableTask
public class MergeOpenApiSpecTask extends GenerateTask {

public static final String NAME = "mergeOpenApiSpec";
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
import org.gradle.api.DefaultTask;
import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.TaskAction;
import org.gradle.work.DisableCachingByDefault;

import static org.eclipse.edc.plugins.edcbuild.conventions.ConventionFunctions.requireExtension;


@DisableCachingByDefault
public class PrintClasspathTask extends DefaultTask {

@TaskAction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.gradle.api.publish.PublishingExtension;
import org.gradle.api.publish.maven.MavenPublication;
import org.gradle.api.tasks.TaskAction;
import org.gradle.work.DisableCachingByDefault;

import java.net.URL;
import java.time.LocalDateTime;
Expand All @@ -31,6 +32,7 @@
* Task for root project that looks up for published artifacts, waiting if they are not available.
* After a certain timeout the task fails
*/
@DisableCachingByDefault
public class WaitForPublishedArtifacts extends DefaultTask {

private static final int TASK_TIMEOUT_MINUTES = 60;
Expand Down
Loading