Ensure plugin-api module gets published at the correct maven path (#1905)

* Ensure `plugin-api` module gets published at the correct maven path * Move `plugins` to `plugin-api` Signed-off-by: Edward Evans <edward.evans@consensys.net> Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
5 years ago · 9856cd32b0
parent 59743a7096
commit 9856cd32b0
42 changed files with 16 additions and 16 deletions
--- 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')
--- 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 {
--- 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')
--- 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'
--- 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'
--- 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')
--- 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'
--- 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'
--- 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'
--- 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'
--- a/plugin-api/build.gradle
+++ b/plugin-api/build.gradle
@ -68,7 +68,7 @@ check.dependsOn('checkAPIChanges')
 publishing {
  publications {
    mavenJava(MavenPublication) {
-      groupId 'tech.pegasys.pantheon.plugin-api'
+      groupId 'tech.pegasys.pantheon'
      pom {
        name = 'Pantheon Plugins Library'
        description = 'Core Plugins Libraries for Pantheon'
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Hash.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Hash.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Log.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Log.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Quantity.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Quantity.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Transaction.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Transaction.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/UnformattedData.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/UnformattedData.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonConfiguration.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonConfiguration.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java
--- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java
+++ b/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java
--- a/plugin-api/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
--- a/plugin-api/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
--- a/plugin-api/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
--- a/plugin-api/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
--- a/plugin-api/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
--- a/plugin-api/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
--- a/plugin-api/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
--- a/plugin-api/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
--- a/plugin-api/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
--- a/plugin-api/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
--- 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')
--- 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'
--- 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'
--- 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'
--- 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'