From 03e5a569422f04ff5a4dffdf47208a8c39fef803 Mon Sep 17 00:00:00 2001 From: Edward Evans Date: Wed, 4 Sep 2019 14:08:21 +1000 Subject: [PATCH 1/2] Ensure plugin-api module gets published at the correct maven path Signed-off-by: Edward Evans --- plugins/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/build.gradle b/plugins/build.gradle index bea3381af4..a9453b5a04 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -68,7 +68,8 @@ check.dependsOn('checkAPIChanges') publishing { publications { mavenJava(MavenPublication) { - groupId 'tech.pegasys.pantheon.plugin-api' + groupId 'tech.pegasys.pantheon' + artifactId 'plugin-api' pom { name = 'Pantheon Plugins Library' description = 'Core Plugins Libraries for Pantheon' From 783097f6826e9ebbce33b787164cc123b4062e75 Mon Sep 17 00:00:00 2001 From: Edward Evans Date: Wed, 4 Sep 2019 14:22:43 +1000 Subject: [PATCH 2/2] Move plugins to plugin-api Signed-off-by: Edward Evans --- acceptance-tests/build.gradle | 2 +- build.gradle | 2 +- consensus/common/build.gradle | 2 +- crypto/build.gradle | 2 +- ethereum/core/build.gradle | 2 +- ethereum/mock-p2p/build.gradle | 2 +- ethereum/rlp/build.gradle | 2 +- metrics/core/build.gradle | 2 +- metrics/rocksdb/build.gradle | 2 +- pantheon/build.gradle | 2 +- {plugins => plugin-api}/build.gradle | 1 - .../main/java/tech/pegasys/pantheon/plugin/PantheonContext.java | 0 .../main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java | 0 .../src/main/java/tech/pegasys/pantheon/plugin/Unstable.java | 0 .../main/java/tech/pegasys/pantheon/plugin/data/Address.java | 0 .../main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java | 0 .../java/tech/pegasys/pantheon/plugin/data/BlockHeader.java | 0 .../src/main/java/tech/pegasys/pantheon/plugin/data/Hash.java | 0 .../src/main/java/tech/pegasys/pantheon/plugin/data/Log.java | 0 .../main/java/tech/pegasys/pantheon/plugin/data/Quantity.java | 0 .../java/tech/pegasys/pantheon/plugin/data/Transaction.java | 0 .../java/tech/pegasys/pantheon/plugin/data/UnformattedData.java | 0 .../tech/pegasys/pantheon/plugin/services/MetricsSystem.java | 0 .../pegasys/pantheon/plugin/services/PantheonConfiguration.java | 0 .../tech/pegasys/pantheon/plugin/services/PantheonEvents.java | 0 .../tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java | 0 .../tech/pegasys/pantheon/plugin/services/StorageService.java | 0 .../pantheon/plugin/services/exception/StorageException.java | 0 .../tech/pegasys/pantheon/plugin/services/metrics/Counter.java | 0 .../pantheon/plugin/services/metrics/LabelledMetric.java | 0 .../pantheon/plugin/services/metrics/MetricCategory.java | 0 .../plugin/services/metrics/MetricCategoryRegistry.java | 0 .../pantheon/plugin/services/metrics/OperationTimer.java | 0 .../pantheon/plugin/services/storage/KeyValueStorage.java | 0 .../plugin/services/storage/KeyValueStorageFactory.java | 0 .../plugin/services/storage/KeyValueStorageTransaction.java | 0 .../pantheon/plugin/services/storage/SegmentIdentifier.java | 0 services/kvstore/build.gradle | 2 +- services/pipeline/build.gradle | 2 +- services/tasks/build.gradle | 2 +- settings.gradle | 2 +- util/build.gradle | 2 +- 42 files changed, 15 insertions(+), 16 deletions(-) rename {plugins => plugin-api}/build.gradle (98%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/data/Hash.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/data/Log.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/data/Quantity.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/data/Transaction.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/data/UnformattedData.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonConfiguration.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/exception/StorageException.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/Counter.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/LabelledMetric.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategory.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategoryRegistry.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/OperationTimer.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorage.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageFactory.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageTransaction.java (100%) rename {plugins => plugin-api}/src/main/java/tech/pegasys/pantheon/plugin/services/storage/SegmentIdentifier.java (100%) diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle index 4f96ac73da..03435d4068 100644 --- a/acceptance-tests/build.gradle +++ b/acceptance-tests/build.gradle @@ -33,7 +33,7 @@ dependencies { testImplementation project(':metrics:core') testImplementation project(':pantheon') testImplementation project(path: ':pantheon', configuration: 'testArtifacts') - testImplementation project(':plugins') + testImplementation project(':plugin-api') testImplementation project(':services:kvstore') testImplementation project(':testutil') testImplementation project(':util') diff --git a/build.gradle b/build.gradle index 5505ec5682..d433319858 100644 --- a/build.gradle +++ b/build.gradle @@ -273,7 +273,7 @@ allprojects { task deploy() {} tasks.register('checkPluginAPIChanges', DefaultTask) { } -checkPluginAPIChanges.dependsOn(':plugins:checkAPIChanges') +checkPluginAPIChanges.dependsOn(':plugin-api:checkAPIChanges') check.dependsOn('checkPluginAPIChanges') subprojects { diff --git a/consensus/common/build.gradle b/consensus/common/build.gradle index 2c8eefb706..0b30c0bb28 100644 --- a/consensus/common/build.gradle +++ b/consensus/common/build.gradle @@ -26,7 +26,7 @@ jar { } dependencies { - api project(':plugins') + api project(':plugin-api') implementation project(':ethereum:core') implementation project(':ethereum:jsonrpc') diff --git a/crypto/build.gradle b/crypto/build.gradle index fcd259bfbe..6ee59aeabc 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -26,7 +26,7 @@ jar { } dependencies { - api project(':plugins') + api project(':plugin-api') api project(':util') api 'org.bouncycastle:bcprov-jdk15on' diff --git a/ethereum/core/build.gradle b/ethereum/core/build.gradle index e2969a4fd8..38c82e1d29 100644 --- a/ethereum/core/build.gradle +++ b/ethereum/core/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':ethereum:rlp') implementation project(':ethereum:trie') implementation project(':metrics:core') - implementation project(':plugins') + implementation project(':plugin-api') implementation project(':services:kvstore') implementation 'com.fasterxml.jackson.core:jackson-databind' diff --git a/ethereum/mock-p2p/build.gradle b/ethereum/mock-p2p/build.gradle index 33333da44f..f7bc9ca67e 100644 --- a/ethereum/mock-p2p/build.gradle +++ b/ethereum/mock-p2p/build.gradle @@ -26,7 +26,7 @@ jar { } dependencies { - api project(':plugins') + api project(':plugin-api') implementation project(':ethereum:p2p') implementation project(':ethereum:permissioning') diff --git a/ethereum/rlp/build.gradle b/ethereum/rlp/build.gradle index 966dd846a5..08c67356ef 100644 --- a/ethereum/rlp/build.gradle +++ b/ethereum/rlp/build.gradle @@ -26,7 +26,7 @@ jar { } dependencies { - api project(':plugins') + api project(':plugin-api') api project(':util') implementation 'com.google.guava:guava' diff --git a/metrics/core/build.gradle b/metrics/core/build.gradle index c6d0efe91b..660384b27d 100644 --- a/metrics/core/build.gradle +++ b/metrics/core/build.gradle @@ -33,7 +33,7 @@ publishing { dependencies { - implementation project(':plugins') + implementation project(':plugin-api') implementation 'com.google.guava:guava' implementation 'io.prometheus:simpleclient' diff --git a/metrics/rocksdb/build.gradle b/metrics/rocksdb/build.gradle index 80287125f6..dd20bd90bf 100644 --- a/metrics/rocksdb/build.gradle +++ b/metrics/rocksdb/build.gradle @@ -27,7 +27,7 @@ jar { dependencies { implementation project(':metrics:core') - implementation project(':plugins') + implementation project(':plugin-api') implementation project(':services:util') implementation 'com.google.guava:guava' diff --git a/pantheon/build.gradle b/pantheon/build.gradle index 64cb95efdc..d65b693df7 100644 --- a/pantheon/build.gradle +++ b/pantheon/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation project(':ethereum:rlp') implementation project(':metrics:core') implementation project(':nat') - implementation project(':plugins') + implementation project(':plugin-api') implementation project(':services:kvstore') implementation 'com.fasterxml.jackson.core:jackson-databind' diff --git a/plugins/build.gradle b/plugin-api/build.gradle similarity index 98% rename from plugins/build.gradle rename to plugin-api/build.gradle index a9453b5a04..adc5814500 100644 --- a/plugins/build.gradle +++ b/plugin-api/build.gradle @@ -69,7 +69,6 @@ publishing { publications { mavenJava(MavenPublication) { groupId 'tech.pegasys.pantheon' - artifactId 'plugin-api' pom { name = 'Pantheon Plugins Library' description = 'Core Plugins Libraries for Pantheon' diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Hash.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Hash.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Hash.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Hash.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Log.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Log.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Log.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Log.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Quantity.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Quantity.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Quantity.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Quantity.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Transaction.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Transaction.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/data/Transaction.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Transaction.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/data/UnformattedData.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/UnformattedData.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/data/UnformattedData.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/UnformattedData.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonConfiguration.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonConfiguration.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonConfiguration.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonConfiguration.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/exception/StorageException.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/exception/StorageException.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/exception/StorageException.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/exception/StorageException.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/Counter.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/Counter.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/Counter.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/Counter.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/LabelledMetric.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/LabelledMetric.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/LabelledMetric.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/LabelledMetric.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategory.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategory.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategory.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategory.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategoryRegistry.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategoryRegistry.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategoryRegistry.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategoryRegistry.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/OperationTimer.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/OperationTimer.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/OperationTimer.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/OperationTimer.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorage.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorage.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorage.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorage.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageFactory.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageFactory.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageFactory.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageFactory.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageTransaction.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageTransaction.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageTransaction.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageTransaction.java diff --git a/plugins/src/main/java/tech/pegasys/pantheon/plugin/services/storage/SegmentIdentifier.java b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/SegmentIdentifier.java similarity index 100% rename from plugins/src/main/java/tech/pegasys/pantheon/plugin/services/storage/SegmentIdentifier.java rename to plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/SegmentIdentifier.java diff --git a/services/kvstore/build.gradle b/services/kvstore/build.gradle index 030a467a43..e45081eea8 100644 --- a/services/kvstore/build.gradle +++ b/services/kvstore/build.gradle @@ -26,7 +26,7 @@ jar { } dependencies { - api project(':plugins') + api project(':plugin-api') api project(':util') implementation project(':metrics:core') diff --git a/services/pipeline/build.gradle b/services/pipeline/build.gradle index ffa7bb60e4..91d2cae7e5 100644 --- a/services/pipeline/build.gradle +++ b/services/pipeline/build.gradle @@ -28,7 +28,7 @@ jar { dependencies { api project(':util') implementation project(':metrics:core') - implementation project(':plugins') + implementation project(':plugin-api') implementation 'org.apache.logging.log4j:log4j-api' implementation 'com.google.guava:guava' diff --git a/services/tasks/build.gradle b/services/tasks/build.gradle index 7fa1067f0c..e0d0b980b8 100644 --- a/services/tasks/build.gradle +++ b/services/tasks/build.gradle @@ -26,7 +26,7 @@ jar { } dependencies { - api project(':plugins') + api project(':plugin-api') api project(':util') compileOnly 'org.openjdk.jmh:jmh-generator-annprocess' diff --git a/settings.gradle b/settings.gradle index 429facdfd7..09bfb28425 100644 --- a/settings.gradle +++ b/settings.gradle @@ -37,7 +37,7 @@ include 'metrics:core' include 'metrics:rocksdb' include 'nat' include 'pantheon' -include 'plugins' +include 'plugin-api' include 'services:kvstore' include 'services:pipeline' include 'services:tasks' diff --git a/util/build.gradle b/util/build.gradle index f1dd867cdc..4cc0d49cd0 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -26,7 +26,7 @@ jar { } dependencies { - implementation project(':plugins') + implementation project(':plugin-api') implementation 'com.google.guava:guava' implementation 'io.vertx:vertx-core' implementation 'org.apache.logging.log4j:log4j-api'