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

[MRELEASE-1087] Upgrade Maven to 3.2.5 (and de-plexus) #118

Merged
merged 10 commits into from
May 6, 2022
Merged

[MRELEASE-1087] Upgrade Maven to 3.2.5 (and de-plexus) #118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ab7a496
Migrate plugin off Plexus
cstamas Apr 29, 2022
c7aecdc
Fix tests
cstamas Apr 29, 2022
233699c
Fix ITs
cstamas Apr 29, 2022
6d455d3
All IT passes OK, one UT fails
cstamas Apr 29, 2022
3c6319f
Ignore GenerateReleasePomsPhaseTest UT to allow full CI build
cstamas Apr 30, 2022
3289c09
Fix some tests in GenerateReleasePomsPhaseTest
slawekjaranowski May 4, 2022
fe91f9a
Add warning about mvn4 and interpolation changes
cstamas May 5, 2022
820e774
Fix deprecations related to CLI
cstamas May 5, 2022
23946da
Fix ignored tests in AbstractRewritingReleasePhaseTestCase
slawekjaranowski May 5, 2022
1277fe1
Applied PR comments:
cstamas May 6, 2022
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
10 changes: 8 additions & 2 deletions ...-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,13 @@ public FileVisitResult visitFile( Path file, BasicFileAttributes attrs )
for ( MavenProject project : reactorProjects )
{
MavenProject resolvedProject = projectBuilder.build( project.getFile(), buildingRequest ).getProject();


// FIXME ... setDependencyArtifacts - set direct dependencies ...
// but in org.apache.maven.shared.release.phase.GenerateReleasePomsPhase.createReleaseDependencies
// getArtifacts is used ...

// so we probably also need call setResolvedArtifacts

Copy link
Member

Choose a reason for hiding this comment

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

Probable cause of ignore tests in AbstractRewritingReleasePhaseTestCase

Copy link
Member Author

Choose a reason for hiding this comment

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

For example, I have hard time to understand why release needs to resolve anything at all...

Copy link
Member

Choose a reason for hiding this comment

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

And why we need use setDependencyArtifacts directly ...
code is also strange for me we check:

if ( project.getDependencyArtifacts() == null )

and next on different object

resolvedProject.setDependencyArtifacts(....)

I will check what happens if I call

resolvedProject.setResolvedArtifacts( resolvedProject.getDependencyArtifacts() )

of course I don't understand it very well

// from LifecycleDependencyResolver
if ( project.getDependencyArtifacts() == null )
{
Expand Down Expand Up @@ -419,4 +425,4 @@ else if ( Objects.equals( artifact.toString(), mavenProject.getArtifact().toStri
return null;
}
}
}
}
5 changes: 4 additions & 1 deletion ...est/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import java.util.Collections;
import java.util.List;

import com.google.inject.Module;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.manager.ScmManager;
Expand Down Expand Up @@ -232,6 +231,7 @@ protected abstract ReleaseDescriptorBuilder createConfigurationForPomWithParentA
throws Exception;

@Test
@Ignore("dependency resolve problem in test")
public void testRewritePomDependencies()
throws Exception
{
Expand Down Expand Up @@ -264,6 +264,7 @@ public void testRewritePomUnmappedDependencies()
}

@Test
@Ignore("dependency resolve problem in test")
public void testRewritePomDependenciesDifferentVersion()
throws Exception
{
Expand All @@ -276,6 +277,7 @@ public void testRewritePomDependenciesDifferentVersion()
}

@Test
@Ignore("dependency resolve problem in test")
public void testRewriteManagedPomDependencies()
throws Exception
{
Expand Down Expand Up @@ -720,6 +722,7 @@ protected abstract String readTestProjectFile( String fileName )
throws IOException;

@Test
@Ignore("dependency resolve problem in test")
public void testRewritePomDependenciesWithNamespace()
throws Exception
{
Expand Down
1 change: 0 additions & 1 deletion ...ger/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
*
* @author <a href="mailto:[email protected]">Mark Hobson</a>
*/
@Ignore
public class GenerateReleasePomsPhaseTest
extends AbstractRewritingReleasePhaseTestCase
{
Expand Down
8 changes: 4 additions & 4 deletions ...test/resources/projects/generate-release-poms/basic-pom-entities/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<name>&lt; &amp; Non-ASCIIs: ß İ ə σ ß Я א ذ</name>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -58,11 +58,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...est/resources/projects/generate-release-poms/basic-pom-namespace/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -59,11 +59,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...resources/projects/generate-release-poms/basic-pom-with-encoding/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -64,11 +64,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...t/resources/projects/generate-release-poms/basic-pom/expected-release-pom-with-schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -64,11 +64,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...ager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -64,11 +64,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...est/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -69,11 +69,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...s/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -64,11 +64,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...s/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -71,8 +71,8 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
Expand All @@ -86,4 +86,4 @@ under the License.
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions .../resources/projects/generate-release-poms/comments-around-values/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -68,11 +68,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...rojects/generate-release-poms/comments-around-values/subproject1/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -64,11 +64,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...sources/projects/generate-release-poms/external-range-dependency/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
</scm>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -64,8 +64,8 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
Expand All @@ -79,4 +79,4 @@ under the License.
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
8 changes: 4 additions & 4 deletions ...s/generate-release-poms/internal-differing-snapshot-dependencies/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ under the License.
<packaging>pom</packaging>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -64,11 +64,11 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
<outputDirectory>target/site</outputDirectory>
</reporting>
</project>
</project>
6 changes: 3 additions & 3 deletions ...elease-poms/internal-differing-snapshot-dependencies/subproject1/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -59,8 +59,8 @@ under the License.
<enabled>false</enabled>
</snapshots>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>http://repo1.maven.org/maven2</url>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<reporting>
Expand Down
Loading