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

javax to jakarta, groovy 4, spring framework 6 and spring boot 3 migrations #1810

Merged
merged 75 commits into from
Aug 27, 2024

Conversation

jamesfredley
Copy link
Contributor

@jamesfredley jamesfredley commented Aug 22, 2024

PR so that a 9.0.0-SNAPSHOT can be published and we can continue working on other grails dependencies while we work on the failing tests ignored on this PR. #1811

Key Changes and issues:

Groovy-5106 issues:

Tenants changes -

error: name clash: currentId(Class<? extends RxDatastoreClient>) in grails.gorm.rx.multitenancy.Tenants and currentId(Class<? extends Datastore>) in grails.gorm.multitenancy.Tenants have the same erasure, yet neither hides the other
public static  java.io.Serializable currentId(java.lang.Class<? extends org.grails.datastore.rx.RxDatastoreClient> datastoreClass) { return (java.io.Serializable)null;}
Tenants.java:11: error: name clash: <T#1>withCurrent(Class<? extends RxDatastoreClient>,Closure<T#1>) in grails.gorm.rx.multitenancy.Tenants and <T#2>withCurrent(Class<? extends Datastore>,Closure<T#2>) in grails.gorm.multitenancy.Tenants have the same erasure, yet neither hides the other
public static <T> T withCurrent(java.lang.Class<? extends org.grails.datastore.rx.RxDatastoreClient> datastoreClass, @groovy.lang.DelegatesTo(value=org.grails.datastore.rx.RxDatastoreClient.class) groovy.lang.Closure<T> callable) { return (T)null;}
                    ^
  where T#1,T#2 are type-variables:
    T#1 extends Object declared in method <T#1>withCurrent(Class<? extends RxDatastoreClient>,Closure<T#1>)
    T#2 extends Object declared in method <T#2>withCurrent(Class<? extends Datastore>,Closure<T#2>)

Annotation Metadata Reader

javax in Grails Package hierarchy and class name

CastExpression.asExpression(newReturnType, returnExpr)

The interface XXX cannot be implemented more than once with different arguments: java.util.Example<java.lang.Object> and java.util.Example<E>

More test failures:

matrei and others added 30 commits November 13, 2023 14:25
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…12.1 (grails#1771)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ls#1772)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* docs: Update readme

- change to https links
- make links inline
- update md syntax
- add maven central badge
- add event filter (push) to CI badge
- remove release workflow badge
- improve text

* docs: fix maven central badge url
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Add groovy-joint-workflow

* Update groovy-joint-workflow.yml
* Update build.gradle

Override project groovyVersion from env CI_GROOVY_VERSION

* Force groovy version from the env CI_GROOVY_VERSION
* Fix trait `ValidatedService` (broken `validatorFactory` initialization)

* Annotate instance field initialization with `@CompileDynamic`

* Drop `@CompileDynamic`; rename instance field to avoid name collision
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…12.2 (grails#1787)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@jamesfredley jamesfredley changed the title javax to jarakarta, groovy 4, spring framework 6 and spring boot 3 migrations javax to jakarta, groovy 4, spring framework 6 and spring boot 3 migrations Aug 22, 2024
…: class file for javax.annotation.meta.When not found
@matrei
Copy link
Contributor

matrei commented Aug 23, 2024

Nice work 👍
For the failing groovy-joint-workflow, have a look at the adjustments made in https://github.com/grails/grails-core/blob/7.0.x/.github/workflows/groovy-joint-workflow.yml. (The setup of Develocity in the Groovy build has changed in GROOVY_4_0_X).

@matrei
Copy link
Contributor

matrei commented Aug 26, 2024

@jamesfredley Do you wanna merge this bad boy? Or is @codeconsole or @jdaugherty in the process of reviewing?

@jdaugherty
Copy link

@jamesfredley Do you wanna merge this bad boy? Or is @codeconsole or @jdaugherty in the process of reviewing?

I'm actually in the process of reviewing. I have been talking about some solutions to the multiple inheritance problem. Can this wait until Thursday's meeting?

@matrei
Copy link
Contributor

matrei commented Aug 26, 2024

@jamesfredley Do you wanna merge this bad boy? Or is @codeconsole or @jdaugherty in the process of reviewing?

I'm actually in the process of reviewing. I have been talking about some solutions to the multiple inheritance problem. Can this wait until Thursday's meeting?

@jdaugherty Excellent, no problem 👍

@jdaugherty
Copy link

Spoke to @jamesfredley and we want to go ahead and merge. My comments can be addressed separately.

@jamesfredley jamesfredley merged commit 122ad22 into grails:9.0.x Aug 27, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants