Skip to content

Commit

Permalink
build: adds BOM and Migration to Gradle Version Catalog (#262)
Browse files Browse the repository at this point in the history
* Migration to Gradle Version Catalog.

* Cleanup.

* Restored .github folder.

* Managed dependencies.

* Add BOM, import catalog, remove defaults

* Accept v2 -> v3 API changes (major version)

* Feedback, remove unused, target 5.1.0

* Remove template cleanup

* remove accepted changes

* enable binary compatibility

Co-authored-by: Alexey Zhokhov <[email protected]>
Co-authored-by: Sergio del Amo <[email protected]>
  • Loading branch information
3 people authored Jul 29, 2022
1 parent 994eb5d commit 9babd19
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 71 deletions.
52 changes: 0 additions & 52 deletions .github/workflows/template-cleanup.yml

This file was deleted.

9 changes: 9 additions & 0 deletions cassandra-bom/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins {
id("io.micronaut.build.internal.bom")
}

// First BOM release, this can be removed after a BOM is out
micronautBuild {
// Required as a workaround to https://github.com/micronaut-projects/micronaut-build/pull/376
tasks.named("checkVersionCatalogCompatibility") { onlyIf { false } }
}
23 changes: 7 additions & 16 deletions cassandra/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,14 @@ plugins {
}

dependencies {
annotationProcessor 'io.micronaut:micronaut-inject-java'
annotationProcessor "io.micronaut.docs:micronaut-docs-asciidoc-config-props:$micronautDocsVersion"
api(libs.managed.datastax.cassandra.driver.core)
api(libs.managed.datastax.cassandra.driver.mapper.processor)

implementation 'io.micronaut:micronaut-inject'
compileOnly(mn.micronaut.management)

api "com.datastax.oss:java-driver-core:$datastaxCassandraDriverVersion"
api "com.datastax.oss:java-driver-mapper-processor:$datastaxCassandraDriverVersion"
testImplementation(libs.reactor.core)

compileOnly "io.micronaut:micronaut-management"

testImplementation "io.projectreactor:reactor-core"
testImplementation 'io.micronaut:micronaut-inject-groovy'
testImplementation("org.spockframework:spock-core:$spockVersion") {
exclude module: 'groovy-all'
}
testImplementation "io.micronaut.test:micronaut-test-spock:$micronautTestVersion"
testImplementation "org.testcontainers:spock:1.16.3"
testImplementation "org.testcontainers:cassandra:1.17.3"
testImplementation "io.micronaut:micronaut-management"
testImplementation(libs.testcontainers.spock)
testImplementation(libs.testcontainers.cassandra)
testImplementation(mn.micronaut.management)
}
2 changes: 2 additions & 0 deletions config/checkstyle/.rsync-filter
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- suppressions.xml
- checkstyle.xml
4 changes: 1 addition & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
projectVersion=5.0.1-SNAPSHOT
projectVersion=5.1.0-SNAPSHOT
projectGroup=io.micronaut.cassandra

micronautDocsVersion=2.0.0
Expand All @@ -8,8 +8,6 @@ micronautTestVersion=3.4.0
groovyVersion=3.0.10
spockVersion=2.1-groovy-3.0

datastaxCassandraDriverVersion=4.14.1

title=Micronaut Cassandra
projectDesc=Provides integration between Micronaut and Cassandra
projectUrl=https://micronaut.io
Expand Down
14 changes: 14 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[versions]
managed-datastax-cassandra-driver = "4.14.1"

testcontainers = "1.16.3"
spock = "2.1-groovy-3.0"

[libraries]
managed-datastax-cassandra-driver-core = { module = "com.datastax.oss:java-driver-core", version.ref = "managed-datastax-cassandra-driver" }
managed-datastax-cassandra-driver-mapper-processor = { module = "com.datastax.oss:java-driver-mapper-processor", version.ref = "managed-datastax-cassandra-driver" }

reactor-core = { module = "io.projectreactor:reactor-core" }

testcontainers-cassandra = { module = "org.testcontainers:cassandra", version.ref = "testcontainers" }
testcontainers-spock = { module = "org.testcontainers:spock", version.ref = "testcontainers" }
7 changes: 7 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@ pluginManagement {
mavenCentral()
}
}

plugins {
id("io.micronaut.build.shared.settings") version "5.3.14"
}

rootProject.name = 'cassandra-parent'
include 'cassandra'
include 'cassandra-bom'

micronautBuild {
importMicronautCatalog()
}

0 comments on commit 9babd19

Please sign in to comment.