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

Revert default behavior to override version properties if possible #17

Merged
merged 1 commit into from
Jul 25, 2024
Merged

Revert default behavior to override version properties if possible #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 5 deletions integration-tests/src/test/java/org/wildfly/channelplugin/it/UpgradeComponentsMojoIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public class UpgradeComponentsMojoIT {
@SystemProperty(value = "localRepository", content = "${maven.repo.local}")
@SystemProperty(value = "remoteRepositories", content = "file://${maven.repo.local}")
@SystemProperty(value = "ignoreStreams", content = "org.jboss:ignored-dep")
@SystemProperty(value = "inlineUpgradedVersions", content = "false")
@MavenTest
void basic_project_test_case(MavenExecutionResult result) {
assertThat(result).isSuccessful();
Expand Down Expand Up @@ -94,7 +93,6 @@ void basic_project_test_case(MavenExecutionResult result) {
*/
@MavenGoal("${project.groupId}:wildfly-channel-maven-plugin:${project.version}:upgrade")
@SystemProperty(value = "manifestFile", content = "manifest.yaml")
@SystemProperty(value = "inlineUpgradedVersions", content = "false")
@MavenTest
void eap_bom_test_case(MavenExecutionResult result) throws MalformedURLException {
assertThat(result).isSuccessful();
Expand Down Expand Up @@ -134,7 +132,6 @@ void eap_bom_test_case(MavenExecutionResult result) throws MalformedURLException
@MavenGoal("${project.groupId}:wildfly-channel-maven-plugin:${project.version}:upgrade")
@SystemProperty(value = "manifestFile", content = "manifest.yaml")
@SystemProperty(value = "overrideProperties", content = "undertow.version=2.2.5.Final-Overridden")
@SystemProperty(value = "inlineUpgradedVersions", content = "false")
@MavenTest
void override_property_test_case(MavenExecutionResult result) {
assertThat(result).isSuccessful();
Expand All @@ -159,7 +156,6 @@ void override_property_test_case(MavenExecutionResult result) {
@MavenGoal("${project.groupId}:wildfly-channel-maven-plugin:${project.version}:upgrade")
@SystemProperty(value = "manifestFile", content = "manifest.yaml")
@SystemProperty(value = "overrideDependencies", content = "io.undertow:undertow-core:2.2.5.Final-Overridden")
@SystemProperty(value = "inlineUpgradedVersions", content = "false")
@MavenTest
void override_dependency_test_case(MavenExecutionResult result) {
assertThat(result).isSuccessful();
Expand All @@ -184,7 +180,6 @@ void override_dependency_test_case(MavenExecutionResult result) {
*/
@MavenGoal("${project.groupId}:wildfly-channel-maven-plugin:${project.version}:upgrade")
@SystemProperty(value = "manifestFile", content = "manifest.yaml")
@SystemProperty(value = "inlineUpgradedVersions", content = "false")
@MavenTest
void external_properties_test_case(MavenExecutionResult result) {
assertThat(result).isSuccessful();
Expand All @@ -204,6 +199,7 @@ void external_properties_test_case(MavenExecutionResult result) {

@MavenGoal("${project.groupId}:wildfly-channel-maven-plugin:${project.version}:upgrade")
@SystemProperty(value = "manifestFile", content = "manifest.yaml")
@SystemProperty(value = "inlineUpgradedVersions", content = "true")
@MavenTest
void inline_override_test_case(MavenExecutionResult result) {
assertThat(result).isSuccessful();
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/org/wildfly/channelplugin/UpgradeComponentsMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public class UpgradeComponentsMojo extends AbstractChannelMojo {
* If true, upgraded versions would be inlined in the dependency version element, possibly replacing a property
* reference if it was originally used. If false, the property would be updated instead (less robust option).
*/
@Parameter(property = "inlineUpgradedVersions", defaultValue = "true")
@Parameter(property = "inlineUpgradedVersions", defaultValue = "false")
boolean inlineUpgradedVersions;

/**
Expand Down
Loading