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 5 commits
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
7 changes: 5 additions & 2 deletions maven-release-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<version>1.0.0.v20140518</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
Expand Down
11 changes: 9 additions & 2 deletions ...release-api/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,24 @@
*/

import org.apache.maven.shared.release.ReleaseResult;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Base class for all phases.
*
* @author <a href="mailto:[email protected]">Brett Porter</a>
*/
public abstract class AbstractReleasePhase
extends AbstractLogEnabled
implements ReleasePhase
{
private final Logger logger = LoggerFactory.getLogger( getClass() );

protected Logger getLogger()
{
return logger;
}

/**
* <p>logInfo.</p>
*
Expand Down
107 changes: 66 additions & 41 deletions maven-release-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<artifactId>maven-release-api</artifactId>
<version>3.0.0-M6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
Expand All @@ -59,14 +60,14 @@
</dependency>

<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
<version>1.3</version>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
<version>1.7</version>
<version>2.0</version>
cstamas marked this conversation as resolved.
Show resolved Hide resolved
</dependency>

<dependency>
Expand All @@ -85,6 +86,23 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
Expand All @@ -98,14 +116,25 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
<version>1.5.0</version>
cstamas marked this conversation as resolved.
Show resolved Hide resolved
<exclusions>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>


<!-- scm dependencies -->
<dependency>
<groupId>org.apache.maven.scm</groupId>
Expand All @@ -130,6 +159,12 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>0.13.1</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -163,15 +198,35 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-file</artifactId>
<version>1.7</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<version>1.7</version>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-file</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -208,36 +263,6 @@
</models>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<executions>
<execution>
<goals>
<goal>generate-metadata</goal>
</goals>
<configuration>
<extractors>
<extractor>class</extractor>
</extractors>
</configuration>
</execution>
<execution>
<id>merge</id>
<phase>process-classes</phase>
<goals>
<goal>merge-metadata</goal>
</goals>
<configuration>
<output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
<descriptors>
<descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
<descriptor>src/main/components-fragment.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down
Loading