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
MRELEASE-979 - use split policies #15
Closed
Closed
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ed33f58
adds missing naming policy id copy opeations
85c8271
Adds a second policy for branch naming as compared to tag naming.
f7712f1
Fixes the naming policy logic.
f2954a1
changes the property name back to be 'projectNamingPolicyId'
f0ccb51
fixes documentation typo
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
41 changes: 41 additions & 0 deletions
41
...ger/src/main/java/org/apache/maven/shared/release/policies/DefaultBranchNamingPolicy.java
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,41 @@ | ||
| package org.apache.maven.shared.release.policies; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * http://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 org.apache.maven.shared.release.policy.PolicyException; | ||
| import org.apache.maven.shared.release.policy.naming.NamingPolicy; | ||
| import org.apache.maven.shared.release.policy.naming.NamingPolicyRequest; | ||
| import org.apache.maven.shared.release.policy.naming.NamingPolicyResult; | ||
| import org.codehaus.plexus.component.annotations.Component; | ||
|
|
||
| /** | ||
| * | ||
| * @since 3.0.0 | ||
| */ | ||
| @Component( role = NamingPolicy.class, hint = "default-branch" ) | ||
| public class DefaultBranchNamingPolicy implements NamingPolicy | ||
| { | ||
| @Override | ||
| public NamingPolicyResult getName( NamingPolicyRequest request ) | ||
| throws PolicyException | ||
| { | ||
| return new NamingPolicyResult().setName( null ); | ||
| } | ||
| } |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
defaultValue should stay "default", property should stay "projectNamingPolicyId", since you will never run
release:prepareandrelease:branch. Only the name of the field has to be different, so you can configure both inside your pom.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the default value is "default", then it selects the same policy as the default tag naming policy because there is only a single map with policies. That is the whole point of this change, as the default policy is different for tags (there it uses
<artifact>-<version>if no tag was given) and branches (there it provides no default therefore a branch request fails if no name is given). As you insisted to moving this naming strategy into the DefaultNamingStrategy and refused any approach to separate those out, what is your suggestion to continue?I am at a loss here. I am going back and forth through these changes and every time, you come back saying "this needs to be different, not this way". There are two default policies and you block any approach to acknowledge this fact.