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

Introduce finer version control for codestarts and use it #41202

Merged

Conversation

ia3andy
Copy link
Contributor

@ia3andy ia3andy commented Jun 14, 2024

This fixes project generation incompatibility issues introduced by #36826

@quarkus-bot quarkus-bot bot added area/codestarts area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/platform Issues related to definition and interaction with Quarkus Platform labels Jun 14, 2024
@ia3andy ia3andy force-pushed the fix-compat-codestarts-and-new-version-check branch 4 times, most recently from a9b0a74 to 2e448e6 Compare June 14, 2024 10:37
@ia3andy ia3andy requested review from gsmet and aloubyansky June 14, 2024 10:41
@ia3andy
Copy link
Contributor Author

ia3andy commented Jun 14, 2024

cc @galderz

@ia3andy ia3andy changed the title Introduce version check in base codestarts and use them Introduce finer version control for codestarts and use it Jun 14, 2024
@ia3andy
Copy link
Contributor Author

ia3andy commented Jun 14, 2024

If we see this version if usage is growing up under control, we will re-evaluate the strategy.

@ia3andy ia3andy force-pushed the fix-compat-codestarts-and-new-version-check branch from 2e448e6 to 16d9c88 Compare June 14, 2024 16:27
@ia3andy
Copy link
Contributor Author

ia3andy commented Jun 14, 2024

I switched to Jackson Version instead of the Java Runtime one, because the Java one is not working with 1.0

Copy link
Member

@aloubyansky aloubyansky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll check whether we can use a better version comparison approach

@ia3andy
Copy link
Contributor Author

ia3andy commented Jun 14, 2024

I'll check whether we can use a better version comparison approach

@aloubyansky we can always change later, this needs no dependency and all the tests are passing fine

I know Maven has a better one but it wasn't in there..

This comment has been minimized.

Copy link
Member

@maxandersen maxandersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this affect backwards compatibility if any? Old clis will continue to work?

@ia3andy ia3andy force-pushed the fix-compat-codestarts-and-new-version-check branch from 16d9c88 to 889daa4 Compare June 16, 2024 18:28

This comment has been minimized.

@ia3andy
Copy link
Contributor Author

ia3andy commented Jun 17, 2024

@aloubyansky could you merge this?


final class QuteCodestartFileReader implements CodestartFileReader {

private static final String TPL_QUTE_FLAG = ".tpl.qute";
private static final String ENTRY_QUTE_FLAG = ".entry.qute";
public static final String INCLUDE_QUTE_FLAG = ".include.qute";
public static final String SKIP_TAG = "<SKIP>";
private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)(\\.(\\d+))?(\\.(\\d+))?.*");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we don't need this constant anymore and splitVersion(...)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, duuuuuuhhhh another CI run 😬

@ia3andy ia3andy force-pushed the fix-compat-codestarts-and-new-version-check branch 2 times, most recently from 834b192 to 76bbdd5 Compare June 17, 2024 08:03

This comment has been minimized.

@ia3andy ia3andy force-pushed the fix-compat-codestarts-and-new-version-check branch from 76bbdd5 to f4ab373 Compare June 17, 2024 08:12
@ia3andy ia3andy force-pushed the fix-compat-codestarts-and-new-version-check branch from f4ab373 to 4ff600c Compare June 17, 2024 08:12
@ia3andy ia3andy merged commit e246c81 into quarkusio:main Jun 17, 2024
48 of 50 checks passed
@quarkus-bot quarkus-bot bot added this to the 3.13 - main milestone Jun 17, 2024
@ia3andy ia3andy deleted the fix-compat-codestarts-and-new-version-check branch June 17, 2024 12:10
@gsmet gsmet modified the milestones: 3.13 - main, 3.12.0 Jun 18, 2024
@gsmet gsmet modified the milestones: 3.12.0, 3.11.3 Jun 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/codestarts area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/platform Issues related to definition and interaction with Quarkus Platform triage/flaky-test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants