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.

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

Graalvm metadata migration #851

Merged
merged 27 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5c692a1
Renamed `tests.common` to `tests.common-sync`
msupic Feb 27, 2023
b48a96b
Renamed `tests.common-entity` to `tests.common`
msupic Feb 27, 2023
ae3705c
Metadata migration
msupic Feb 28, 2023
8a104b8
Metadata migration
msupic Mar 9, 2023
b4c669d
Merge branch 'master' of github.com:micronaut-projects/micronaut-sql …
msupic Mar 9, 2023
e0597bf
Merge branch 'master' of github.com:micronaut-projects/micronaut-sql …
msupic Mar 22, 2023
f21092b
Fixed dependency
msupic Mar 22, 2023
5e3d884
Enabled hib6 native tests
msupic Mar 23, 2023
0192120
Additional hib6 metadata
msupic Mar 23, 2023
af8dd4c
Merge branch 'master' of github.com:micronaut-projects/micronaut-sql …
msupic Mar 23, 2023
3754695
Enabled reactive tests
msupic Mar 23, 2023
ef4a912
Enabled native reactive tests
msupic Mar 23, 2023
ac924e5
Removed unnecessary metadata
msupic Mar 23, 2023
09a539e
Hibernate Reactive metadata
msupic Mar 24, 2023
fdec777
Moved JOOQ metadata to the metadata shared repository
msupic Mar 28, 2023
e1b07c8
Enabled tests for hibernate6 reactive mysql
msupic Mar 28, 2023
b92b5f6
Merge branch 'master' of github.com:micronaut-projects/micronaut-sql …
msupic Mar 28, 2023
c33e8a2
Removed graal-svm dependency
msupic Mar 29, 2023
f285c3b
Removed TypeHint annotation
msupic Mar 30, 2023
dbbfac3
Merge branch 'master' of github.com:micronaut-projects/micronaut-sql …
msupic Mar 30, 2023
4396e89
Merge branch 'master' of github.com:micronaut-projects/micronaut-sql …
msupic Mar 30, 2023
ae9f99f
Merge branch 'master' of github.com:micronaut-projects/micronaut-sql …
msupic Apr 3, 2023
19a1bb3
Added metadata repository and modified tests
msupic Apr 5, 2023
d707e89
Disabled reactive native tests and modified AbstractApp
msupic Apr 5, 2023
5f8a04e
Merge branch 'master' of github.com:micronaut-projects/micronaut-sql …
msupic Apr 5, 2023
2405259
Enabled reactive native tests and fixed micronaut dependency issue in…
msupic Apr 5, 2023
2394aa9
Additional metadata needed because of jooq upgrade (from 3.17.7 to 3.…
msupic Apr 5, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ tasks.named("check") { task ->
}
}

// TODO: Remove when micronaut-gradle-plugin gets upgraded to 4.0.0 version
project.afterEvaluate {
// Disabled since native tests are executed by 'nativeTest' task from Native Build Tools plugin
nativeCompile.enabled = false
configurations.all {
resolutionStrategy.preferProjectModules()
}

graalvmNative {
Expand Down
2 changes: 0 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ managed-h2 = "2.1.214"
# Other

sfm-reflect = "8.2.3"
graal-svm = "22.3.1"

# Testing

Expand Down Expand Up @@ -138,7 +137,6 @@ jakarta-transaction-api = { module = "jakarta.transaction:jakarta.transaction-ap
# Others

sfm-reflect = { module = "org.simpleflatmapper:sfm-reflect", version.ref = "sfm-reflect" }
graal-svm = { module = "org.graalvm.nativeimage:svm", version.ref = "graal-svm" }

# Testcontainers

Expand Down
1 change: 0 additions & 1 deletion hibernate-jpa-spring/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ plugins {
dependencies {
annotationProcessor(mn.micronaut.graal)

compileOnly(libs.graal.svm)
api(libs.managed.hibernate.core) {
exclude group:'org.javassist', module:'javassist'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@
package io.micronaut.configuration.hibernate.jpa.spring;

import io.micronaut.context.annotation.*;
import io.micronaut.core.annotation.TypeHint;
import io.micronaut.jdbc.spring.DataSourceTransactionManagerFactory;
import org.hibernate.SessionFactory;
import org.springframework.orm.hibernate5.HibernateTransactionManager;
import org.springframework.orm.hibernate5.SpringSessionContext;

import javax.sql.DataSource;

Expand All @@ -33,7 +31,6 @@
@Factory
@Requires(classes = HibernateTransactionManager.class)
@Replaces(factory = DataSourceTransactionManagerFactory.class)
@TypeHint({SpringSessionContext.class, HibernateTransactionManager.class})
public class HibernateTransactionManagerFactory {

/**
Expand Down
1 change: 0 additions & 1 deletion hibernate-jpa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ dependencies {
api projects.micronautJdbc
api(mn.micronaut.runtime)

compileOnly(libs.graal.svm)
compileOnly(libs.managed.hibernate.micrometer)
compileOnly(libs.managed.hibernate.jcache)
compileOnly(mn.micronaut.management)
Expand Down

This file was deleted.

Loading