You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ib...@apache.org on 2022/10/12 12:59:11 UTC
[ignite-3] branch main updated: IGNITE-17862: Fix gradle build (#1186)
This is an automated email from the ASF dual-hosted git repository.
ibessonov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 937e4eb8e7 IGNITE-17862: Fix gradle build (#1186)
937e4eb8e7 is described below
commit 937e4eb8e749eadf587fde96e5f641b21d4f159b
Author: Mikhail <Po...@users.noreply.github.com>
AuthorDate: Wed Oct 12 15:59:05 2022 +0300
IGNITE-17862: Fix gradle build (#1186)
---
modules/metrics/build.gradle | 7 +++++++
modules/{transactions => replicator}/build.gradle | 13 +++++--------
modules/runner/build.gradle | 1 +
modules/sql-engine/build.gradle | 1 +
modules/table/build.gradle | 3 +++
modules/transactions/build.gradle | 8 ++++++++
.../state/test/TestConcurrentHashMapTxStateStorage.java | 0
.../test/TestConcurrentHashMapTxStateTableStorage.java | 0
settings.gradle | 2 ++
9 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/modules/metrics/build.gradle b/modules/metrics/build.gradle
index b48e1594de..5d94c30bef 100644
--- a/modules/metrics/build.gradle
+++ b/modules/metrics/build.gradle
@@ -29,10 +29,17 @@ dependencies {
implementation project(':ignite-rest-api')
implementation libs.jetbrains.annotations
implementation libs.micronaut.http.core
+ implementation libs.micronaut.http.server.core
+ testAnnotationProcessor project(":ignite-configuration-annotation-processor")
testImplementation libs.hamcrest.core
testImplementation libs.mockito.core
testImplementation project(':ignite-core')
+ testImplementation(testFixtures(project(':ignite-core')))
+ testImplementation(testFixtures(project(':ignite-configuration')))
+
+ integrationTestAnnotationProcessor project(":ignite-configuration-annotation-processor")
+ integrationTestImplementation(testFixtures(project(':ignite-configuration')))
}
description = 'ignite-metrics'
diff --git a/modules/transactions/build.gradle b/modules/replicator/build.gradle
similarity index 78%
copy from modules/transactions/build.gradle
copy to modules/replicator/build.gradle
index f1a43c9711..3b1aff69d1 100644
--- a/modules/transactions/build.gradle
+++ b/modules/replicator/build.gradle
@@ -18,21 +18,18 @@
apply from: "$rootDir/buildscripts/java-core.gradle"
apply from: "$rootDir/buildscripts/java-junit5.gradle"
+
dependencies {
annotationProcessor project(":ignite-network-annotation-processor")
- implementation project(':ignite-api')
implementation project(':ignite-core')
+ implementation project(':ignite-raft')
+ implementation project(':ignite-configuration')
implementation project(':ignite-network-api')
- implementation project(':ignite-network')
- implementation project(':ignite-raft-client')
- implementation project(':ignite-rocksdb-common')
implementation libs.jetbrains.annotations
implementation libs.fastutil.core
- testImplementation project(':ignite-core')
- testImplementation(testFixtures(project(':ignite-core')))
- testImplementation libs.mockito.junit
testImplementation libs.mockito.core
+ testImplementation libs.mockito.junit
}
-description = 'ignite-transactions'
+description = 'ignite-replicator'
diff --git a/modules/runner/build.gradle b/modules/runner/build.gradle
index 8f0c743de5..7d6321f506 100644
--- a/modules/runner/build.gradle
+++ b/modules/runner/build.gradle
@@ -49,6 +49,7 @@ dependencies {
implementation project(':ignite-core')
implementation project(':ignite-cluster-management')
implementation project(':ignite-metrics')
+ implementation project(':ignite-replicator')
implementation libs.jetbrains.annotations
implementation libs.micronaut.inject
implementation libs.micronaut.validation
diff --git a/modules/sql-engine/build.gradle b/modules/sql-engine/build.gradle
index d19fa830dd..b666000d84 100644
--- a/modules/sql-engine/build.gradle
+++ b/modules/sql-engine/build.gradle
@@ -30,6 +30,7 @@ dependencies {
implementation project(':ignite-storage-api')
implementation project(':ignite-schema')
implementation project(':ignite-transactions')
+ implementation project(':ignite-replicator')
implementation libs.jetbrains.annotations
implementation libs.fastutil.core
implementation libs.caffeine
diff --git a/modules/table/build.gradle b/modules/table/build.gradle
index 2124fd252f..411b010ad6 100644
--- a/modules/table/build.gradle
+++ b/modules/table/build.gradle
@@ -30,6 +30,7 @@ dependencies {
implementation project(':ignite-baseline')
implementation project(':ignite-network-api')
implementation project(':ignite-raft')
+ implementation project(':ignite-replicator')
implementation project(':ignite-raft-client')
implementation project(':ignite-metastorage-client')
implementation project(':ignite-storage-api')
@@ -52,6 +53,7 @@ dependencies {
testImplementation(testFixtures(project(':ignite-core')))
testImplementation(testFixtures(project(':ignite-schema')))
testImplementation(testFixtures(project(':ignite-configuration')))
+ testImplementation(testFixtures(project(':ignite-transactions')))
testImplementation(testFixtures(project(':ignite-storage-api')))
testImplementation(testFixtures(project(':ignite-raft')))
testImplementation libs.mockito.core
@@ -69,6 +71,7 @@ dependencies {
integrationTestImplementation(testFixtures(project(':ignite-network')))
integrationTestImplementation(testFixtures(project(':ignite-raft')))
integrationTestImplementation(testFixtures(project(':ignite-storage-api')))
+ integrationTestImplementation(testFixtures(project(':ignite-transactions')))
}
description = 'ignite-table'
diff --git a/modules/transactions/build.gradle b/modules/transactions/build.gradle
index f1a43c9711..3563c62844 100644
--- a/modules/transactions/build.gradle
+++ b/modules/transactions/build.gradle
@@ -17,6 +17,7 @@
apply from: "$rootDir/buildscripts/java-core.gradle"
apply from: "$rootDir/buildscripts/java-junit5.gradle"
+apply from: "$rootDir/buildscripts/java-test-fixtures.gradle"
dependencies {
annotationProcessor project(":ignite-network-annotation-processor")
@@ -26,6 +27,8 @@ dependencies {
implementation project(':ignite-network')
implementation project(':ignite-raft-client')
implementation project(':ignite-rocksdb-common')
+ implementation project(':ignite-replicator')
+ implementation project(':ignite-configuration')
implementation libs.jetbrains.annotations
implementation libs.fastutil.core
@@ -33,6 +36,11 @@ dependencies {
testImplementation(testFixtures(project(':ignite-core')))
testImplementation libs.mockito.junit
testImplementation libs.mockito.core
+
+ testFixturesImplementation project(':ignite-configuration')
+ testFixturesImplementation project(':ignite-core')
+ testFixturesImplementation project(':ignite-api')
+ testFixturesImplementation libs.jetbrains.annotations
}
description = 'ignite-transactions'
diff --git a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/test/TestConcurrentHashMapTxStateStorage.java b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestConcurrentHashMapTxStateStorage.java
similarity index 100%
rename from modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/test/TestConcurrentHashMapTxStateStorage.java
rename to modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestConcurrentHashMapTxStateStorage.java
diff --git a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/test/TestConcurrentHashMapTxStateTableStorage.java b/modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestConcurrentHashMapTxStateTableStorage.java
similarity index 100%
rename from modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/test/TestConcurrentHashMapTxStateTableStorage.java
rename to modules/transactions/src/testFixtures/java/org/apache/ignite/internal/tx/storage/state/test/TestConcurrentHashMapTxStateTableStorage.java
diff --git a/settings.gradle b/settings.gradle
index d1de2d5faa..2a4fe8821f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -62,6 +62,7 @@ include(':ignite-metrics')
include(':ignite-binary-tuple')
include(':platforms')
include(':packaging')
+include(':ignite-replicator')
project(":ignite-examples").projectDir = file('examples')
project(":ignite-page-memory").projectDir = file('modules/page-memory')
@@ -108,4 +109,5 @@ project(":ignite-compute").projectDir = file('modules/compute')
project(":ignite-metrics").projectDir = file('modules/metrics')
project(":ignite-binary-tuple").projectDir = file('modules/binary-tuple')
project(":platforms").projectDir = file('modules/platforms')
+project(":ignite-replicator").projectDir = file('modules/replicator')
project(":packaging").projectDir = file('packaging')