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 <[email protected]>
PegaSysEng · Sep 5, 2019 · 513b055 · 513b055
1 parent 6dbe1bc
commit 513b055
Show file tree

Hide file tree

Showing 42 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → plugin-api/build.gradle b/plugins/build.gradle → 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'

diff --git a/...asys/pantheon/plugin/PantheonContext.java → ...asys/pantheon/plugin/PantheonContext.java b/...asys/pantheon/plugin/PantheonContext.java → ...asys/pantheon/plugin/PantheonContext.java
diff --git a/...gasys/pantheon/plugin/PantheonPlugin.java → ...gasys/pantheon/plugin/PantheonPlugin.java b/...gasys/pantheon/plugin/PantheonPlugin.java → ...gasys/pantheon/plugin/PantheonPlugin.java
diff --git a/...ech/pegasys/pantheon/plugin/Unstable.java → ...ech/pegasys/pantheon/plugin/Unstable.java b/...ech/pegasys/pantheon/plugin/Unstable.java → ...ech/pegasys/pantheon/plugin/Unstable.java
diff --git a/...pegasys/pantheon/plugin/data/Address.java → ...pegasys/pantheon/plugin/data/Address.java b/...pegasys/pantheon/plugin/data/Address.java → ...pegasys/pantheon/plugin/data/Address.java
diff --git a/...asys/pantheon/plugin/data/BinaryData.java → ...asys/pantheon/plugin/data/BinaryData.java b/...asys/pantheon/plugin/data/BinaryData.java → ...asys/pantheon/plugin/data/BinaryData.java
diff --git a/...sys/pantheon/plugin/data/BlockHeader.java → ...sys/pantheon/plugin/data/BlockHeader.java b/...sys/pantheon/plugin/data/BlockHeader.java → ...sys/pantheon/plugin/data/BlockHeader.java
diff --git a/...ch/pegasys/pantheon/plugin/data/Hash.java → ...ch/pegasys/pantheon/plugin/data/Hash.java b/...ch/pegasys/pantheon/plugin/data/Hash.java → ...ch/pegasys/pantheon/plugin/data/Hash.java
diff --git a/...ech/pegasys/pantheon/plugin/data/Log.java → ...ech/pegasys/pantheon/plugin/data/Log.java b/...ech/pegasys/pantheon/plugin/data/Log.java → ...ech/pegasys/pantheon/plugin/data/Log.java
diff --git a/...egasys/pantheon/plugin/data/Quantity.java → ...egasys/pantheon/plugin/data/Quantity.java b/...egasys/pantheon/plugin/data/Quantity.java → ...egasys/pantheon/plugin/data/Quantity.java
diff --git a/...sys/pantheon/plugin/data/Transaction.java → ...sys/pantheon/plugin/data/Transaction.java b/...sys/pantheon/plugin/data/Transaction.java → ...sys/pantheon/plugin/data/Transaction.java
diff --git a/...pantheon/plugin/data/UnformattedData.java → ...pantheon/plugin/data/UnformattedData.java b/...pantheon/plugin/data/UnformattedData.java → ...pantheon/plugin/data/UnformattedData.java
diff --git a/...ntheon/plugin/services/MetricsSystem.java → ...ntheon/plugin/services/MetricsSystem.java b/...ntheon/plugin/services/MetricsSystem.java → ...ntheon/plugin/services/MetricsSystem.java
diff --git a/...lugin/services/PantheonConfiguration.java → ...lugin/services/PantheonConfiguration.java b/...lugin/services/PantheonConfiguration.java → ...lugin/services/PantheonConfiguration.java
diff --git a/...theon/plugin/services/PantheonEvents.java → ...theon/plugin/services/PantheonEvents.java b/...theon/plugin/services/PantheonEvents.java → ...theon/plugin/services/PantheonEvents.java
diff --git a/...theon/plugin/services/PicoCLIOptions.java → ...theon/plugin/services/PicoCLIOptions.java b/...theon/plugin/services/PicoCLIOptions.java → ...theon/plugin/services/PicoCLIOptions.java
diff --git a/...theon/plugin/services/StorageService.java → ...theon/plugin/services/StorageService.java b/...theon/plugin/services/StorageService.java → ...theon/plugin/services/StorageService.java
diff --git a/.../services/exception/StorageException.java → .../services/exception/StorageException.java b/.../services/exception/StorageException.java → .../services/exception/StorageException.java
diff --git a/...heon/plugin/services/metrics/Counter.java → ...heon/plugin/services/metrics/Counter.java b/...heon/plugin/services/metrics/Counter.java → ...heon/plugin/services/metrics/Counter.java
diff --git a/...ugin/services/metrics/LabelledMetric.java → ...ugin/services/metrics/LabelledMetric.java b/...ugin/services/metrics/LabelledMetric.java → ...ugin/services/metrics/LabelledMetric.java
diff --git a/...ugin/services/metrics/MetricCategory.java → ...ugin/services/metrics/MetricCategory.java b/...ugin/services/metrics/MetricCategory.java → ...ugin/services/metrics/MetricCategory.java
diff --git a/...vices/metrics/MetricCategoryRegistry.java → ...vices/metrics/MetricCategoryRegistry.java b/...vices/metrics/MetricCategoryRegistry.java → ...vices/metrics/MetricCategoryRegistry.java
diff --git a/...ugin/services/metrics/OperationTimer.java → ...ugin/services/metrics/OperationTimer.java b/...ugin/services/metrics/OperationTimer.java → ...ugin/services/metrics/OperationTimer.java
diff --git a/...gin/services/storage/KeyValueStorage.java → ...gin/services/storage/KeyValueStorage.java b/...gin/services/storage/KeyValueStorage.java → ...gin/services/storage/KeyValueStorage.java
diff --git a/...vices/storage/KeyValueStorageFactory.java → ...vices/storage/KeyValueStorageFactory.java b/...vices/storage/KeyValueStorageFactory.java → ...vices/storage/KeyValueStorageFactory.java
diff --git a/...s/storage/KeyValueStorageTransaction.java → ...s/storage/KeyValueStorageTransaction.java b/...s/storage/KeyValueStorageTransaction.java → ...s/storage/KeyValueStorageTransaction.java
diff --git a/...n/services/storage/SegmentIdentifier.java → ...n/services/storage/SegmentIdentifier.java b/...n/services/storage/SegmentIdentifier.java → ...n/services/storage/SegmentIdentifier.java
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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'