Skip to content

Commit

Permalink
Graalvm metadata migration (#851)
Browse files Browse the repository at this point in the history
* Renamed `tests.common` to `tests.common-sync`

* Renamed `tests.common-entity` to `tests.common`

* Metadata migration

* Enabled hib6 native tests

* Additional hib6 metadata

* Enabled reactive tests

* Enabled native reactive tests

* Removed unnecessary metadata

* Hibernate Reactive metadata

* Moved JOOQ metadata to the metadata shared repository

* Enabled tests for hibernate6 reactive mysql

* Removed graal-svm dependency

* Removed TypeHint annotation

* Added metadata repository and modified tests

* Disabled reactive native tests and modified AbstractApp

* Enabled reactive native tests and fixed micronaut dependency issue in tests

* Additional metadata needed because of jooq upgrade (from 3.17.7 to 3.18.2)
  • Loading branch information
msupic authored Apr 6, 2023
1 parent 5f81fab commit d88fd9e
Show file tree
Hide file tree
Showing 70 changed files with 200 additions and 1,066 deletions.
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

0 comments on commit d88fd9e

Please sign in to comment.