Skip to content

Commit 1e6bce6

Browse files
authored
refactor: remove dependency analysis plugin (#171)
* refactor: remove dependency analysis plugin * Trigger build
1 parent 0ee6deb commit 1e6bce6

File tree

9 files changed

+35
-124
lines changed

9 files changed

+35
-124
lines changed

DEPENDENCIES

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
maven/mavencentral/com.autonomousapps/antlr/4.10.1.3, , restricted, clearlydefined
2-
maven/mavencentral/com.autonomousapps/asm-relocated/9.4.0.1, , restricted, clearlydefined
3-
maven/mavencentral/com.autonomousapps/dependency-analysis-gradle-plugin/1.20.0, , restricted, clearlydefined
4-
maven/mavencentral/com.autonomousapps/graph-support/0.1, Apache-2.0, approved, #9666
51
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.11.1, Apache-2.0, approved, CQ23491
62
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.2, Apache-2.0, approved, #7947
73
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.2, MIT AND Apache-2.0, approved, #7932
@@ -17,7 +13,6 @@ maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.11.1
1713
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.2, Apache-2.0, approved, #7930
1814
maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.2, Apache-2.0, approved, #7929
1915
maven/mavencentral/com.fasterxml/classmate/1.3.1, Apache-2.0, approved, CQ10239
20-
maven/mavencentral/com.github.ben-manes.caffeine/caffeine/3.1.0, Apache-2.0, approved, clearlydefined
2116
maven/mavencentral/com.github.fge/btf/1.2, Apache-2.0 OR LGPL-2.0-or-later, approved, CQ14455
2217
maven/mavencentral/com.github.fge/jackson-coreutils/1.6, Apache-2.0 or LGPL-3.0-only, approved, #2572
2318
maven/mavencentral/com.github.fge/jackson-coreutils/1.8, LGPL-3.0 OR Apache-2.0, approved, clearlydefined
@@ -36,8 +31,6 @@ maven/mavencentral/com.github.java-json-tools/uri-template/0.10, Apache-2.0 OR L
3631
maven/mavencentral/com.google.code.findbugs/jsr305/2.0.1, BSD-3-Clause AND CC-BY-2.5 AND LGPL-2.1+, approved, CQ13390
3732
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.1, Apache-2.0, approved, #20
3833
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
39-
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.11.0, Apache-2.0, approved, clearlydefined
40-
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.13.1, Apache-2.0, approved, clearlydefined
4134
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.2.0, Apache-2.0, approved, clearlydefined
4235
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.7.1, Apache-2.0, approved, clearlydefined
4336
maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654
@@ -46,29 +39,21 @@ maven/mavencentral/com.google.guava/guava/27.0.1-android, Apache-2.0, approved,
4639
maven/mavencentral/com.google.guava/guava/28.1-android, Apache-2.0, approved, clearlydefined
4740
maven/mavencentral/com.google.guava/guava/28.2-android, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ22437
4841
maven/mavencentral/com.google.guava/guava/31.0.1-jre, Apache-2.0, approved, clearlydefined
49-
maven/mavencentral/com.google.guava/guava/31.1-jre, Apache-2.0, approved, clearlydefined
5042
maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
5143
maven/mavencentral/com.google.j2objc/j2objc-annotations/1.1, Apache-2.0, approved, CQ18765
5244
maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195
5345
maven/mavencentral/com.googlecode.libphonenumber/libphonenumber/8.0.0, Apache-2.0, approved, clearlydefined
5446
maven/mavencentral/com.googlecode.libphonenumber/libphonenumber/8.11.1, Apache-2.0, approved, clearlydefined
5547
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.0, LGPL-2.1-or-later, approved, #7936
56-
maven/mavencentral/com.rameshkp/openapi-merger-app/1.0.5, , restricted, clearlydefined
48+
maven/mavencentral/com.rameshkp/openapi-merger-app/1.0.5, Apache-2.0, approved, clearlydefined
5749
maven/mavencentral/com.rameshkp/openapi-merger-gradle-plugin/1.0.5, Apache-2.0, approved, #9669
58-
maven/mavencentral/com.squareup.moshi/moshi-adapters/1.14.0, Apache-2.0, approved, clearlydefined
59-
maven/mavencentral/com.squareup.moshi/moshi-kotlin/1.14.0, Apache-2.0, approved, clearlydefined
60-
maven/mavencentral/com.squareup.moshi/moshi/1.14.0, Apache-2.0, approved, clearlydefined
61-
maven/mavencentral/com.squareup.okio/okio/2.10.0, Apache-2.0, approved, clearlydefined
62-
maven/mavencentral/com.squareup/kotlinpoet/1.12.0, Apache-2.0, approved, clearlydefined
6350
maven/mavencentral/com.sun.mail/mailapi/1.6.2, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, clearlydefined
6451
maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654
6552
maven/mavencentral/commons-codec/commons-codec/1.9, Apache-2.0, approved, CQ10595
6653
maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385
6754
maven/mavencentral/commons-io/commons-io/2.4, Apache-1.1, approved, CQ9218
6855
maven/mavencentral/commons-io/commons-io/2.6, Apache-2.0, approved, CQ19090
6956
maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
70-
maven/mavencentral/dev.zacsweers.moshix/moshi-sealed-reflect/0.19.0, , restricted, clearlydefined
71-
maven/mavencentral/dev.zacsweers.moshix/moshi-sealed-runtime/0.19.0, , restricted, clearlydefined
7257
maven/mavencentral/gradle.plugin.org.gradle.crypto/checksum/1.4.0, Apache-2.0, approved, #9667
7358
maven/mavencentral/gradle.plugin.org.hidetake/gradle-swagger-generator-plugin/2.19.2, , restricted, clearlydefined
7459
maven/mavencentral/info.picocli/picocli/4.6.3, Apache-2.0, approved, clearlydefined
@@ -93,7 +78,6 @@ maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.2, BSD-3-Clause, ap
9378
maven/mavencentral/javax.activation/activation/1.1, CDDL-1.0, approved, CQ134
9479
maven/mavencentral/javax.el/javax.el-api/2.2.5, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #2770
9580
maven/mavencentral/javax.el/javax.el-api/3.0.0, CDDL-1.0 or Apache-2.0, approved, CQ7249
96-
maven/mavencentral/javax.inject/javax.inject/1, Apache-2.0, approved, CQ3555
9781
maven/mavencentral/javax.mail/mailapi/1.4.3, CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, clearlydefined
9882
maven/mavencentral/javax.validation/validation-api/1.1.0.Final, Apache-2.0, approved, CQ15114
9983
maven/mavencentral/javax.validation/validation-api/2.0.0.Final, Apache-2.0, approved, CQ15302
@@ -116,7 +100,6 @@ maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved,
116100
maven/mavencentral/org.assertj/assertj-core/3.23.1, Apache-2.0, approved, clearlydefined
117101
maven/mavencentral/org.checkerframework/checker-compat-qual/2.5.2, MIT, approved, clearlydefined
118102
maven/mavencentral/org.checkerframework/checker-qual/3.12.0, MIT, approved, clearlydefined
119-
maven/mavencentral/org.checkerframework/checker-qual/3.21.4, MIT, approved, clearlydefined
120103
maven/mavencentral/org.codehaus.mojo/animal-sniffer-annotations/1.17, MIT, approved, clearlydefined
121104
maven/mavencentral/org.eclipse.edc/autodoc-processor/0.2.1-SNAPSHOT, Apache-2.0, approved, technology.edc
122105
maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.2.1-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -129,23 +112,8 @@ maven/mavencentral/org.jacoco/org.jacoco.core/0.8.8, EPL-2.0, approved, CQ23283
129112
maven/mavencentral/org.jacoco/org.jacoco.report/0.8.8, EPL-2.0 AND Apache-2.0, approved, CQ23284
130113
maven/mavencentral/org.javassist/javassist/3.28.0-GA, Apache-2.0 OR LGPL-2.1-or-later OR MPL-1.1, approved, #327
131114
maven/mavencentral/org.jboss.logging/jboss-logging/3.3.0.Final, Apache-2.0, approved, CQ13772
132-
maven/mavencentral/org.jetbrains.kotlin/kotlin-bom/1.7.22, Apache-2.0, approved, #9665
133-
maven/mavencentral/org.jetbrains.kotlin/kotlin-reflect/1.7.0, Apache-2.0, approved, clearlydefined
134-
maven/mavencentral/org.jetbrains.kotlin/kotlin-reflect/1.7.20, Apache-2.0, approved, clearlydefined
135-
maven/mavencentral/org.jetbrains.kotlin/kotlin-reflect/1.7.22, Apache-2.0, approved, clearlydefined
136115
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20, Apache-2.0, approved, clearlydefined
137-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.7.20, Apache-2.0, approved, clearlydefined
138-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.7.22, Apache-2.0, approved, clearlydefined
139-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.7.20, Apache-2.0, approved, clearlydefined
140-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.7.22, Apache-2.0, approved, clearlydefined
141-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.21, Apache-2.0, approved, clearlydefined
142-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.7.0, Apache-2.0, approved, clearlydefined
143-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.7.20, Apache-2.0, approved, clearlydefined
144-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.7.22, Apache-2.0, approved, clearlydefined
145116
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.4.20, Apache-2.0, approved, clearlydefined
146-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.7.20, Apache-2.0, approved, clearlydefined
147-
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.7.22, Apache-2.0, approved, clearlydefined
148-
maven/mavencentral/org.jetbrains.kotlinx/kotlinx-metadata-jvm/0.6.0, Apache-2.0, approved, clearlydefined
149117
maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined
150118
maven/mavencentral/org.jetbrains/annotations/24.0.1, Apache-2.0, approved, #7417
151119
maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.2, EPL-2.0, approved, #3133

buildSrc/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ repositories {
1414
}
1515

1616
dependencies {
17-
implementation(libs.plugin.dependency.analysis)
1817
implementation(libs.plugin.nexus.publish)
1918
implementation(libs.plugin.checksum)
2019
implementation(libs.plugin.swagger.generator)

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jackson-dataformat-xml = { module = "com.fasterxml.jackson.dataformat:jackson-da
1515
jackson-datatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
1616
jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotation" }
1717
plugin-checksum = { module = "gradle.plugin.org.gradle.crypto:checksum", version = "1.4.0" }
18-
plugin-dependency-analysis = { module = "com.autonomousapps:dependency-analysis-gradle-plugin", version = "1.20.0" }
1918
plugin-nexus-publish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" }
2019
plugin-openapi-merger = { module = "com.rameshkp:openapi-merger-gradle-plugin", version = "1.0.5" }
2120
plugin-openapi-merger-app = { module = "com.rameshkp:openapi-merger-app", version = "1.0.5" }

plugins/edc-build/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ dependencies {
1616
implementation(project(":plugins:openapi-merger"))
1717

1818
implementation(libs.edc.runtime.metamodel)
19-
implementation(libs.plugin.dependency.analysis)
2019
implementation(libs.plugin.nexus.publish)
2120
implementation(libs.plugin.checksum)
2221
implementation(libs.plugin.swagger.generator)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package org.eclipse.edc.plugins.edcbuild;
1616

17-
import com.autonomousapps.DependencyAnalysisPlugin;
1817
import io.github.gradlenexus.publishplugin.NexusPublishPlugin;
1918
import org.eclipse.edc.plugins.autodoc.AutodocPlugin;
2019
import org.eclipse.edc.plugins.modulenames.ModuleNamesPlugin;
@@ -51,7 +50,6 @@ private static void defineCapabilities(Project target) {
5150
target.getPlugins().apply(NexusPublishPlugin.class);
5251
target.getPlugins().apply(OpenApiMergerPlugin.class);
5352
target.getPlugins().apply(ModuleNamesPlugin.class);
54-
target.getPlugins().apply(DependencyAnalysisPlugin.class);
5553
}
5654
}
5755

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import org.gradle.api.Project;
2121

2222
import static java.util.List.of;
23+
import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.allDependencies;
2324
import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.checkstyle;
2425
import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.defaultDependencies;
25-
import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.dependencyAnalysis;
2626
import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.jacoco;
2727
import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.jar;
2828
import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.java;
@@ -71,7 +71,7 @@ public void apply(Project target) {
7171
signing(),
7272
mavenPom(),
7373
jacoco(),
74-
dependencyAnalysis(),
74+
allDependencies(),
7575
tests(),
7676
jar(),
7777
swagger()
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Apache License, Version 2.0 which is available at
6+
* https://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* SPDX-License-Identifier: Apache-2.0
9+
*
10+
* Contributors:
11+
* Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
12+
*
13+
*/
14+
15+
package org.eclipse.edc.plugins.edcbuild.conventions;
16+
17+
import org.gradle.api.Project;
18+
import org.gradle.api.tasks.diagnostics.DependencyReportTask;
19+
20+
/**
21+
* Registers the 'allDependencies' task, used to get all the dependencies from all the submodules.
22+
*/
23+
public class AllDependenciesConvention implements EdcConvention {
24+
25+
@Override
26+
public void apply(Project target) {
27+
target.getTasks().register("allDependencies", DependencyReportTask.class);
28+
}
29+
30+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public static EdcConvention java() {
5252
return new JavaConvention();
5353
}
5454

55-
public static EdcConvention dependencyAnalysis() {
56-
return new DependencyAnalysisConvention();
55+
public static EdcConvention allDependencies() {
56+
return new AllDependenciesConvention();
5757
}
5858

5959
public static EdcConvention tests() {

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

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)