Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove jakarta managed deps and use from micronaut-sql #3191

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Remove jakarta managed deps and use from micronaut-sql #3191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b27a0d
Remove jakarta managed deps and use from micronaut-sql
radovanradic Oct 18, 2024
4b01e71
Add library dependency regression
radovanradic Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/benchmark-micronaut-data-jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
annotationProcessor projects.micronautDataProcessor
implementation projects.micronautDataJdbc
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)
runtimeOnly mnSql.micronaut.jdbc.hikari
runtimeOnly mnSql.h2
runtimeOnly mn.snakeyaml
Expand Down
5 changes: 2 additions & 3 deletions data-azure-cosmos/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ dependencies {

testAnnotationProcessor projects.micronautDataDocumentProcessor
testAnnotationProcessor mn.micronaut.inject.java
testAnnotationProcessor(libs.managed.jakarta.persistence.api)
testAnnotationProcessor(mnSql.jakarta.persistence.api)

testImplementation projects.micronautDataDocumentProcessor
testImplementation projects.micronautDataDocumentTck
testImplementation(libs.managed.jakarta.persistence.api)
testImplementation(mnSql.jakarta.persistence.api)
testImplementation mnRxjava2.micronaut.rxjava2
testImplementation mnReactor.micronaut.reactor
testImplementation(libs.managed.jakarta.persistence.api)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was duplicate entry

testImplementation mnValidation.micronaut.validation
testImplementation(platform(mnTestResources.boms.testcontainers))
testImplementation libs.testcontainers.azure
Expand Down
9 changes: 9 additions & 0 deletions data-bom/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ micronautBom {
excludeProject.set({ p ->
p.name.contains('benchmark') || p.name.contains('example') || p.name.endsWith('-tck')
} as Spec<String>)

suppressions {
// jakarta-persistence-api and jakarta-transaction-api removed from the catalog
// and is used from micronaut-sql bom
acceptedLibraryRegressions.add("jakarta-persistence-api")
acceptedLibraryRegressions.add("jakarta-transaction-api")
acceptedVersionRegressions.add("jakarta-persistence-api")
acceptedVersionRegressions.add("jakarta-transaction-api")
}
}


Expand Down
2 changes: 1 addition & 1 deletion data-document-model/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ dependencies {
api projects.micronautDataModel
api mnSerde.micronaut.serde.api

compileOnly(libs.managed.jakarta.persistence.api)
compileOnly(mnSql.jakarta.persistence.api)
}
2 changes: 1 addition & 1 deletion data-document-tck/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
implementation projects.micronautDataTx
implementation mnTest.micronaut.test.spock
implementation mnTest.micronaut.test.core
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

compileOnly mn.micronaut.inject.groovy
}
2 changes: 1 addition & 1 deletion data-jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
testImplementation mnReactor.micronaut.reactor
testImplementation libs.jackson.databind
testImplementation(libs.managed.javax.persistence.api)
testImplementation(libs.managed.jakarta.persistence.api)
testImplementation(mnSql.jakarta.persistence.api)
testImplementation libs.groovy.sql
testImplementation mnValidation.micronaut.validation
testImplementation mnValidation.micronaut.validation.processor
Expand Down
2 changes: 1 addition & 1 deletion data-jpa/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ dependencies {

api projects.micronautDataRuntime
api projects.micronautDataModel
api(libs.managed.jakarta.persistence.api)
api(mnSql.jakarta.persistence.api)
}
2 changes: 1 addition & 1 deletion data-model/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {

implementation mn.reactor

compileOnly(libs.managed.jakarta.persistence.api)
compileOnly(mnSql.jakarta.persistence.api)
compileOnly mnRxjava2.rxjava2
compileOnly mn.jackson.annotations
compileOnly mn.jackson.databind
Expand Down
6 changes: 3 additions & 3 deletions data-mongodb/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ dependencies {

testAnnotationProcessor projects.micronautDataDocumentProcessor
testAnnotationProcessor mn.micronaut.inject.java
testAnnotationProcessor(libs.managed.jakarta.persistence.api)
testAnnotationProcessor(mnSql.jakarta.persistence.api)

testImplementation mnMongo.mongo.driver
testImplementation mnMongo.mongo.reactive
testImplementation projects.micronautDataDocumentProcessor
testImplementation projects.micronautDataDocumentTck
testImplementation(libs.managed.jakarta.persistence.api)
testImplementation(mnSql.jakarta.persistence.api)
testImplementation mnRxjava2.micronaut.rxjava2
testImplementation mnReactor.micronaut.reactor
testImplementation(libs.managed.jakarta.persistence.api)
testImplementation(mnSql.jakarta.persistence.api)
testImplementation mnValidation.micronaut.validation

testCompileOnly mn.micronaut.inject.groovy
Expand Down
4 changes: 2 additions & 2 deletions data-processor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

dependencies {
api projects.micronautDataModel
api(libs.managed.jakarta.persistence.api)
api(mnSql.jakarta.persistence.api)

compileOnly mn.micronaut.core.processor

Expand All @@ -16,7 +16,7 @@ dependencies {
testImplementation mn.micronaut.inject.groovy.test
testImplementation mn.micronaut.inject.java.test
testImplementation(libs.managed.javax.persistence.api)
testImplementation(libs.managed.jakarta.transaction.api)
testImplementation(mnSql.jakarta.transaction.api)
testImplementation libs.spring.data.jpa
testImplementation projects.micronautDataTck
testImplementation projects.micronautDataTx
Expand Down
4 changes: 2 additions & 2 deletions data-r2dbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation(libs.reactor.netty.core)

compileOnly mnR2dbc.r2dbc.oracle
compileOnly libs.managed.jakarta.persistence.api
compileOnly mnSql.jakarta.persistence.api

testImplementation projects.micronautDataTck
testImplementation mnTest.micronaut.test.spock
Expand All @@ -38,7 +38,7 @@ dependencies {

testImplementation mn.jackson.databind
testImplementation(libs.managed.javax.persistence.api)
testImplementation(libs.managed.jakarta.persistence.api)
testImplementation(mnSql.jakarta.persistence.api)
testImplementation libs.groovy.sql
testImplementation mnValidation.micronaut.validation
testImplementation mnValidation.micronaut.validation.processor
Expand Down
4 changes: 2 additions & 2 deletions data-runtime/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
compileOnly mn.micronaut.json.core

implementation mn.reactor
implementation libs.managed.jakarta.persistence.api
implementation mnSql.jakarta.persistence.api

compileOnly(libs.managed.javax.persistence.api)
compileOnly libs.kotlin.coroutines.reactor
Expand All @@ -25,7 +25,7 @@ dependencies {
testAnnotationProcessor mn.micronaut.inject.java
testAnnotationProcessor projects.micronautDataProcessor

testImplementation(libs.managed.jakarta.persistence.api)
testImplementation(mnSql.jakarta.persistence.api)
testImplementation(libs.managed.javax.persistence.api)
testImplementation projects.micronautDataProcessor
testImplementation mn.micronaut.inject.groovy
Expand Down
2 changes: 1 addition & 1 deletion data-tck/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation mn.jackson.databind
implementation libs.groovy.dateutil
implementation(libs.managed.javax.persistence.api)
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

compileOnly projects.micronautDataJdbc
compileOnly mn.micronaut.inject.groovy
Expand Down
2 changes: 1 addition & 1 deletion data-tx-jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
annotationProcessor mn.micronaut.inject.java

api(libs.managed.jakarta.transaction.api)
api(mnSql.jakarta.transaction.api)
api projects.micronautDataTx
api projects.micronautDataConnectionJdbc

Expand Down
2 changes: 1 addition & 1 deletion data-tx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
annotationProcessor mn.micronaut.inject.java
kapt mn.micronaut.inject.java

api(libs.managed.jakarta.transaction.api)
api(mnSql.jakarta.transaction.api)
api projects.micronautDataConnection

implementation mn.micronaut.inject
Expand Down
2 changes: 1 addition & 1 deletion doc-examples/azure-cosmos-example-groovy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
compileOnly(libs.managed.javax.persistence.api)

implementation projects.micronautDataAzureCosmos
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

runtimeOnly mnLogging.logback.classic

Expand Down
2 changes: 1 addition & 1 deletion doc-examples/azure-cosmos-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
compileOnly(libs.managed.javax.persistence.api)

implementation projects.micronautDataAzureCosmos
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

runtimeOnly mnLogging.logback.classic

Expand Down
2 changes: 1 addition & 1 deletion doc-examples/azure-cosmos-example-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
compileOnly(libs.managed.javax.persistence.api)

implementation projects.micronautDataAzureCosmos
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)
implementation libs.kotlin.coroutines
implementation libs.kotlin.coroutines.reactive
implementation mnKotlin.micronaut.kotlin.runtime
Expand Down
4 changes: 2 additions & 2 deletions doc-examples/hibernate-example-kotlin-ksp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies {
implementation mn.micronaut.http.client
implementation projects.micronautDataHibernateJpa
implementation mnKotlin.micronaut.kotlin.runtime
implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)
implementation libs.kotlin.coroutines
implementation libs.kotlin.coroutines.reactive

Expand Down
2 changes: 1 addition & 1 deletion doc-examples/jdbc-and-r2dbc-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation mnRxjava2.micronaut.rxjava2
implementation mn.micronaut.http.client
implementation mnValidation.micronaut.validation
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

runtimeOnly mnLogging.logback.classic
runtimeOnly mnSql.micronaut.jdbc.tomcat
Expand Down
2 changes: 1 addition & 1 deletion doc-examples/jdbc-example-groovy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation projects.micronautDataJdbc
implementation mn.micronaut.http.client
implementation mnValidation.micronaut.validation
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

runtimeOnly mnSql.micronaut.jdbc.tomcat
runtimeOnly mnLogging.logback.classic
Expand Down
2 changes: 1 addition & 1 deletion doc-examples/jdbc-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation mnRxjava2.micronaut.rxjava2
implementation mn.micronaut.http.client
implementation mnValidation.micronaut.validation
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

runtimeOnly mnSql.micronaut.jdbc.tomcat
runtimeOnly mnLogging.logback.classic
Expand Down
2 changes: 1 addition & 1 deletion doc-examples/jdbc-example-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {

implementation mn.micronaut.http.client
implementation projects.micronautDataJdbc
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)
implementation libs.kotlin.coroutines
implementation libs.kotlin.coroutines.reactive

Expand Down
2 changes: 1 addition & 1 deletion doc-examples/jdbc-example-records-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation projects.micronautDataJdbc
implementation mn.micronaut.http.client
implementation mnValidation.micronaut.validation
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

runtimeOnly mnSql.micronaut.jdbc.tomcat
runtimeOnly mnLogging.logback.classic
Expand Down
4 changes: 2 additions & 2 deletions doc-examples/jdbc-multitenancy-datasource-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ dependencies {
implementation mn.micronaut.http.client
implementation projects.micronautDataJdbc
implementation mnSerde.micronaut.serde.jackson
implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnSql.micronaut.jdbc.tomcat
runtimeOnly mnSql.h2
Expand Down
4 changes: 2 additions & 2 deletions doc-examples/jdbc-multitenancy-discriminator-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ dependencies {
implementation mn.micronaut.http.client
implementation projects.micronautDataJdbc
implementation mnSerde.micronaut.serde.jackson
implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnSql.micronaut.jdbc.tomcat
runtimeOnly mnSql.h2
Expand Down
4 changes: 2 additions & 2 deletions doc-examples/jdbc-multitenancy-schema-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ dependencies {
implementation mn.micronaut.http.client
implementation projects.micronautDataJdbc
implementation mnSerde.micronaut.serde.jackson
implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnSql.micronaut.jdbc.tomcat
runtimeOnly mnSql.h2
Expand Down
2 changes: 1 addition & 1 deletion doc-examples/jdbc-spring-tx-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation projects.micronautDataSpringJdbc
implementation mn.micronaut.http.client
implementation mnValidation.micronaut.validation
implementation(libs.managed.jakarta.persistence.api)
implementation(mnSql.jakarta.persistence.api)

runtimeOnly mnSql.micronaut.jdbc.tomcat
runtimeOnly mnLogging.logback.classic
Expand Down
4 changes: 2 additions & 2 deletions doc-examples/mongo-example-groovy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ dependencies {
implementation projects.micronautDataMongodb
implementation mnMongo.mongo.driver

implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnLogging.logback.classic
}
4 changes: 2 additions & 2 deletions doc-examples/mongo-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ dependencies {
implementation projects.micronautDataMongodb
implementation mnMongo.mongo.driver

implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnLogging.logback.classic
}
4 changes: 2 additions & 2 deletions doc-examples/mongo-example-kotlin-ksp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {
implementation mnKotlin.micronaut.kotlin.runtime

compileOnly(libs.managed.javax.persistence.api)
implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)
implementation libs.kotlin.coroutines
implementation libs.kotlin.coroutines.reactive

Expand Down
4 changes: 2 additions & 2 deletions doc-examples/mongo-example-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ dependencies {
implementation mnKotlin.micronaut.kotlin.runtime

compileOnly(libs.managed.javax.persistence.api)
implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)
implementation libs.kotlin.coroutines
implementation libs.kotlin.coroutines.reactive

Expand Down
4 changes: 2 additions & 2 deletions doc-examples/mongo-example-records-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ dependencies {
implementation mnMongo.mongo.driver

compileOnly(libs.managed.javax.persistence.api)
implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnLogging.logback.classic
}
4 changes: 2 additions & 2 deletions doc-examples/mongo-multitenancy-database-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {

implementation mnMongo.mongo.driver

implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnLogging.logback.classic
}
4 changes: 2 additions & 2 deletions doc-examples/mongo-multitenancy-datasource-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {

implementation mnMongo.mongo.driver

implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnLogging.logback.classic
}
4 changes: 2 additions & 2 deletions doc-examples/mongo-multitenancy-discriminator-example-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {

implementation mnMongo.mongo.driver

implementation(libs.managed.jakarta.persistence.api)
implementation(libs.managed.jakarta.transaction.api)
implementation(mnSql.jakarta.persistence.api)
implementation(mnSql.jakarta.transaction.api)

runtimeOnly mnLogging.logback.classic
}
Loading
Loading