-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* support for multiple Micronaut versions * upgraded gradle to the latest 6.x * fixed micronaut-hibernate-gorm coordinates for MN 2.+ * using the micronautMigratedDependency to obtain the appropriate group id * safeguard MN 2.x dependencies * migrated Nonnull annotation * fixed property to update * using newer version of micronaut locally, newer version of MN AWS SDK * fixed nonnull migration, local version based on MN 2.x * fixed resolution of available entries for EachProperty beans * removed @OverRide from the method which only exists in 2.x and newer * using Grails 5.x for Micronaut 2.x and 3.x * few more compatibility tweaks * added introspected to the entity so it's found in Micronaut 3 * added grails source folders to migration * disabled integration tests for MN 2.x due Grails 5 supports on MN 3.x * upgraded codenarc and fixed violations * trying to harmonize plugins and classpath deps for gorm/hibernate * varying gorm.version number * using non-deprecated method to create application context instance * removed offedning plugins from the example application * simplify example * fixed wrong local rollbacks * fixed client payload for ping action * verify health response, back to 1.x on the main branch
- Loading branch information
Showing
39 changed files
with
382 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
buildSrc/src/main/groovy/micronaut-compatibility.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * Copyright 2020-2021 Agorapulse. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import groovy.transform.Field | ||
|
|
||
| @Field static final Map<String, String> MICRONAUT_1 = [ | ||
| 'micronaut-runtime-groovy': 'io.micronaut', | ||
| 'micronaut-function-groovy': 'io.micronaut', | ||
| 'micronaut-function-aws': 'io.micronaut', | ||
| 'micronaut-aws-common': 'io.micronaut.configuration', | ||
| 'micronaut-security': 'io.micronaut', | ||
| 'micronaut-security-jwt': 'io.micronaut', | ||
| 'micronaut-jdbc-tomcat': 'io.micronaut.configuration', | ||
| 'micronaut-hibernate-gorm': 'io.micronaut.configuration', | ||
| 'micronaut-spring': 'io.micronaut', | ||
| ] | ||
|
|
||
| @Field static final Map<String, String> MICRONAUT_2 = [ | ||
| 'micronaut-runtime-groovy': 'io.micronaut.groovy', | ||
| 'micronaut-function-groovy': 'io.micronaut.groovy', | ||
| 'micronaut-function-aws': 'io.micronaut.aws', | ||
| 'micronaut-aws-common': 'io.micronaut.aws', | ||
| 'micronaut-security': 'io.micronaut.security', | ||
| 'micronaut-security-jwt': 'io.micronaut.security', | ||
| 'micronaut-jdbc-tomcat': 'io.micronaut.sql', | ||
| 'micronaut-hibernate-gorm': 'io.micronaut.groovy', | ||
| 'micronaut-spring': 'io.micronaut.spring', | ||
| ] | ||
|
|
||
| @Field static final Map<String, Object> IMPORTS = [ | ||
| 'javax.annotation.Nullable': 'io.micronaut.core.annotation.Nullable', | ||
| 'javax.annotation.Nonnull': 'io.micronaut.core.annotation.NonNull', | ||
| 'Nonnull': 'NonNull', | ||
| 'import javax.inject': 'import jakarta.inject', | ||
| 'io.micronaut.test.annotation.MicronautTest': [ | ||
| java: 'io.micronaut.test.extensions.junit5.annotation.MicronautTest', | ||
| groovy: 'io.micronaut.test.extensions.spock.annotation.MicronautTest', | ||
| ] | ||
| ] | ||
|
|
||
| ext.micronautMigratedDependency = { String module -> | ||
| Map<String, String> groups = project.getProperty('micronautVersion').startsWith('1') ? MICRONAUT_1 : MICRONAUT_2 | ||
| String group = groups[module] | ||
|
|
||
| if (!group) { | ||
| throw new IllegalArgumentException("Cannot find group for $module. Known modules: ${groups.keySet()}") | ||
| } | ||
|
|
||
| return "$group:$module" | ||
| } | ||
|
|
||
| pluginManager.withPlugin('java') { | ||
| tasks.register('migrateImports') { Task task -> | ||
| File javaSources = project.file('src/main/java') | ||
| File javaTestSources = project.file('src/test/java') | ||
| File groovySources = project.file('src/main/groovy') | ||
| File groovyTestSources = project.file('src/test/groovy') | ||
| File testResources = project.file('src/test/resources') | ||
|
|
||
| List<File> dirs = [ | ||
| javaSources, | ||
| javaTestSources, | ||
| groovySources, | ||
| groovyTestSources, | ||
| testResources, | ||
| ] | ||
|
|
||
| for (File dir in dirs) { | ||
| if (dir.exists()) { | ||
| task.inputs.dir dir | ||
| task.outputs.dir dir | ||
|
|
||
| task.doFirst { | ||
| task.inputs.files.forEach { File file -> | ||
| String content = file.text | ||
| String newContent = content | ||
|
|
||
| if (IMPORTS.keySet().any { String original -> content.contains(original) }) { | ||
| IMPORTS.each { String original, Object value -> | ||
| String replacement = value instanceof CharSequence ? value : (file.name.endsWith('.groovy') ? value['groovy'] : value['java']) | ||
| newContent = newContent.replace(original, replacement) | ||
| } | ||
| } | ||
|
|
||
| if (content != newContent) { | ||
| project.logger.lifecycle("Migrated imports in $file") | ||
| file.text = newContent | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.