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

Bump org.openrewrite.recipe:rewrite-recipe-bom from 2.15.0 to 2.17.0 #201

Merged
merged 3 commits into from
Aug 15, 2024
Merged

Bump org.openrewrite.recipe:rewrite-recipe-bom from 2.15.0 to 2.17.0 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee38322
Bump org.openrewrite.recipe:rewrite-recipe-bom from 2.15.0 to 2.17.0
dependabot[bot] Aug 14, 2024
da3ae63
Update recipe for new OpenRewrite
gsmet Aug 15, 2024
4f5f154
Update our tests following OpenRewrite update
gsmet Aug 15, 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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
<!-- Make sure all these versions are aligned and use a compatible OpenRewrite version -->
<!-- The rewrite-recipe-bom release notes should contain the Maven and Gradle plugin versions to target -->
<!-- https://central.sonatype.com/artifact/org.openrewrite.recipe/rewrite-recipe-bom/versions -->
<rewrite-recipe-bom.version>2.15.0</rewrite-recipe-bom.version>
<rewrite-recipe-bom.version>2.17.0</rewrite-recipe-bom.version>
<!-- https://central.sonatype.com/artifact/org.openrewrite.maven/rewrite-maven-plugin/versions -->
<rewrite-maven-plugin.version>5.36.0</rewrite-maven-plugin.version>
<rewrite-maven-plugin.version>5.39.0</rewrite-maven-plugin.version>
<!-- https://plugins.gradle.org/plugin/org.openrewrite.rewrite -->
<rewrite-gradle-plugin.version>6.16.4</rewrite-gradle-plugin.version>
<rewrite-gradle-plugin.version>6.18.0</rewrite-gradle-plugin.version>
<!-- align with https://central.sonatype.com/artifact/org.openrewrite/rewrite-core -->
<micrometer-core.version>1.9.17</micrometer-core.version>
<!-- tests-->
Expand Down
54 changes: 54 additions & 0 deletions recipes-tests/src/test/java/io/quarkus/updates/core/CoreUpdate37Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ void testMavenPluginUpdates() {

<properties>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
Expand Down Expand Up @@ -212,6 +213,7 @@ void testMavenPluginUpdatesDefaultGroupId() {

<properties>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
Expand Down Expand Up @@ -266,6 +268,26 @@ void testJpaModelgenNoChanges() {
</plugins>
</build>
</project>
""",
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
</plugin>
</plugins>
</build>
</project>
"""));
}

Expand Down Expand Up @@ -302,6 +324,9 @@ void testJpaModelgenOldDependency() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -357,6 +382,9 @@ void testJpaModelgenNewDependency() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -423,6 +451,9 @@ void testJpaModelgenNewDependencyManagedByQuarkusBom() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -492,6 +523,9 @@ void testJpaModelgenExistingConfig() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -556,6 +590,9 @@ void testJpaModelgenAnotherProcessor() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -623,6 +660,9 @@ void testJpaModelgenAnnotationProcessorAlreadyPresent() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -696,6 +736,9 @@ void testJpaModelgenOldJpaModelgenAnnotationProcessorAlreadyPresent() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -782,6 +825,9 @@ void testJpaModelgenOldJpaModelgenAnnotationProcessorAlreadyPresentWithOutdatedV
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -851,6 +897,9 @@ void testJpaModelgenNoBuildSection() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -927,6 +976,9 @@ void testJpaModelgenNoMavenCompilerPlugin() {
<groupId>io.quarkus.bot</groupId>
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -1013,6 +1065,7 @@ void testSyncVersion() {
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
<quarkus.version>3.7.0.CR1</quarkus.version>
</properties>
<dependencyManagement>
Expand Down Expand Up @@ -1102,6 +1155,7 @@ void testResteasyClientRenaming() {
<artifactId>release</artifactId>
<version>999-SNAPSHOT</version>
<properties>
<maven.compiler.release>17</maven.compiler.release>
<quarkus.version>3.7.0.CR1</quarkus.version>
</properties>
<dependencyManagement>
Expand Down
17 changes: 9 additions & 8 deletions recipes/src/main/resources/quarkus-updates/core/3.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,32 +768,33 @@ type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.updates.core.quarkus30.JavaxPersistenceXmlToJakartaPersistenceXml
displayName: Migrate xmlns entries in `persistence.xml` files
description: Java EE has been rebranded to Jakarta EE, necessitating an XML namespace relocation.

preconditions:
- org.openrewrite.FindSourceFiles:
filePattern: '**/persistence.xml'
recipeList:
# TODO upgrade for JPA 3.1
- org.openrewrite.xml.ChangeTagAttribute:
attributeName: name
elementName: //property
oldValue: javax.persistence
newValue: jakarta.persistence
fileMatcher: "**/persistence.xml"
- org.openrewrite.xml.ChangeTagAttribute:
attributeName: version
elementName: persistence
newValue: 3.0
fileMatcher: "**/persistence.xml"
- org.openrewrite.xml.ChangeTagAttribute:
attributeName: xmlns
elementName: persistence
oldValue: http://xmlns.jcp.org
newValue: https://jakarta.ee
fileMatcher: "**/persistence.xml"
- org.openrewrite.xml.ChangeTagAttribute:
attributeName: xmlns
elementName: persistence
oldValue: http://java.sun.com/xml/ns/persistence
newValue: https://jakarta.ee/xml/ns/persistence
- org.openrewrite.xml.ChangeTagAttribute:
attributeName: xsi:schemaLocation
elementName: persistence
newValue: https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd
fileMatcher: "**/persistence.xml"

---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.updates.core.quarkus30.JacksonJavaxToJakarta
Expand Down Expand Up @@ -1105,7 +1106,7 @@ recipeList:
oldGroupId: io.quarkus
oldArtifactId: quarkus-bootstrap-maven-plugin
newGroupId: io.quarkus
newArtifactId: quarkus-extension-maven-plugin
newArtifact: quarkus-extension-maven-plugin

#####
# Additional recipes for Kotlin
Expand Down
Loading