You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by "slawekjaranowski (via GitHub)" <gi...@apache.org> on 2023/05/14 11:19:52 UTC
[GitHub] [maven-release] slawekjaranowski opened a new pull request, #186: Try build with Maven 4
slawekjaranowski opened a new pull request, #186:
URL: https://github.com/apache/maven-release/pull/186
Following this checklist to help us incorporate your
contribution quickly and easily:
- [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MRELEASE) filed
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
- [ ] Each commit in the pull request should have a meaningful subject line and body.
- [ ] Format the pull request title like `[MRELEASE-XXX] - Fixes bug in ApproximateQuantiles`,
where you replace `MRELEASE-XXX` with the appropriate JIRA issue. Best practice
is to use the JIRA issue title in the pull request title and in the first line of the
commit message.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Run `mvn clean verify -Prun-its` to make sure basic checks pass. A more thorough check will
be performed on your pull request automatically.
If your pull request is about ~20 lines of code you don't need to sign an
[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
you have to acknowledge this by using the following check-box.
- [ ] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
- [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] nielsbasjes commented on pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "nielsbasjes (via GitHub)" <gi...@apache.org>.
nielsbasjes commented on PR #186:
URL: https://github.com/apache/maven-release/pull/186#issuecomment-1554556174
> @nielsbasjes, can you verify this on your end as well?
I installed Apache Maven 4.0.0-alpha-5.
I installed this branch of the maven-release plugin locally (using maven 4).
I then updated the dependency of maven-release-plugin in my project https://github.com/nielsbasjes/conventional-commits-maven-release and ran all the tests and integration tests.
All of this worked fine for me (except for my project having a few minor things that are not maven 4 compatible).
So from my end this all looks good.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] michael-o commented on a diff in pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on code in PR #186:
URL: https://github.com/apache/maven-release/pull/186#discussion_r1202106158
##########
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java:
##########
@@ -543,9 +543,10 @@ private List<Plugin> createReleasePlugins(ReleaseDescriptor releaseDescriptor, M
}
releasePlugin.setExecutions(plugin.getExecutions());
releasePlugin.setDependencies(plugin.getDependencies());
- releasePlugin.setGoals(plugin.getGoals());
releasePlugin.setInherited(plugin.getInherited());
- releasePlugin.setConfiguration(plugin.getConfiguration());
+ if (plugin.getConfiguration() != null) {
+ releasePlugin.setConfiguration(plugin.getConfiguration());
Review Comment:
Alright, I see!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] michael-o commented on pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on PR #186:
URL: https://github.com/apache/maven-release/pull/186#issuecomment-1554577536
> > @nielsbasjes, can you verify this on your end as well?
>
> I installed Apache Maven 4.0.0-alpha-5. I installed this branch of the maven-release plugin locally (using maven 4). I then updated the dependency of maven-release-plugin in my project https://github.com/nielsbasjes/conventional-commits-maven-release and ran all the tests and integration tests.
>
> All of this worked fine for me (except for my project having a few minor things that are not maven 4 compatible).
>
> So from my end this all looks good.
Thanks, this is good news!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] slawekjaranowski merged pull request #186: [MRELEASE-1123] Fix for Maven 4 compatibility
Posted by "slawekjaranowski (via GitHub)" <gi...@apache.org>.
slawekjaranowski merged PR #186:
URL: https://github.com/apache/maven-release/pull/186
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] slawekjaranowski commented on a diff in pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "slawekjaranowski (via GitHub)" <gi...@apache.org>.
slawekjaranowski commented on code in PR #186:
URL: https://github.com/apache/maven-release/pull/186#discussion_r1198331707
##########
.github/workflows/maven-verify.yml:
##########
@@ -25,3 +25,5 @@ jobs:
build:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
+ with:
+ maven-matrix: '[ "3.9.2", "4.0.0-alpha-5" ]'
Review Comment:
4.x to removed before merge
##########
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java:
##########
@@ -543,9 +543,10 @@ private List<Plugin> createReleasePlugins(ReleaseDescriptor releaseDescriptor, M
}
releasePlugin.setExecutions(plugin.getExecutions());
releasePlugin.setDependencies(plugin.getDependencies());
- releasePlugin.setGoals(plugin.getGoals());
Review Comment:
There is no such method in 4.x i 3.x was deprecated
##########
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java:
##########
@@ -543,9 +543,10 @@ private List<Plugin> createReleasePlugins(ReleaseDescriptor releaseDescriptor, M
}
releasePlugin.setExecutions(plugin.getExecutions());
releasePlugin.setDependencies(plugin.getDependencies());
- releasePlugin.setGoals(plugin.getGoals());
releasePlugin.setInherited(plugin.getInherited());
- releasePlugin.setConfiguration(plugin.getConfiguration());
+ if (plugin.getConfiguration() != null) {
+ releasePlugin.setConfiguration(plugin.getConfiguration());
Review Comment:
In 4.x configuration can not be a null
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] michael-o commented on a diff in pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on code in PR #186:
URL: https://github.com/apache/maven-release/pull/186#discussion_r1201868929
##########
maven-release-plugin/src/it/projects/prepare/MRELEASE-571_M3/module1/pom.xml:
##########
@@ -64,7 +64,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
+ <version>3.3.0</version>
Review Comment:
ditto
##########
maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml:
##########
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.1.1</version>
+ <version>3.3.0</version>
Review Comment:
Now these should be a property, no?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] michael-o commented on a diff in pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on code in PR #186:
URL: https://github.com/apache/maven-release/pull/186#discussion_r1201866990
##########
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java:
##########
@@ -543,9 +543,10 @@ private List<Plugin> createReleasePlugins(ReleaseDescriptor releaseDescriptor, M
}
releasePlugin.setExecutions(plugin.getExecutions());
releasePlugin.setDependencies(plugin.getDependencies());
- releasePlugin.setGoals(plugin.getGoals());
releasePlugin.setInherited(plugin.getInherited());
- releasePlugin.setConfiguration(plugin.getConfiguration());
+ if (plugin.getConfiguration() != null) {
+ releasePlugin.setConfiguration(plugin.getConfiguration());
Review Comment:
why is the if clause required? Does `releasePlugin` have a default, non-null config?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] michael-o commented on pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "michael-o (via GitHub)" <gi...@apache.org>.
michael-o commented on PR #186:
URL: https://github.com/apache/maven-release/pull/186#issuecomment-1554528289
@nielsbasjes, can you verify this on your end as well?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] slawekjaranowski commented on pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "slawekjaranowski (via GitHub)" <gi...@apache.org>.
slawekjaranowski commented on PR #186:
URL: https://github.com/apache/maven-release/pull/186#issuecomment-1558635252
@nielsbasjes thanks for testing.
I will remove a build by Maven 4.x - and prepare for merge.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-release] slawekjaranowski commented on a diff in pull request #186: [MRELEASE-1123] Fix for Maven 4
Posted by "slawekjaranowski (via GitHub)" <gi...@apache.org>.
slawekjaranowski commented on code in PR #186:
URL: https://github.com/apache/maven-release/pull/186#discussion_r1202099240
##########
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java:
##########
@@ -543,9 +543,10 @@ private List<Plugin> createReleasePlugins(ReleaseDescriptor releaseDescriptor, M
}
releasePlugin.setExecutions(plugin.getExecutions());
releasePlugin.setDependencies(plugin.getDependencies());
- releasePlugin.setGoals(plugin.getGoals());
releasePlugin.setInherited(plugin.getInherited());
- releasePlugin.setConfiguration(plugin.getConfiguration());
+ if (plugin.getConfiguration() != null) {
+ releasePlugin.setConfiguration(plugin.getConfiguration());
Review Comment:
Maven 4 code in `org.apache.maven.model.ConfigurationContainer#setConfiguration`
```
public void setConfiguration( Object configuration )
{
if ( ! Objects.equals( ( ( Xpp3Dom ) configuration ).getDom(), getDelegate().getConfiguration() ) )
{
update( getDelegate().withConfiguration( ( ( Xpp3Dom ) configuration ).getDom() ) );
( ( Xpp3Dom ) configuration ).setChildrenTracking( this::replace );
}
}
```
but `getConfiguration` can return `null`
```
public Object getConfiguration()
{
return getDelegate().getConfiguration() != null ? new Xpp3Dom( getDelegate().getConfiguration(), this::replace ) : null;
}
```
in 3.x simply field is set
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org