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

Jump to bottom

Quarkus 3 migration #5589

Closed
wants to merge 6 commits into from
Closed

Quarkus 3 migration #5589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
411879f
Bump to Quarkus 3.5.2
mariofusco Nov 21, 2023
a79c4af
wip
mariofusco Nov 22, 2023
7a449ac
wip
mariofusco Nov 23, 2023
c1dbe7f
remove duplicated dependencies
mariofusco Nov 23, 2023
53c5197
wip
mariofusco Nov 23, 2023
edb771a
rebase
mariofusco Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .ci/environments/quarkus-3/before.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mvn_cmd="mvn ${BUILD_MVN_OPTS:-} ${BUILD_MVN_OPTS_QUARKUS_UPDATE:-}"
ci="${CI:-false}"

rewrite_plugin_version=4.43.0
quarkus_version=${QUARKUS_VERSION:-3.0.0.Final}
quarkus_version=${QUARKUS_VERSION:-3.5.2}

quarkus_recipe_file="${script_dir_path}/quarkus3.yml"
patch_file="${script_dir_path}"/patches/0001_before_sh.patch
Expand Down
10 changes: 5 additions & 5 deletions .ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
import org.apache.commons.io.IOUtils;

import io.quarkus.devtools.project.BuildTool;
import io.quarkus.devtools.project.update.QuarkusUpdateRecipe;
import io.quarkus.devtools.project.update.QuarkusUpdateRecipeIO;
import io.quarkus.devtools.project.update.operations.UpdatePropertyOperation;
import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateRecipe;
import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateRecipeIO;
import io.quarkus.devtools.project.update.rewrite.operations.UpdatePropertyOperation;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;

///usr/bin/env jbang "$0" "$@" ; exit $?
// Version to be changed when needed
//DEPS io.quarkus:quarkus-devtools-common:3.0.0.Final
//DEPS io.quarkus:quarkus-devtools-common:3.5.2
//DEPS info.picocli:picocli:4.5.0

