refactor: remove deprecated MergeApiSpecByPathTask and snapshot repository (#432)

Author: ndr-brt

buildSrc/build.gradle.kts

@@ -26,14 +26,6 @@ dependencies {
     implementation(libs.plugin.swagger)
     implementation(libs.plugin.openapi.generator)
     implementation(libs.swagger.parser)
-    implementation(libs.plugin.openapi.merger) { // DEPRECATED
-        constraints {
-            implementation(libs.swagger.parser) {
-                because("OpenAPI merger plugin uses an old version that caused this issue: https://github.com/eclipse-edc/GradlePlugins/issues/183")
-            }
-        }
-    }
-
     implementation(libs.jetbrains.annotations)
     implementation(libs.jackson.core)
     implementation(libs.jackson.databind)

gradle/libs.versions.toml

@@ -33,8 +33,6 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 openapi-generator = { module = "org.openapitools:openapi-generator", version.ref = "openapi-generator" }
 plugin-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.36.0" }
 plugin-checksum = { module = "gradle.plugin.org.gradle.crypto:checksum", version = "1.4.0" }
-plugin-openapi-merger = { module = "com.rameshkp:openapi-merger-gradle-plugin", version.ref = "openapi-merger" }
-plugin-openapi-merger-app = { module = "com.rameshkp:openapi-merger-app", version.ref = "openapi-merger" }
 plugin-openapi-generator = { module = "org.openapitools:openapi-generator-gradle-plugin", version.ref = "openapi-generator" }
 plugin-swagger = { module = "io.swagger.core.v3:swagger-gradle-plugin", version.ref = "swagger" }
 swagger-parser = { module = "io.swagger.parser.v3:swagger-parser", version.ref = "swagger-parser" }

plugins/edc-build/build.gradle.kts

@@ -16,15 +16,6 @@ dependencies {
     implementation(libs.openapi.generator)
     implementation(libs.plugin.openapi.generator)
     implementation(libs.swagger.parser)
-    // openapi-merger deprecated, will be removed
-    implementation(libs.plugin.openapi.merger.app)
-    implementation(libs.plugin.openapi.merger) {
-        constraints {
-            implementation(libs.swagger.parser) {
-                because("OpenAPI merger plugin uses an old version that caused this issue: https://github.com/eclipse-edc/GradlePlugins/issues/183")
-            }
-        }
-    }
 }
 
 gradlePlugin {

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildPlugin.java

@@ -37,7 +37,6 @@
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.mavenPom;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.mavenPublication;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.mavenPublishing;
-import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.openApiMerger;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.printClasspath;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.repositories;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.rootBuildScript;
@@ -52,8 +51,6 @@
 public class EdcBuildPlugin implements Plugin<Project> {
     @Override
     public void apply(Project target) {
-
-        // register the extension(s)
         target.getExtensions().create("edcBuild", BuildExtension.class, target.getObjects());
 
         applyPlugins(target);
@@ -66,8 +63,7 @@ public void apply(Project target) {
         of(
                 rootBuildScript(),
                 repositories(),
-                swaggerGenerator(),
-                openApiMerger()
+                swaggerGenerator()
         ).forEach(c -> c.apply(target));
 
         // configuration values are only guaranteed to be set after the project has been evaluated

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/Conventions.java

@@ -63,10 +63,6 @@ public static EdcConvention swaggerGenerator() {
         return new SwaggerResolveConvention();
     }
 
-    public static EdcConvention openApiMerger() {
-        return new OpenApiMergerConvention();
-    }
-    
     public static EdcConvention mavenPublication() {
         return new MavenPublicationConvention();
     }

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/OpenApiMergerConvention.java

@@ -19,7 +19,4 @@ public class Repositories {
     public static final String NEXUS_REPO_URL = "https://ossrh-staging-api.central.sonatype.com/service/local/";
     public static final String SNAPSHOT_REPO_URL = "https://central.sonatype.com/repository/maven-snapshots/";
 
-    @Deprecated(since = "0.14.0")
-    public static final String DEPRECATED_SNAPSHOT_REPO_URL = "https://oss.sonatype.org/content/repositories/snapshots/";
-
 }

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/Repositories.java

@@ -29,6 +29,5 @@ public void apply(Project target) {
         handler.mavenLocal();
         handler.maven(r -> r.setUrl(URI.create(Repositories.SNAPSHOT_REPO_URL)));
         handler.mavenCentral();
-        handler.maven(r -> r.setUrl(URI.create(Repositories.DEPRECATED_SNAPSHOT_REPO_URL)));
     }
 }

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/RepositoriesConvention.java

@@ -16,8 +16,6 @@
 
 import org.gradle.api.Project;
 
-import static org.eclipse.edc.plugins.edcbuild.conventions.Repositories.DEPRECATED_SNAPSHOT_REPO_URL;
-
 /**
  * Configures the root buildscript, i.e. adds repos
  */
@@ -28,7 +26,6 @@ public void apply(Project target) {
             target.getBuildscript().getRepositories().mavenLocal();
             target.getBuildscript().getRepositories().mavenCentral();
             target.getBuildscript().getRepositories().gradlePluginPortal();
-            target.getBuildscript().getRepositories().maven(repo -> repo.setUrl(DEPRECATED_SNAPSHOT_REPO_URL));
         }
     }
 }

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/RootBuildScriptConvention.java

@@ -55,14 +55,4 @@ public MavenPomExtension(Project project) {
     public abstract Property<String> getScmConnection();
 
     public abstract Property<String> getScmUrl();
-
-    @Deprecated(since = "edc-build-0.1.0")
-    public String getGroupId() {
-        return groupId;
-    }
-
-    @Deprecated(since = "edc-build-0.1.0")
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
 }