From 4361d91a4220606eab2b0f4570f589be9eac62ff Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 22 Aug 2024 11:10:31 +0200 Subject: [PATCH] refactor: remove jacoco convention from build plugin (#259) --- DEPENDENCIES | 7 ---- .../plugins/edcbuild/EdcBuildBasePlugin.java | 2 -- .../edc/plugins/edcbuild/EdcBuildPlugin.java | 2 -- .../edcbuild/conventions/Conventions.java | 4 --- .../conventions/JacocoConvention.java | 33 ------------------- 5 files changed, 48 deletions(-) delete mode 100644 plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/JacocoConvention.java diff --git a/DEPENDENCIES b/DEPENDENCIES index f9c46f27..110002c8 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -120,10 +120,6 @@ maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.8.2-SNAPSHOT, Apache-2.0, maven/mavencentral/org.glassfish.web/javax.el/2.2.6, CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #1654 maven/mavencentral/org.hibernate.validator/hibernate-validator-annotation-processor/6.0.2.Final, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ20221 maven/mavencentral/org.hibernate.validator/hibernate-validator/6.0.2.Final, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ15540 -maven/mavencentral/org.jacoco/org.jacoco.agent/0.8.11, EPL-2.0, approved, CQ23285 -maven/mavencentral/org.jacoco/org.jacoco.ant/0.8.11, EPL-2.0, approved, #1068 -maven/mavencentral/org.jacoco/org.jacoco.core/0.8.11, EPL-2.0, approved, CQ23283 -maven/mavencentral/org.jacoco/org.jacoco.report/0.8.11, EPL-2.0 AND Apache-2.0, approved, CQ23284 maven/mavencentral/org.javassist/javassist/3.28.0-GA, Apache-2.0 OR LGPL-2.1-or-later OR MPL-1.1, approved, #327 maven/mavencentral/org.jboss.logging/jboss-logging/3.3.0.Final, Apache-2.0, approved, CQ13772 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20, Apache-2.0, approved, clearlydefined @@ -141,9 +137,6 @@ maven/mavencentral/org.mockito/mockito-core/5.12.0, MIT AND (Apache-2.0 AND MIT) maven/mavencentral/org.mozilla/rhino/1.7R4, MPL-2.0 AND BSD-3-Clause AND ISC, approved, CQ16320 maven/mavencentral/org.objenesis/objenesis/3.3, Apache-2.0, approved, clearlydefined maven/mavencentral/org.opentest4j/opentest4j/1.3.0, Apache-2.0, approved, #9713 -maven/mavencentral/org.ow2.asm/asm-commons/9.6, BSD-3-Clause, approved, #10775 -maven/mavencentral/org.ow2.asm/asm-tree/9.6, BSD-3-Clause, approved, #10773 -maven/mavencentral/org.ow2.asm/asm/9.6, BSD-3-Clause, approved, #10776 maven/mavencentral/org.reflections/reflections/0.10.2, Apache-2.0 AND WTFPL, approved, clearlydefined maven/mavencentral/org.slf4j/slf4j-api/1.7.22, MIT, approved, CQ11943 maven/mavencentral/org.slf4j/slf4j-api/1.7.25, MIT, approved, CQ13368 diff --git a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildBasePlugin.java b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildBasePlugin.java index 34598e37..c02e1788 100644 --- a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildBasePlugin.java +++ b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildBasePlugin.java @@ -26,7 +26,6 @@ import org.gradle.api.plugins.quality.CheckstylePlugin; import org.gradle.api.publish.maven.plugins.MavenPublishPlugin; import org.gradle.crypto.checksum.ChecksumPlugin; -import org.gradle.testing.jacoco.plugins.JacocoPlugin; /** * Defines the capabilities of the EDC build as specified in the Gradle Documentation @@ -37,7 +36,6 @@ public class EdcBuildBasePlugin implements Plugin { private static void defineCapabilities(Project target) { target.getPlugins().apply(JavaLibraryPlugin.class); - target.getPlugins().apply(JacocoPlugin.class); target.getPlugins().apply(AutodocPlugin.class); target.getPlugins().apply(CheckstylePlugin.class); target.getPlugins().apply(MavenPublishPlugin.class); diff --git a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildPlugin.java b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildPlugin.java index a2c7acc9..5bb88407 100644 --- a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildPlugin.java +++ b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildPlugin.java @@ -23,7 +23,6 @@ import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.allDependencies; import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.checkstyle; import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.defaultDependencies; -import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.jacoco; import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.jar; import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.java; import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.mavenPom; @@ -71,7 +70,6 @@ public void apply(Project target) { mavenPublication(), signing(), mavenPom(), - jacoco(), allDependencies(), tests(), jar(), diff --git a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/Conventions.java b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/Conventions.java index 89cb3d6a..b23c913c 100644 --- a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/Conventions.java +++ b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/Conventions.java @@ -43,10 +43,6 @@ public static EdcConvention mavenPom() { return new MavenArtifactConvention(); } - public static EdcConvention jacoco() { - return new JacocoConvention(); - } - public static EdcConvention java() { return new JavaConvention(); } diff --git a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/JacocoConvention.java b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/JacocoConvention.java deleted file mode 100644 index 81b1ea05..00000000 --- a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/JacocoConvention.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2022 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.edc.plugins.edcbuild.conventions; - -import org.gradle.api.Project; -import org.gradle.testing.jacoco.plugins.JacocoPlugin; -import org.gradle.testing.jacoco.tasks.JacocoReport; - -class JacocoConvention implements EdcConvention { - @Override - public void apply(Project target) { - if ("true".equals(System.getenv("JACOCO"))) { - target.getPluginManager().apply(JacocoPlugin.class); - } - - var jacocoReport = target.getTasks().findByName("jacocoTestReport"); - if (jacocoReport instanceof JacocoReport) { - ((JacocoReport) jacocoReport).getReports().getXml().getRequired().set(true); - } - } -}