/*
Expand All @@ -45,7 +45,7 @@ class CreateKieQuarkusProjectMigrationRecipeCli implements Callable<Integer> {
@Option(names={ "-v", "--property-version"}, description = "(multi). Add a dynamic property version to the final recipe")
private Map<String, String> versionProperties = new HashMap<>();

static final String QUARKUS_UPDATES_BASE_URL = "https://raw.githubusercontent.com/quarkusio/quarkus-updates/1.0.0/recipes/src/main/resources/quarkus-updates/core/3alpha.yaml";
static final String QUARKUS_UPDATES_BASE_URL = "https://github.com/quarkusio/quarkus-updates/blob/main/recipes/src/main/resources/quarkus-updates/core/3.5.yaml";

static final Path quarkus3DownloadedRecipePath = Paths.get("quarkus3-base-recipe.yml");
static final Path quarkus3GeneratedRecipePath = Paths.get("quarkus3.yml");
Expand Down
742 changes: 376 additions & 366 deletions .ci/environments/quarkus-3/patches/0001_before_sh.patch
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .ci/environments/quarkus-3/patches/0004_hardcoded-javax-string.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/drl/quarkus/util/deployment/DroolsQuarkusResourceUtils.java b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/drl/quarkus/util/deployment/DroolsQuarkusResourceUtils.java
--- a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/drl/quarkus/util/deployment/DroolsQuarkusResourceUtils.java (revision 4eb6d59aefa1df16a286666f75ead10d8b77746f)
+++ b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/drl/quarkus/util/deployment/DroolsQuarkusResourceUtils.java (date 1677837541284)
--- a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/DroolsQuarkusResourceUtils.java (revision 4eb6d59aefa1df16a286666f75ead10d8b77746f)
+++ b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/DroolsQuarkusResourceUtils.java (date 1677837541284)
@@ -222,8 +222,8 @@
}

Expand Down
2 changes: 1 addition & 1 deletion .ci/environments/quarkus-3/patches/0006_package-info.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ diff --git a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dta
index 9b27fa3be2..9fb6a6eafb 100644
--- a/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
+++ b/kie-dmn/kie-dmn-validation/src/main/java/org/kie/dmn/validation/dtanalysis/mcdc/dmntck/package-info.java
@@ -1,6 +1,6 @@
@@ -19,6 +19,6 @@
// Copied under Apache License from https://github.com/dmn-tck/tck/blob/8c23dc13caa508a33d11b47cca318d7c3a3ca2fc/LICENSE-ASL-2.0.txt
[email protected](namespace = "http://www.omg.org/spec/DMN/20160719/testcase",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
Expand Down
15 changes: 7 additions & 8 deletions .ci/environments/quarkus-3/patches/0010_remaining_javax_jakarta.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,19 @@ index ef384a6d20..ac6e1c76b0 100644
</kbase>

diff --git a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java
index 45f736f73a..7c1d82f696 100644
--- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java
+++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java
@@ -18,8 +18,8 @@ package org.drools.codegen.common.context;
--- a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java (revision 0c82d00654f33847bd2f1f4723933142a45e311a)
+++ b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/context/QuarkusDroolsModelBuildContext.java (date 1700572026783)
@@ -24,8 +24,8 @@
public class QuarkusDroolsModelBuildContext extends AbstractDroolsModelBuildContext {

public static final String CONTEXT_NAME = "Quarkus";
- public static final String QUARKUS_REST = "javax.ws.rs.Path";
- public static final String QUARKUS_DI = "javax.inject.Inject";
+ public static final String QUARKUS_REST = "jakarta.ws.rs.Path";
+ public static final String QUARKUS_DI = "jakarta.inject.Inject";
protected QuarkusDroolsModelBuildContext(QuarkusKogitoBuildContextBuilder builder) {
super(builder, /*new CDIDependencyInjectionAnnotator(), new CDIRestAnnotator(), */ CONTEXT_NAME);

public final boolean hasRest;
public final boolean hasDI;
diff --git a/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java b/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java
index 0cfb0ca4b6..e9f4d6bbad 100644
--- a/drools-model/drools-model-codegen/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java
Expand Down
8 changes: 4 additions & 4 deletions .ci/environments/quarkus-3/quarkus3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Update Quarkus version and refactor imports and resources if needed
type: specs.openrewrite.org/v1beta/recipe
recipeList:
- org.openrewrite.maven.ChangePropertyValue: {
newValue: 3.0.0.Final,
newValue: 3.5.2,
key: version.io.quarkus
}
- org.kie.drools.Quarkus3Migration
Expand Down Expand Up @@ -117,7 +117,6 @@ recipeList:
}
- org.kie.openrewrite.recipe.jpmml.JPMMLRecipe
---
displayName: Update Managed Dependencies
recipeList:
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
oldGroupId: javax.activation,
Expand Down Expand Up @@ -502,9 +501,10 @@ recipeList:
newGroupId: org.keycloak,
newArtifactId: keycloak-admin-client-jakarta
}
type: specs.openrewrite.org/v1beta/recipe
description: Update all managed dependencies based on dependency updates from Quarkus.
displayName: Update Managed Dependencies
name: org.kie.ManagedDependencies
description: Update all managed dependencies based on dependency updates from Quarkus.
type: specs.openrewrite.org/v1beta/recipe
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse
Expand Down
2 changes: 1 addition & 1 deletion bom/drools-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-core-bom</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../kie-core-bom/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/kie-core-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>drools-parent</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/kie-dmn-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-core-bom</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../kie-core-bom/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/kie-efesto-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-core-bom</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../kie-core-bom/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/kie-pmml-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-core-bom</artifactId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
<relativePath>../kie-core-bom/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>drools-parent</artifactId>
<groupId>org.kie</groupId>
<version>8.45.0-SNAPSHOT</version>
<version>9.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading
Loading